Pull methods out of CinemaKDMs.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 918670397..592bec923 100644
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -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;
+};
+
+void make_zip_file (CinemaKDMs kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values);
 
-	static std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
+std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
 
-	static int write_directories (
+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,7 +53,7 @@ public:
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
-	static void email (
+void email (
 		std::list<CinemaKDMs> cinema_kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -57,6 +61,3 @@ public:
 		std::string cpl_name
 		);
 
-	boost::shared_ptr<Cinema> cinema;
-	std::list<KDMWithMetadataPtr > screen_kdms;
-};