X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.cc;h=61a27f2bc46a2afe864e55acfb77f3fce7fc5af1;hb=581797d640af1572f884ddf4395924894b745b3a;hp=159c4326bc5b08e7e4ad26af87cffd7f54391efe;hpb=e170d9908c191180aefe71ff7cfa81a5ba08ed83;p=dcpomatic.git diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 159c4326b..61a27f2bc 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -1,49 +1,112 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "screen.h" +#include "kdm_with_metadata.h" +#include "film.h" +#include "cinema.h" #include #include +#include +#include + +using std::string; +using std::vector; +using std::list; +using boost::shared_ptr; +using boost::optional; +using namespace dcpomatic; Screen::Screen (cxml::ConstNodePtr node) - : name (node->string_child ("Name")) + : KDMRecipient (node) { - if (node->optional_string_child ("Certificate")) { - recipient = dcp::Certificate (node->string_child ("Certificate")); - } else if (node->optional_string_child ("Recipient")) { - recipient = dcp::Certificate (node->string_child ("Recipient")); - } - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) { - trusted_devices.push_back (dcp::Certificate (i->content ())); + if (boost::algorithm::starts_with(i->content(), "-----BEGIN CERTIFICATE-----")) { + trusted_devices.push_back (TrustedDevice(dcp::Certificate(i->content()))); + } else { + trusted_devices.push_back (TrustedDevice(i->content())); + } } } void Screen::as_xml (xmlpp::Element* parent) const { - parent->add_child("Name")->add_child_text (name); - if (recipient) { - parent->add_child("Recipient")->add_child_text (recipient->certificate (true)); + KDMRecipient::as_xml (parent); + BOOST_FOREACH (TrustedDevice i, trusted_devices) { + parent->add_child("TrustedDevice")->add_child_text(i.as_string()); } +} - BOOST_FOREACH (dcp::Certificate const & i, trusted_devices) { - parent->add_child("TrustedDevice")->add_child_text (i.certificate (true)); +vector +Screen::trusted_device_thumbprints () const +{ + vector t; + BOOST_FOREACH (TrustedDevice i, trusted_devices) { + t.push_back (i.thumbprint()); } + return t; } + + +KDMWithMetadataPtr +kdm_for_screen ( + shared_ptr film, + boost::filesystem::path cpl, + shared_ptr screen, + boost::posix_time::ptime valid_from, + boost::posix_time::ptime valid_to, + dcp::Formulation formulation, + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio + ) +{ + if (!screen->recipient) { + return KDMWithMetadataPtr(); + } + + shared_ptr cinema = screen->cinema; + dcp::LocalTime const begin(valid_from, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0); + dcp::LocalTime const end (valid_to, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0); + + dcp::EncryptedKDM const kdm = film->make_kdm ( + screen->recipient.get(), + screen->trusted_device_thumbprints(), + cpl, + begin, + end, + formulation, + disable_forensic_marking_picture, + disable_forensic_marking_audio + ); + + dcp::NameFormat::Map name_values; + if (cinema) { + name_values['c'] = cinema->name; + } + name_values['s'] = screen->name; + name_values['f'] = film->name(); + name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); + name_values['e'] = end.date() + " " + end.time_of_day(true, false); + name_values['i'] = kdm.cpl_id(); + + return KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, cinema.get(), cinema ? cinema->emails : list(), kdm)); +} +