#include "lib/job_manager.h"
#include "lib/kdm_with_metadata.h"
#include "lib/exceptions.h"
-#include "lib/cinema_kdms.h"
#include "lib/send_kdm_email_job.h"
#include "lib/compose.hpp"
#include "lib/cinema.h"
return;
}
- list<shared_ptr<KDMWithMetadata> > screen_kdms;
+ list<KDMWithMetadataPtr> kdms;
string title;
#ifdef DCPOMATIC_VARIANT_SWAROOP
dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
);
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
/* Encrypt */
- screen_kdms.push_back (
- shared_ptr<KDMWithMetadata>(
- new ECinemaKDMWithMetadata(i, kdm.encrypt(i->recipient.get()))
+ kdms.push_back (
+ KDMWithMetadataPtr(
+ new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get()))
)
);
}
kdm.add_key (j);
}
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
/* Encrypt */
- screen_kdms.push_back (
- shared_ptr<KDMWithMetadata>(
+ kdms.push_back (
+ KDMWithMetadataPtr(
new DCPKDMWithMetadata(
- i,
+ name_values,
+ i->cinema,
kdm.encrypt(
signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
}
}
- if (screen_kdms.empty()) {
+ if (kdms.empty()) {
return;
}
pair<shared_ptr<Job>, int> result = _output->make (
- screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
+ kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
);
if (result.first) {