Reword again: Text -> Caption and Plain -> Text.

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

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index e29fa5cbdc8037a1032f7e0de6a26aee4bde15c1..9d4887f5ae53456fe48fe54cd12e78108c342a71 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -31,16 +31,28 @@ public:
 
        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,
-               dcp::NameFormat name_format,
-               dcp::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,
-               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