Cleanup: replace some list with vector.

[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..fbeeffbc13403614ed5c1a7439975b5c16edefd9 100644 (file)
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,89 +18,98 @@
 
 */
 
+
 #ifndef DCPOMATIC_KDM_WITH_METADATA_H
 #define DCPOMATIC_KDM_WITH_METADATA_H
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "encrypted_ecinema_kdm.h"
-#endif
+
 #include <dcp/encrypted_kdm.h>
 #include <dcp/name_format.h>
-#include <boost/shared_ptr.hpp>
 
-namespace dcpomatic {
-       class Screen;
-}
 
-/** Simple class to collect a screen and an encrypted KDM */
-class KDMWithMetadata
-{
-public:
-       KDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s)
-               : screen (s)
-       {}
-
-       virtual ~KDMWithMetadata () {}
+class Cinema;
 
-       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,
-               boost::function<bool (boost::filesystem::path)> confirm_overwrite
-               );
-
-       boost::shared_ptr<dcpomatic::Screen> screen;
-};
-
-class DCPKDMWithMetadata : public KDMWithMetadata
+class KDMWithMetadata
 {
 public:
-       DCPKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, dcp::EncryptedKDM k)
-               : KDMWithMetadata (s)
-               , kdm (k)
+       KDMWithMetadata(dcp::NameFormat::Map const& name_values, void const* group, std::vector<std::string> emails, dcp::EncryptedKDM kdm)
+               : _name_values (name_values)
+               , _group (group)
+               , _emails (emails)
+               , _kdm (kdm)
        {}
 
        std::string kdm_as_xml () const {
-               return kdm.as_xml ();
+               return _kdm.as_xml ();
        }
 
        void kdm_as_xml (boost::filesystem::path out) const {
-               return kdm.as_xml (out);
+               return _kdm.as_xml (out);
        }
 
-       std::string kdm_id () const {
-               return kdm.cpl_id ();
+       dcp::NameFormat::Map const& name_values () const {
+               return _name_values;
        }
 
-       dcp::EncryptedKDM kdm;
-};
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-class ECinemaKDMWithMetadata : public KDMWithMetadata
-{
-public:
-       ECinemaKDMWithMetadata (boost::shared_ptr<dcpomatic::Screen> s, EncryptedECinemaKDM k)
-               : KDMWithMetadata (s)
-               , kdm (k)
-       {}
+       boost::optional<std::string> get (char k) const;
 
-       std::string kdm_as_xml () const {
-               return kdm.as_xml ();
+       void const* group () const {
+               return _group;
        }
 
-       void kdm_as_xml (boost::filesystem::path out) const {
-               return kdm.as_xml (out);
+       std::vector<std::string> emails() const {
+               return _emails;
        }
 
-       std::string kdm_id () const {
-               return kdm.id ();
-       }
-
-       EncryptedECinemaKDM kdm;
+private:
+       dcp::NameFormat::Map _name_values;
+       void const* _group;
+       std::vector<std::string> _emails;
+       dcp::EncryptedKDM _kdm;
 };
-#endif
+
+
+typedef std::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
+
+
+int write_files (
+       std::list<KDMWithMetadataPtr> screen_kdms, boost::filesystem::path directory,
+       dcp::NameFormat name_format, std::function<bool (boost::filesystem::path)> confirm_overwrite
+       );
+
+
+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);
+
+
+int write_directories (
+               std::list<std::list<KDMWithMetadataPtr>> kdms,
+               boost::filesystem::path directory,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
+               );
+
+
+int write_zip_files (
+               std::list<std::list<KDMWithMetadataPtr>> kdms,
+               boost::filesystem::path directory,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
+               );
+
+
+void send_emails (
+               std::list<std::list<KDMWithMetadataPtr>> kdms,
+               dcp::NameFormat container_name_format,
+               dcp::NameFormat filename_format,
+               std::string cpl_name,
+               std::vector<std::string> extra_addresses
+               );
 
 #endif
+