Rename ScreenKDM -> KDMWithMetadata

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

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 318d62e8d84c50724c51da231ed3eee448f5be1b..0626ded5d0f7324d9ed5a3b66440cf4b6e93a70f 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -1,23 +1,24 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "screen_kdm.h"
+#include "kdm_with_metadata.h"
 
 class Cinema;
 class Job;
@@ -26,19 +27,36 @@ class Log;
 class CinemaKDMs
 {
 public:
-       void make_zip_file (std::string film_name, boost::filesystem::path zip_file) 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<boost::shared_ptr<KDMWithMetadata> > kdms);
+
+       static int write_directories (
+               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 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 std::list<CinemaKDMs> collect (std::list<ScreenKDM> kdms);
-       static void write_zip_files (std::string film_name, std::list<CinemaKDMs> cinema_kdms, boost::filesystem::path directory);
        static void email (
-               std::string film_name,
-               std::string cpl_name,
                std::list<CinemaKDMs> cinema_kdms,
-               dcp::LocalTime from,
-               dcp::LocalTime to,
-               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;
 };