projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Bob Weaver Deinterlacing Filter (bwdif).
[dcpomatic.git]
/
src
/
lib
/
cinema_kdms.h
diff --git
a/src/lib/cinema_kdms.h
b/src/lib/cinema_kdms.h
index 98cb84541677f2518f8b71a7750ce311cc066059..2b82cdab6e7662a5b5a5f7d58993ca672d31e74b 100644
(file)
--- a/
src/lib/cinema_kdms.h
+++ b/
src/lib/cinema_kdms.h
@@
-29,7
+29,7
@@
class CinemaKDMs
public:
void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
public:
void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
- static std::list<CinemaKDMs> collect (std::list<
ScreenKDM
> kdms);
+ static std::list<CinemaKDMs> collect (std::list<
boost::shared_ptr<ScreenKDM>
> kdms);
static int write_directories (
std::list<CinemaKDMs> cinema_kdms,
static int write_directories (
std::list<CinemaKDMs> cinema_kdms,
@@
-51,12
+51,12
@@
public:
static void email (
std::list<CinemaKDMs> cinema_kdms,
static void email (
std::list<CinemaKDMs> cinema_kdms,
- dcp::NameFormat name_format,
+ dcp::NameFormat container_name_format,
+ dcp::NameFormat filename_format,
dcp::NameFormat::Map name_values,
dcp::NameFormat::Map name_values,
- std::string cpl_name,
- boost::shared_ptr<Log> log
+ std::string cpl_name
);
boost::shared_ptr<Cinema> cinema;
);
boost::shared_ptr<Cinema> cinema;
- std::list<
ScreenKDM
> screen_kdms;
+ std::list<
boost::shared_ptr<ScreenKDM>
> screen_kdms;
};
};