X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.h;h=0626ded5d0f7324d9ed5a3b66440cf4b6e93a70f;hp=a9ab4867ed9b203a6c95d47c6f48e5843cae4d17;hb=36ce958a516567d8481163692c028a88c6ce0df7;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index a9ab4867e..0626ded5d 100644
--- 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,25 +27,36 @@ class Log;
 class CinemaKDMs
 {
 public:
-	void make_zip_file (boost::filesystem::path zip_file, KDMNameFormat name_format, NameFormat::Map name_values) 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 std::list<CinemaKDMs> collect (std::list<boost::shared_ptr<KDMWithMetadata> > kdms);
 
-	static void write_zip_files (
+	static int write_directories (
 		std::list<CinemaKDMs> cinema_kdms,
 		boost::filesystem::path directory,
-		KDMNameFormat name_format,
-		NameFormat::Map name_values
+		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::list<CinemaKDMs> cinema_kdms,
-		KDMNameFormat name_format,
-		NameFormat::Map name_values,
-		std::string cpl_name,
-		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;
-	std::list<ScreenKDM> screen_kdms;
+	std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms;
 };