X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcinema_kdms.h;h=566b947a23e22208a64a774a3fe7752b6fcb22d3;hb=698e3ac8863d264237003b49750ae074d612f451;hp=a9ab4867ed9b203a6c95d47c6f48e5843cae4d17;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4;p=dcpomatic.git

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index a9ab4867e..566b947a2 100644
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -27,23 +27,34 @@ 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 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;