Add KDMWithMetadataPtr typedef

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 99d1511520b1bbb3d1e1a73b5d01a6190c7ac07c..61234ff3fd6af6b5df8299903ae45b46cfd7223a 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -47,7 +47,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
 
        name_values['c'] = cinema->name;
 
-       BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
+       BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
                name_values['s'] = i->screen->name;
                name_values['i'] = i->kdm_id ();
                string const name = careful_string_filter(name_format.get(name_values, ".xml"));
@@ -61,7 +61,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
  *  CinemaKDM contains the KDMs for its cinema.
  */
 list<CinemaKDMs>
-CinemaKDMs::collect (list<shared_ptr<KDMWithMetadata> > screen_kdms)
+CinemaKDMs::collect (list<KDMWithMetadataPtr> screen_kdms)
 {
        list<CinemaKDMs> cinema_kdms;
 
@@ -71,17 +71,17 @@ CinemaKDMs::collect (list<shared_ptr<KDMWithMetadata> > screen_kdms)
 
                CinemaKDMs ck;
 
-               list<shared_ptr<KDMWithMetadata> >::iterator i = screen_kdms.begin ();
+               list<KDMWithMetadataPtr>::iterator i = screen_kdms.begin ();
                ck.cinema = (*i)->screen->cinema;
                ck.screen_kdms.push_back (*i);
-               list<shared_ptr<KDMWithMetadata> >::iterator j = i;
+               list<KDMWithMetadataPtr>::iterator j = i;
                ++i;
                screen_kdms.remove (*j);
 
                while (i != screen_kdms.end ()) {
                        if ((*i)->screen->cinema == ck.cinema) {
                                ck.screen_kdms.push_back (*i);
-                               list<shared_ptr<KDMWithMetadata> >::iterator j = i;
+                               list<KDMWithMetadataPtr>::iterator j = i;
                                ++i;
                                screen_kdms.remove (*j);
                        } else {
@@ -117,7 +117,7 @@ CinemaKDMs::write_directories (
                path /= container_name_format.get(name_values, "");
                if (!boost::filesystem::exists (path) || confirm_overwrite (path)) {
                        boost::filesystem::create_directories (path);
-                       KDMWithMetadata::write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
+                       write_files (i.screen_kdms, path, filename_format, name_values, confirm_overwrite);
                }
                written += i.screen_kdms.size();
        }
@@ -209,7 +209,7 @@ CinemaKDMs::email (
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
                string screens;
-               BOOST_FOREACH (shared_ptr<KDMWithMetadata> j, i.screen_kdms) {
+               BOOST_FOREACH (KDMWithMetadataPtr j, i.screen_kdms) {
                        screens += j->screen->name + ", ";
                }
                boost::algorithm::replace_all (body, "$SCREENS", screens.substr (0, screens.length() - 2));

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 0626ded5d0f7324d9ed5a3b66440cf4b6e93a70f..91867039731bf56178f621af4e5fd2d2234f70e2 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -29,7 +29,7 @@ class CinemaKDMs
 public:
        void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
 
-       static std::list<CinemaKDMs> collect (std::list<boost::shared_ptr<KDMWithMetadata> > kdms);
+       static std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
 
        static int write_directories (
                std::list<CinemaKDMs> cinema_kdms,
@@ -58,5 +58,5 @@ public:
                );
 
        boost::shared_ptr<Cinema> cinema;
-       std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms;
+       std::list<KDMWithMetadataPtr > screen_kdms;
 };

diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc
index e6b283415ed7cbad1fc8aed76239e430c5e682a0..674554f7ea13e5dd309d8f46a79a48e6cb9c7922 100644 (file)
--- a/src/lib/kdm_with_metadata.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -30,8 +30,8 @@ using std::list;
 using boost::shared_ptr;
 
 int
-KDMWithMetadata::write_files (
-       list<shared_ptr<KDMWithMetadata> > screen_kdms,
+write_files (
+       list<KDMWithMetadataPtr> screen_kdms,
        boost::filesystem::path directory,
        dcp::NameFormat name_format,
        dcp::NameFormat::Map name_values,
@@ -42,7 +42,7 @@ KDMWithMetadata::write_files (
 
        if (directory == "-") {
                /* Write KDMs to the stdout */
-               BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
+               BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
                        cout << i->kdm_as_xml ();
                        ++written;
                }
@@ -55,7 +55,7 @@ KDMWithMetadata::write_files (
        }
 
        /* Write KDMs to the specified directory */
-       BOOST_FOREACH (shared_ptr<KDMWithMetadata> i, screen_kdms) {
+       BOOST_FOREACH (KDMWithMetadataPtr i, screen_kdms) {
                name_values['c'] = i->screen->cinema ? i->screen->cinema->name : "";
                name_values['s'] = i->screen->name;
                name_values['i'] = i->kdm_id ();

diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index 8d6d61daad3412cf4214ad98f43b9440122392e6..19af0356f80d39c8e584611deb70dcde8cfa6049 100644 (file)
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -46,15 +46,20 @@ public:
        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;
 };
 
+
+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
+       );
+
+
 class DCPKDMWithMetadata : public KDMWithMetadata
 {
 public:

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 1ff69d13562cd3dfcdd2f194be6c70796283506a..efc09c818b42303b63d82b0c36d167c69de0af49 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -303,7 +303,7 @@ private:
                                return;
                        }
 
-                       list<shared_ptr<KDMWithMetadata> > screen_kdms;
+                       list<KDMWithMetadataPtr> screen_kdms;
                        string title;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
@@ -328,7 +328,7 @@ private:
 
                                        /* Encrypt */
                                        screen_kdms.push_back (
-                                               shared_ptr<KDMWithMetadata>(
+                                               KDMWithMetadataPtr(
                                                        new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get()))
                                                        )
                                                );
@@ -371,7 +371,7 @@ private:
 
                                        /* Encrypt */
                                        screen_kdms.push_back (
-                                               shared_ptr<KDMWithMetadata>(
+                                               KDMWithMetadataPtr(
                                                        new DCPKDMWithMetadata(
                                                                i,
                                                                kdm.encrypt(

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 1aad31cb534d7d1fd656bad295b55de3afc95110..a1003eceb27b4bcb885af7a4e785d3fa09e5f677 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -130,7 +130,7 @@ always_overwrite ()
 
 void
 write_files (
-       list<shared_ptr<KDMWithMetadata> > screen_kdms,
+       list<KDMWithMetadataPtr> screen_kdms,
        bool zip,
        boost::filesystem::path output,
        dcp::NameFormat container_name_format,
@@ -153,7 +153,7 @@ write_files (
                        cout << "Wrote " << N << " ZIP files to " << output << "\n";
                }
        } else {
-               int const N = KDMWithMetadata::write_files (
+               int const N = write_files (
                        screen_kdms, output, filename_format, values,
                        bind (&always_overwrite)
                        );
@@ -229,7 +229,7 @@ from_film (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<shared_ptr<KDMWithMetadata> > kdms;
+               list<KDMWithMetadataPtr> kdms;
 
                BOOST_FOREACH (shared_ptr<Screen> i, screens) {
                        if (i->recipient) {
@@ -244,7 +244,7 @@ from_film (
                                                disable_forensic_marking_audio
                                                );
 
-                               kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
+                               kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm)));
                        }
                }
 
@@ -345,14 +345,14 @@ from_dkdm (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<shared_ptr<KDMWithMetadata> > screen_kdms;
+               list<KDMWithMetadataPtr> screen_kdms;
                BOOST_FOREACH (shared_ptr<Screen> i, screens) {
                        if (!i->recipient) {
                                continue;
                        }
 
                        screen_kdms.push_back (
-                               shared_ptr<KDMWithMetadata>(
+                               KDMWithMetadataPtr(
                                        new DCPKDMWithMetadata(
                                                i,
                                                kdm_from_dkdm(

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 06600ac7ad5ea92086c4889a784ca8891ade387f..b067ff04afd36ce132196853cc3f30e28dbba2c0 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -150,7 +150,7 @@ KDMDialog::make_clicked ()
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
-       list<shared_ptr<KDMWithMetadata> > screen_kdms;
+       list<KDMWithMetadataPtr> screen_kdms;
        try {
                /* Start off by enabling forensic marking for all */
                optional<int> for_audio;
@@ -175,7 +175,7 @@ KDMDialog::make_clicked ()
                                                for_audio
                                                );
 
-                               screen_kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm)));
+                               screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm)));
                        }
                }
 

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 0320ed1b767629cef1731bc5db6504898cf206d8..541674ae120823ad4d8a835b24a3e545243b79d7 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -183,7 +183,7 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-       list<shared_ptr<KDMWithMetadata> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+       list<KDMWithMetadataPtr> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
        )
 {
        list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
@@ -247,7 +247,7 @@ KDMOutputPanel::make (
 
                if (_write_to->GetValue()) {
                        if (_write_flat->GetValue()) {
-                               written = KDMWithMetadata::write_files (
+                               written = write_files (
                                        screen_kdms,
                                        directory(),
                                        _filename_format->get(),

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 730cb93601f785e7193e2e59245418c7230a74d7..fbfc1205ebcea73c90d1a3a15e9eb2619aa5245c 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -52,7 +52,7 @@ public:
        }
 
        std::pair<boost::shared_ptr<Job>, int> make (
-               std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms,
+               std::list<KDMWithMetadataPtr > screen_kdms,
                std::string name,
                KDMTimingPanel* timing,
                boost::function<bool (boost::filesystem::path)> confirm_overwrite