diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-03 11:17:34 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-03 20:18:04 +0200 |
| commit | 689fa55d1529ad88449ca464e9107c4dcc54d1cb (patch) | |
| tree | edd1264941263f2fa25a98d61f98c87876c5b667 /src/lib/screen.cc | |
| parent | 0aabe4060ea4bad7c7caac633aef0737fccff8c2 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/screen.cc')
| -rw-r--r-- | src/lib/screen.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 8e1e83e36..504504c8c 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "screen.h" #include "kdm_with_metadata.h" #include "film.h" @@ -26,13 +27,16 @@ #include <boost/algorithm/string.hpp> #include <boost/date_time/posix_time/posix_time.hpp> -using std::string; -using std::vector; + using std::list; +using std::make_shared; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; using namespace dcpomatic; + Screen::Screen (cxml::ConstNodePtr node) : KDMRecipient (node) { @@ -45,6 +49,7 @@ Screen::Screen (cxml::ConstNodePtr node) } } + void Screen::as_xml (xmlpp::Element* parent) const { @@ -54,6 +59,7 @@ Screen::as_xml (xmlpp::Element* parent) const } } + vector<string> Screen::trusted_device_thumbprints () const { @@ -78,14 +84,14 @@ kdm_for_screen ( ) { if (!screen->recipient) { - return KDMWithMetadataPtr(); + return {}; } - shared_ptr<const Cinema> cinema = screen->cinema; + 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); - dcp::EncryptedKDM const kdm = film->make_kdm ( + auto const kdm = film->make_kdm ( screen->recipient.get(), screen->trusted_device_thumbprints(), cpl, @@ -106,6 +112,6 @@ kdm_for_screen ( name_values['e'] = end.date() + " " + end.time_of_day(true, false); name_values['i'] = kdm.cpl_id(); - return KDMWithMetadataPtr(new KDMWithMetadata(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm)); + return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm); } |