#include "lib/film.h"
#include "lib/cinema.h"
-#include "lib/screen_kdm.h"
-#include "lib/cinema_kdms.h"
+#include "lib/kdm_with_metadata.h"
#include "lib/config.h"
#include "lib/exceptions.h"
#include "lib/emailer.h"
using std::list;
using std::vector;
using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
+
static void
help ()
{
void
write_files (
- list<shared_ptr<ScreenKDM> > screen_kdms,
+ list<KDMWithMetadataPtr> kdms,
bool zip,
boost::filesystem::path output,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
- dcp::NameFormat::Map values,
bool verbose
)
{
if (zip) {
- int const N = CinemaKDMs::write_zip_files (
- CinemaKDMs::collect (screen_kdms),
+ int const N = write_zip_files (
+ collect (kdms),
output,
container_name_format,
filename_format,
- values,
bind (&always_overwrite)
);
cout << "Wrote " << N << " ZIP files to " << output << "\n";
}
} else {
- int const N = ScreenKDM::write_files (
- screen_kdms, output, filename_format, values,
+ int const N = write_files (
+ kdms, output, filename_format,
bind (&always_overwrite)
);
boost::filesystem::path cpl = cpls.front().cpl_file;
- dcp::NameFormat::Map values;
- values['f'] = film->name();
- values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
- values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
-
try {
- list<shared_ptr<ScreenKDM> > screen_kdms = film->make_kdms (
- screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
- );
-
- write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+ list<KDMWithMetadataPtr> kdms;
+ for (auto i: screens) {
+ KDMWithMetadataPtr p = kdm_for_screen (film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
+ if (p) {
+ kdms.push_back (p);
+ }
+ }
+ write_files (kdms, zip, output, container_name_format, filename_format, verbose);
} catch (FileError& e) {
cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
exit (EXIT_FAILURE);
optional<dcp::EncryptedKDM>
sub_find_dkdm (shared_ptr<DKDMGroup> group, string cpl_id)
{
- BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+ for (auto i: group->children()) {
shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
if (g) {
optional<dcp::EncryptedKDM> dkdm = sub_find_dkdm (g, cpl_id);
dcp::LocalTime().as_string()
);
- BOOST_FOREACH (dcp::DecryptedKDMKey const & j, dkdm.keys()) {
+ for (auto const& j: dkdm.keys()) {
kdm.add_key(j);
}
)
{
dcp::NameFormat::Map values;
- values['f'] = dkdm.annotation_text().get_value_or("");
- values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
- values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
- list<shared_ptr<ScreenKDM> > screen_kdms;
- BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+ list<KDMWithMetadataPtr> kdms;
+ for (auto i: screens) {
if (!i->recipient) {
continue;
}
- screen_kdms.push_back (
- shared_ptr<ScreenKDM>(
- new DCPScreenKDM(
- i,
- kdm_from_dkdm(
+ dcp::LocalTime begin(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+ dcp::LocalTime end(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
+ dcp::EncryptedKDM const kdm = kdm_from_dkdm(
dkdm,
i->recipient.get(),
i->trusted_device_thumbprints(),
- dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
- dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+ begin,
+ end,
formulation,
disable_forensic_marking_picture,
disable_forensic_marking_audio
- )
- )
- )
- );
+ );
+
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+ name_values['f'] = dkdm.annotation_text().get_value_or("");
+ 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();
+
+ kdms.push_back (KDMWithMetadataPtr(new KDMWithMetadata(name_values, i->cinema.get(), i->cinema->emails, kdm)));
}
- write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose);
+ write_files (kdms, zip, output, container_name_format, filename_format, verbose);
} catch (FileError& e) {
cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n";
exit (EXIT_FAILURE);
}
cout << group->name() << "\n";
}
- BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+ for (auto i: group->children()) {
shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
if (g) {
dump_dkdm_group (g, indent + 2);
bool list_dkdm_cpls = false;
optional<string> duration_string;
bool verbose = false;
- dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
+ dcp::Formulation formulation = dcp::Formulation::MODIFIED_TRANSITIONAL_1;
bool disable_forensic_marking_picture = false;
optional<int> disable_forensic_marking_audio;
break;
case 'F':
if (string (optarg) == "modified-transitional-1") {
- formulation = dcp::MODIFIED_TRANSITIONAL_1;
+ formulation = dcp::Formulation::MODIFIED_TRANSITIONAL_1;
} else if (string (optarg) == "multiple-modified-transitional-1") {
- formulation = dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1;
+ formulation = dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1;
} else if (string (optarg) == "dci-any") {
- formulation = dcp::DCI_ANY;
+ formulation = dcp::Formulation::DCI_ANY;
} else if (string (optarg) == "dci-specific") {
- formulation = dcp::DCI_SPECIFIC;
+ formulation = dcp::Formulation::DCI_SPECIFIC;
} else {
error ("unrecognised KDM formulation " + string (optarg));
}
{
/* Make a new screen and add it to the current cinema */
dcp::CertificateChain chain (dcp::file_to_string(optarg));
- shared_ptr<Screen> screen (new Screen (screen_description, chain.leaf(), vector<TrustedDevice>()));
+ shared_ptr<Screen> screen (new Screen (screen_description, "", chain.leaf(), vector<TrustedDevice>()));
if (cinema) {
cinema->add_screen (screen);
}
}
if (list_cinemas) {
- list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
- for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+ list<std::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
+ for (list<std::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
}
exit (EXIT_SUCCESS);