From ca56871d4860b8ead384c410fe374c2fa993f88f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 May 2020 23:02:45 +0200 Subject: [PATCH] Add KDMWithMetadataPtr typedef --- src/lib/cinema_kdms.cc | 14 +++++++------- src/lib/cinema_kdms.h | 4 ++-- src/lib/kdm_with_metadata.cc | 8 ++++---- src/lib/kdm_with_metadata.h | 17 +++++++++++------ src/tools/dcpomatic_kdm.cc | 6 +++--- src/tools/dcpomatic_kdm_cli.cc | 12 ++++++------ src/wx/kdm_dialog.cc | 4 ++-- src/wx/kdm_output_panel.cc | 4 ++-- src/wx/kdm_output_panel.h | 2 +- 9 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 99d151152..61234ff3f 100644 --- 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 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::collect (list > screen_kdms) +CinemaKDMs::collect (list screen_kdms) { list cinema_kdms; @@ -71,17 +71,17 @@ CinemaKDMs::collect (list > screen_kdms) CinemaKDMs ck; - list >::iterator i = screen_kdms.begin (); + list::iterator i = screen_kdms.begin (); ck.cinema = (*i)->screen->cinema; ck.screen_kdms.push_back (*i); - list >::iterator j = i; + list::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 >::iterator j = i; + list::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 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 0626ded5d..918670397 100644 --- 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 collect (std::list > kdms); + static std::list collect (std::list kdms); static int write_directories ( std::list cinema_kdms, @@ -58,5 +58,5 @@ public: ); boost::shared_ptr cinema; - std::list > screen_kdms; + std::list screen_kdms; }; diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index e6b283415..674554f7e 100644 --- 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 > screen_kdms, +write_files ( + list 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 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 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 8d6d61daa..19af0356f 100644 --- 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 > screen_kdms, boost::filesystem::path directory, - dcp::NameFormat name_format, dcp::NameFormat::Map name_values, - boost::function confirm_overwrite - ); - boost::shared_ptr screen; }; + +typedef boost::shared_ptr KDMWithMetadataPtr; + + +int write_files ( + std::list screen_kdms, boost::filesystem::path directory, + dcp::NameFormat name_format, dcp::NameFormat::Map name_values, + boost::function confirm_overwrite + ); + + class DCPKDMWithMetadata : public KDMWithMetadata { public: diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 1ff69d135..efc09c818 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -303,7 +303,7 @@ private: return; } - list > screen_kdms; + list screen_kdms; string title; #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -328,7 +328,7 @@ private: /* Encrypt */ screen_kdms.push_back ( - shared_ptr( + KDMWithMetadataPtr( new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get())) ) ); @@ -371,7 +371,7 @@ private: /* Encrypt */ screen_kdms.push_back ( - shared_ptr( + KDMWithMetadataPtr( new DCPKDMWithMetadata( i, kdm.encrypt( diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 1aad31cb5..a1003eceb 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -130,7 +130,7 @@ always_overwrite () void write_files ( - list > screen_kdms, + list 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 > kdms; + list kdms; BOOST_FOREACH (shared_ptr i, screens) { if (i->recipient) { @@ -244,7 +244,7 @@ from_film ( disable_forensic_marking_audio ); - kdms.push_back (shared_ptr(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 > screen_kdms; + list screen_kdms; BOOST_FOREACH (shared_ptr i, screens) { if (!i->recipient) { continue; } screen_kdms.push_back ( - shared_ptr( + KDMWithMetadataPtr( new DCPKDMWithMetadata( i, kdm_from_dkdm( diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 06600ac7a..b067ff04a 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -150,7 +150,7 @@ KDMDialog::make_clicked () shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - list > screen_kdms; + list screen_kdms; try { /* Start off by enabling forensic marking for all */ optional for_audio; @@ -175,7 +175,7 @@ KDMDialog::make_clicked () for_audio ); - screen_kdms.push_back (shared_ptr(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 0320ed1b7..541674ae1 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -183,7 +183,7 @@ KDMOutputPanel::kdm_write_type_changed () pair, int> KDMOutputPanel::make ( - list > screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite + list screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite ) { list 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 730cb9360..fbfc1205e 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -52,7 +52,7 @@ public: } std::pair, int> make ( - std::list > screen_kdms, + std::list screen_kdms, std::string name, KDMTimingPanel* timing, boost::function confirm_overwrite -- 2.30.2