Write config.xml with CR/LF terminators on Windows.

[dcpomatic.git] / src / lib / cinema_kdms.h

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index e7efcb985df599645c8022599a21ebcf99e4b264..566b947a23e22208a64a774a3fe7752b6fcb22d3 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -27,17 +27,34 @@ class Log;
 class CinemaKDMs
 {
 public:
-       void make_zip_file (std::string film_name, boost::filesystem::path zip_file) const;
+       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 void write_zip_files (std::string film_name, std::list<CinemaKDMs> cinema_kdms, boost::filesystem::path directory);
+
+       static int write_directories (
+               std::list<CinemaKDMs> cinema_kdms,
+               boost::filesystem::path directory,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               dcp::NameFormat::Map name_values,
+               boost::function<bool (boost::filesystem::path)> confirm_overwrite
+               );
+
+       static int write_zip_files (
+               std::list<CinemaKDMs> cinema_kdms,
+               boost::filesystem::path directory,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               dcp::NameFormat::Map name_values,
+               boost::function<bool (boost::filesystem::path)> confirm_overwrite
+               );
+
        static void email (
-               std::string film_name,
-               std::string cpl_name,
                std::list<CinemaKDMs> cinema_kdms,
-               dcp::LocalTime from,
-               dcp::LocalTime to,
-               boost::shared_ptr<Log> log
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               dcp::NameFormat::Map name_values,
+               std::string cpl_name
                );
 
        boost::shared_ptr<Cinema> cinema;