Change end() to only do one thing, and copy the required stuff into pause()

[dcpomatic.git] / src / lib / screen.cc

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 5ef007214b874c02cbe52f8f5b4433a071a6a552..f0c80cd794f7a27e524859a76f7bdba85536e7ff 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -75,11 +75,10 @@ Screen::trusted_device_thumbprints () const
 
 KDMWithMetadataPtr
 kdm_for_screen (
-       shared_ptr<const Film> film,
-       boost::filesystem::path cpl,
+       std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
        shared_ptr<const dcpomatic::Screen> screen,
-       boost::posix_time::ptime valid_from,
-       boost::posix_time::ptime valid_to,
+       dcp::LocalTime valid_from,
+       dcp::LocalTime valid_to,
        dcp::Formulation formulation,
        bool disable_forensic_marking_picture,
        optional<int> disable_forensic_marking_audio,
@@ -91,18 +90,17 @@ kdm_for_screen (
        }
 
        auto cinema = screen->cinema;
-       dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
-       dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
 
-       period_checks.push_back(check_kdm_and_certificate_validity_periods(screen->recipient.get(), begin, end));
+       period_checks.push_back(check_kdm_and_certificate_validity_periods(cinema ? cinema->name : "", screen->name, screen->recipient.get(), valid_from, valid_to));
 
        auto signer = Config::instance()->signer_chain();
        if (!signer->valid()) {
                throw InvalidSignerError();
        }
 
-       auto const decrypted_kdm = film->make_kdm(cpl, begin, end);
-       auto kdm = decrypted_kdm.encrypt(signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+       auto kdm = make_kdm(valid_from, valid_to).encrypt(
+               signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
+               );
 
        dcp::NameFormat::Map name_values;
        if (cinema) {
@@ -112,10 +110,10 @@ kdm_for_screen (
        }
        name_values['s'] = screen->name;
        name_values['f'] = kdm.content_title_text();
-       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+       name_values['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false);
+       name_values['e'] = valid_to.date() + " " + valid_to.time_of_day(true, false);
        name_values['i'] = kdm.cpl_id();
 
-       return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm);
+       return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : vector<string>(), kdm);
 }