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

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index ecff32ff4..0a5749ee8 100644
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -1,43 +1,56 @@
 /*
     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;
+class Log;
+
+void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values);
+
+std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr> kdms);
+
+int write_directories (
+		std::list<std::list<KDMWithMetadataPtr> > 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
+		);
+
+int write_zip_files (
+		std::list<std::list<KDMWithMetadataPtr> > 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
+		);
 
-class CinemaKDMs
-{
-public:
-	void make_zip_file (std::string name_first_part, boost::filesystem::path zip_file) const;
-
-	static std::list<CinemaKDMs> collect (std::list<ScreenKDM> kdms);
-	static void write_zip_files (std::string filename_first_part, std::list<CinemaKDMs> cinema_kdms, boost::filesystem::path directory);
-	static void email (
-		std::string filename_first_part,
-		std::string cpl_name,
-		std::list<CinemaKDMs> cinema_kdms,
-		dcp::LocalTime from,
-		dcp::LocalTime to,
-		boost::shared_ptr<Job> job
+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<ScreenKDM> screen_kdms;
-};