Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 2a75bfa9fe809fd8c02436e533eb9af8c8b87c07..2b82cdab6e7662a5b5a5f7d58993ca672d31e74b 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -1,35 +1,62 @@
 /*
     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"
 
 class Cinema;
+class Job;
+class Log;
 
 class CinemaKDMs
 {
 public:
-       void make_zip_file (boost::shared_ptr<const Film> film, boost::filesystem::path zip_file) const;
-
-       static std::list<CinemaKDMs> collect (std::list<ScreenKDM> kdms);
-       static void write_zip_files (boost::shared_ptr<const Film> film, std::list<CinemaKDMs> cinema_kdms, boost::filesystem::path directory);
-       static void email (boost::shared_ptr<const Film> film, std::list<CinemaKDMs> cinema_kdms, dcp::LocalTime from, dcp::LocalTime to);
+       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<ScreenKDM> > 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 void email (
+               std::list<CinemaKDMs> 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;
+       std::list<boost::shared_ptr<ScreenKDM> > screen_kdms;
 };