summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-01-06 16:54:51 +0000
committerCarl Hetherington <cth@carlh.net>2016-01-06 16:54:51 +0000
commitfbbeeb38b0f028327f5f93b97c301fd5e114395e (patch)
tree8c2851a6ac758d275ae848b02504a2911ddb9526 /src/tools
parent16235888dcaee506a3bb562693e985c5bbbde293 (diff)
Add DCP-o-matic DKDMs straight to the configured list.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3162dee98..0260cd9a8 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -541,17 +541,19 @@ private:
}
try {
- dcp::EncryptedKDM kdm = _film->make_kdm (
- Config::instance()->decryption_chain()->leaf(),
- vector<dcp::Certificate> (),
- d->cpl (),
- dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
- dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
- dcp::MODIFIED_TRANSITIONAL_1
+ vector<dcp::EncryptedKDM> dkdms = Config::instance()->dkdms ();
+ dkdms.push_back (
+ _film->make_kdm (
+ Config::instance()->decryption_chain()->leaf(),
+ vector<dcp::Certificate> (),
+ d->cpl (),
+ dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
+ dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
+ dcp::MODIFIED_TRANSITIONAL_1
+ )
);
- string const name = tidy_for_filename(_film->name()) + "_DKDM.kdm.xml";
- kdm.as_xml (d->directory() / name);
+ Config::instance()->set_dkdms (dkdms);
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {