X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.cc;h=a9291e8f05e4fa84bd84158e92c7c419e42766a6;hb=d5d9e143a5778928c5f386a7bd9cb140d4f1191a;hp=25e44f77dcd698758b2853a355c70356d07288ea;hpb=bb767c7e338414beee132af3e96829c1448e214b;p=dcpomatic.git diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 25e44f77d..a9291e8f0 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -1,104 +1,119 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2013-2021 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 + #include "screen.h" -#include "format.h" -#include "exceptions.h" +#include "kdm_with_metadata.h" +#include "film.h" +#include "cinema.h" +#include +#include +#include -using namespace std; -using namespace boost; -Screen::Screen (string n) - : _name (n) -{ - vector f = Format::all (); - for (vector::iterator i = f.begin(); i != f.end(); ++i) { - set_geometry (*i, Position (0, 0), Size (2048, 1080)); - } -} +using std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; +using boost::optional; +using namespace dcpomatic; -void -Screen::set_geometry (Format const * f, Position p, Size s) -{ - _geometries[f] = Geometry (p, s); -} -Position -Screen::position (Format const * f) const +Screen::Screen (cxml::ConstNodePtr node) + : KDMRecipient (node) { - GeometryMap::const_iterator i = _geometries.find (f); - if (i == _geometries.end ()) { - throw PlayError ("format not found for screen"); + for (auto i: node->node_children ("TrustedDevice")) { + 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())); + } } - - return i->second.position; } -Size -Screen::size (Format const * f) const + +void +Screen::as_xml (xmlpp::Element* parent) const { - GeometryMap::const_iterator i = _geometries.find (f); - if (i == _geometries.end ()) { - throw PlayError ("format not found for screen"); + KDMRecipient::as_xml (parent); + for (auto i: trusted_devices) { + parent->add_child("TrustedDevice")->add_child_text(i.as_string()); } - - return i->second.size; } -string -Screen::as_metadata () const -{ - stringstream s; - s << "\"" << _name << "\""; - for (GeometryMap::const_iterator i = _geometries.begin(); i != _geometries.end(); ++i) { - s << " " << i->first->as_metadata() - << " " << i->second.position.x << " " << i->second.position.y - << " " << i->second.size.width << " " << i->second.size.height; +vector +Screen::trusted_device_thumbprints () const +{ + vector t; + for (auto i: trusted_devices) { + t.push_back (i.thumbprint()); } - - return s.str (); + return t; } -shared_ptr -Screen::create_from_metadata (string v) -{ - vector b = split_at_spaces_considering_quotes (v); - if (b.size() < 1) { - return shared_ptr (); +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 {}; } - shared_ptr s (new Screen (b[0])); - - vector::size_type i = 1; - while (b.size() > i) { - if (b.size() >= (i + 5)) { - s->set_geometry ( - Format::from_metadata (b[i].c_str()), - Position (atoi (b[i+1].c_str()), atoi (b[i+2].c_str())), - Size (atoi (b[i+3].c_str()), atoi (b[i+4].c_str())) - ); - } - i += 5; + auto 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); + + auto 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; + } else { + name_values['c'] = ""; } + 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['i'] = kdm.cpl_id(); - return s; + return make_shared(name_values, cinema.get(), cinema ? cinema->emails : list(), kdm); } +