X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.h;h=0a5749ee89a801f9635f8f743a68c7d669349970;hb=9262839360779de83b711f86151fcf56b86c3989;hp=2b82cdab6e7662a5b5a5f7d58993ca672d31e74b;hpb=006e38346a8bcdcc889979b7c00802d9bb8fc6f8;p=dcpomatic.git

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 2b82cdab6..0a5749ee8 100644
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -18,21 +18,18 @@
 
 */
 
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 
 class Cinema;
 class Job;
 class Log;
 
-class CinemaKDMs
-{
-public:
-	void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
+void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values);
 
-	static std::list<CinemaKDMs> collect (std::list<boost::shared_ptr<ScreenKDM> > kdms);
+std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr> kdms);
 
-	static int write_directories (
-		std::list<CinemaKDMs> cinema_kdms,
+int write_directories (
+		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -40,8 +37,8 @@ public:
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
-	static int write_zip_files (
-		std::list<CinemaKDMs> cinema_kdms,
+int write_zip_files (
+		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -49,14 +46,11 @@ public:
 		boost::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
-	static void email (
-		std::list<CinemaKDMs> cinema_kdms,
+void email (
+		std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
 		dcp::NameFormat::Map name_values,
 		std::string cpl_name
 		);
 
-	boost::shared_ptr<Cinema> cinema;
-	std::list<boost::shared_ptr<ScreenKDM> > screen_kdms;
-};