Set 'i' earlier in name_values.

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

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index 8d6d61daad3412cf4214ad98f43b9440122392e6..e7b3c23bafa8675cf7e33c9a11fe1c56a72bac1a 100644 (file)
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -28,38 +28,87 @@
 #include <dcp/name_format.h>
 #include <boost/shared_ptr.hpp>
 
-namespace dcpomatic {
-       class Screen;
-}
+class Cinema;
 
-/** Simple class to collect a screen and an encrypted KDM */
 class KDMWithMetadata
 {
 public:
-       KDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s)
-               : screen (s)
+       KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema)
+               : _name_values (name_values)
+               , _cinema (cinema)
        {}
 
        virtual ~KDMWithMetadata () {}
 
        virtual std::string kdm_as_xml () const = 0;
        virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
-       virtual std::string kdm_id () const = 0;
 
-       static int write_files (
-               std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms, boost::filesystem::path directory,
-               dcp::NameFormat name_format, dcp::NameFormat::Map name_values,
+       dcp::NameFormat::Map const& name_values () const {
+               return _name_values;
+       }
+
+       boost::optional<std::string> get (char k) const;
+
+       boost::shared_ptr<Cinema> cinema () const {
+               return _cinema;
+       }
+
+private:
+       dcp::NameFormat::Map _name_values;
+       boost::shared_ptr<Cinema> _cinema;
+};
+
+
+typedef boost::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
+
+
+int write_files (
+       std::list<KDMWithMetadataPtr> screen_kdms, boost::filesystem::path directory,
+       dcp::NameFormat name_format, dcp::NameFormat::Map name_values,
+       boost::function<bool (boost::filesystem::path)> confirm_overwrite
+       );
+
+
+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
                );
 
-       boost::shared_ptr<dcpomatic::Screen> screen;
-};
+
+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
+               );
+
 
 class DCPKDMWithMetadata : public KDMWithMetadata
 {
 public:
-       DCPKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, dcp::EncryptedKDM k)
-               : KDMWithMetadata (s)
+       DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM k)
+               : KDMWithMetadata (name_values, cinema)
                , kdm (k)
        {}
 
@@ -71,10 +120,6 @@ public:
                return kdm.as_xml (out);
        }
 
-       std::string kdm_id () const {
-               return kdm.cpl_id ();
-       }
-
        dcp::EncryptedKDM kdm;
 };
 
@@ -82,8 +127,8 @@ public:
 class ECinemaKDMWithMetadata : public KDMWithMetadata
 {
 public:
-       ECinemaKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, EncryptedECinemaKDM k)
-               : KDMWithMetadata (s)
+       ECinemaKDMWithMetadata (dcp::NameValues::Map const& name_values, boost::shared_ptr<Cinema> cinema, EncryptedECinemaKDM k)
+               : KDMWithMetadata (name_values, cinema)
                , kdm (k)
        {}
 
@@ -95,10 +140,6 @@ public:
                return kdm.as_xml (out);
        }
 
-       std::string kdm_id () const {
-               return kdm.id ();
-       }
-
        EncryptedECinemaKDM kdm;
 };
 #endif