#include "lib/film.h"
#include "lib/cinema.h"
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
#include "lib/cinema_kdms.h"
#include "lib/config.h"
#include "lib/exceptions.h"
void
write_files (
- list<shared_ptr<ScreenKDM> > screen_kdms,
+ list<KDMWithMetadataPtr> screen_kdms,
bool zip,
boost::filesystem::path output,
dcp::NameFormat container_name_format,
)
{
if (zip) {
- int const N = CinemaKDMs::write_zip_files (
- CinemaKDMs::collect (screen_kdms),
+ int const N = write_zip_files (
+ collect (screen_kdms),
output,
container_name_format,
filename_format,
cout << "Wrote " << N << " ZIP files to " << output << "\n";
}
} else {
- int const N = ScreenKDM::write_files (
+ int const N = write_files (
screen_kdms, output, filename_format, values,
bind (&always_overwrite)
);
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
- list<shared_ptr<ScreenKDM> > kdms;
+ list<KDMWithMetadataPtr> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (i->recipient) {
disable_forensic_marking_audio
);
- kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
+ kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
}
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
- list<shared_ptr<ScreenKDM> > screen_kdms;
+ list<KDMWithMetadataPtr> screen_kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (!i->recipient) {
continue;
}
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
screen_kdms.push_back (
- shared_ptr<ScreenKDM>(
- new DCPScreenKDM(
- i,
+ KDMWithMetadataPtr(
+ new DCPKDMWithMetadata(
+ name_values,
+ i->cinema,
kdm_from_dkdm(
dkdm,
i->recipient.get(),