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 e7b3c23bafa8675cf7e33c9a11fe1c56a72bac1a..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,30 +18,35 @@
 
 */
 
+
 #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>
+
 
 class Cinema;
 
+
 class KDMWithMetadata
 {
 public:
-       KDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema)
+       KDMWithMetadata(dcp::NameFormat::Map const& name_values, void const* group, std::vector<std::string> emails, dcp::EncryptedKDM kdm)
                : _name_values (name_values)
-               , _cinema (cinema)
+               , _group (group)
+               , _emails (emails)
+               , _kdm (kdm)
        {}
 
-       virtual ~KDMWithMetadata () {}
+       std::string kdm_as_xml () const {
+               return _kdm.as_xml ();
+       }
 
-       virtual std::string kdm_as_xml () const = 0;
-       virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
+       void kdm_as_xml (boost::filesystem::path out) const {
+               return _kdm.as_xml (out);
+       }
 
        dcp::NameFormat::Map const& name_values () const {
                return _name_values;
@@ -49,99 +54,62 @@ public:
 
        boost::optional<std::string> get (char k) const;
 
-       boost::shared_ptr<Cinema> cinema () const {
-               return _cinema;
+       void const* group () const {
+               return _group;
+       }
+
+       std::vector<std::string> emails() const {
+               return _emails;
        }
 
 private:
        dcp::NameFormat::Map _name_values;
-       boost::shared_ptr<Cinema> _cinema;
+       void const* _group;
+       std::vector<std::string> _emails;
+       dcp::EncryptedKDM _kdm;
 };
 
 
-typedef boost::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
+typedef std::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, 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, 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);
+std::list<std::list<KDMWithMetadataPtr>> collect (std::list<KDMWithMetadataPtr> kdms);
 
 
 int write_directories (
-               std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+               std::list<std::list<KDMWithMetadataPtr>> 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
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 
 int write_zip_files (
-               std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+               std::list<std::list<KDMWithMetadataPtr>> 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
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 
-void email (
-               std::list<std::list<KDMWithMetadataPtr> > cinema_kdms,
+void send_emails (
+               std::list<std::list<KDMWithMetadataPtr>> kdms,
                dcp::NameFormat container_name_format,
                dcp::NameFormat filename_format,
-               dcp::NameFormat::Map name_values,
-               std::string cpl_name
+               std::string cpl_name,
+               std::vector<std::string> extra_addresses
                );
 
-
-class DCPKDMWithMetadata : public KDMWithMetadata
-{
-public:
-       DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM 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);
-       }
-
-       dcp::EncryptedKDM kdm;
-};
-
-#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;
-};
 #endif
 
-#endif