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 99c2ef8dcf6da0f00bd6f38307979047b121716d..fbeeffbc13403614ed5c1a7439975b5c16edefd9 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, void const* group, std::list<std::string> emails, dcp::EncryptedKDM kdm)
+       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)
@@ -58,14 +58,14 @@ public:
                return _group;
        }
 
-       std::list<std::string> emails () const {
+       std::vector<std::string> emails() const {
                return _emails;
        }
 
 private:
        dcp::NameFormat::Map _name_values;
        void const* _group;
-       std::list<std::string> _emails;
+       std::vector<std::string> _emails;
        dcp::EncryptedKDM _kdm;
 };
 
@@ -75,7 +75,7 @@ typedef std::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
 
 int write_files (
        std::list<KDMWithMetadataPtr> screen_kdms, boost::filesystem::path directory,
-       dcp::NameFormat name_format, boost::function<bool (boost::filesystem::path)> confirm_overwrite
+       dcp::NameFormat name_format, std::function<bool (boost::filesystem::path)> confirm_overwrite
        );
 
 
@@ -90,7 +90,7 @@ int write_directories (
                boost::filesystem::path directory,
                dcp::NameFormat container_name_format,
                dcp::NameFormat filename_format,
-               boost::function<bool (boost::filesystem::path)> confirm_overwrite
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 
@@ -99,15 +99,16 @@ int write_zip_files (
                boost::filesystem::path directory,
                dcp::NameFormat container_name_format,
                dcp::NameFormat filename_format,
-               boost::function<bool (boost::filesystem::path)> confirm_overwrite
+               std::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 
-void email (
+void send_emails (
                std::list<std::list<KDMWithMetadataPtr>> kdms,
                dcp::NameFormat container_name_format,
                dcp::NameFormat filename_format,
-               std::string cpl_name
+               std::string cpl_name,
+               std::vector<std::string> extra_addresses
                );
 
 #endif