Pull methods out of CinemaKDMs.

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

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 98cb84541677f2518f8b71a7750ce311cc066059..592bec9233cee9bb2c88f46a6b552f6910f40dae 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -18,7 +18,7 @@
 
 */
 
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 
 class Cinema;
 class Job;
@@ -27,11 +27,15 @@ class Log;
 class CinemaKDMs
 {
 public:
-       void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
+       boost::shared_ptr<Cinema> cinema;
+       std::list<KDMWithMetadataPtr > screen_kdms;
+};
 
-       static std::list<CinemaKDMs> collect (std::list<ScreenKDM> kdms);
+void make_zip_file (CinemaKDMs kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values);
 
-       static int write_directories (
+std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
+
+int write_directories (
                std::list<CinemaKDMs> cinema_kdms,
                boost::filesystem::path directory,
                dcp::NameFormat container_name_format,
@@ -40,7 +44,7 @@ public:
                boost::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
-       static int write_zip_files (
+int write_zip_files (
                std::list<CinemaKDMs> cinema_kdms,
                boost::filesystem::path directory,
                dcp::NameFormat container_name_format,
@@ -49,14 +53,11 @@ public:
                boost::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
-       static void email (
+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,
-               std::string cpl_name,
-               boost::shared_ptr<Log> log
+               std::string cpl_name
                );
 
-       boost::shared_ptr<Cinema> cinema;
-       std::list<ScreenKDM> screen_kdms;
-};