Extract common code out into kdm_for_screen()

[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 e7b3c23bafa8675cf7e33c9a11fe1c56a72bac1a..6b9ff23c7ab3d5a22f16377474f78bb5c71e3bff 100644 (file)
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -33,7 +33,7 @@ class Cinema;
 class KDMWithMetadata
 {
 public:
-       KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema)
+       KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<const Cinema> cinema)
                : _name_values (name_values)
                , _cinema (cinema)
        {}
@@ -49,13 +49,13 @@ public:
 
        boost::optional<std::string> get (char k) const;
 
-       boost::shared_ptr<Cinema> cinema () const {
+       boost::shared_ptr<const Cinema> cinema () const {
                return _cinema;
        }
 
 private:
        dcp::NameFormat::Map _name_values;
-       boost::shared_ptr<Cinema> _cinema;
+       boost::shared_ptr<const Cinema> _cinema;
 };
 
 
@@ -64,12 +64,11 @@ 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
+       dcp::NameFormat name_format, 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);
+void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format);
 
 
 std::list<std::list<KDMWithMetadataPtr> > collect (std::list<KDMWithMetadataPtr> kdms);
@@ -80,7 +79,6 @@ int write_directories (
                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
                );
 
@@ -90,7 +88,6 @@ int write_zip_files (
                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
                );
 
@@ -99,15 +96,15 @@ 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
+template <class T>
+class SpecialKDMWithMetadata : public KDMWithMetadata
 {
 public:
-       DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM k)
+       SpecialKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<const Cinema> cinema, T k)
                : KDMWithMetadata (name_values, cinema)
                , kdm (k)
        {}
@@ -120,28 +117,13 @@ public:
                return kdm.as_xml (out);
        }
 
-       dcp::EncryptedKDM kdm;
+       T kdm;
 };
 
+typedef SpecialKDMWithMetadata<dcp::EncryptedKDM> DCPKDMWithMetadata;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-class ECinemaKDMWithMetadata : public KDMWithMetadata
-{
-public:
-       ECinemaKDMWithMetadata (dcp::NameValues::Map const& name_values, boost::shared_ptr<Cinema> cinema, EncryptedECinemaKDM k)
-               : KDMWithMetadata (name_values, cinema)
-               , kdm (k)
-       {}
-
-       std::string kdm_as_xml () const {
-               return kdm.as_xml ();
-       }
-
-       void kdm_as_xml (boost::filesystem::path out) const {
-               return kdm.as_xml (out);
-       }
-
-       EncryptedECinemaKDM kdm;
-};
+typedef SpecialKDMWithMetadata<EncryptedECinemaKDM> ECinemaKDMWithMetadata;
 #endif
 
 #endif
+