Add DCP-o-matic DKDMs straight to the configured list.

3 files changed, 11 insertions, 49 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) {
diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index fed233ad1..710f5e42d 100644
--- a/src/wx/self_dkdm_dialog.cc
+++ b/src/wx/self_dkdm_dialog.cc
@@ -24,11 +24,6 @@
 #include "lib/film.h"
 #include "lib/screen.h"
 #include <libcxml/cxml.h>
-#ifdef DCPOMATIC_USE_OWN_PICKER
-#include "dir_picker_ctrl.h"
-#else
-#include <wx/filepicker.h>
-#endif
 #include <wx/treectrl.h>
 #include <wx/listctrl.h>
 #include <wx/stdpaths.h>
@@ -60,27 +55,6 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film>
 	_cpl = new KDMCPLPanel (this, film->cpls ());
 	vertical->Add (_cpl);
 
-	/* Sub-heading: Output */
-	h = new wxStaticText (this, wxID_ANY, _("Output"));
-	h->SetFont (subheading_font);
-	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
-
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-
-	add_label_to_sizer (table, this, _("Write to"), true);
-
-#ifdef DCPOMATIC_USE_OWN_PICKER
-	_folder = new DirPickerCtrl (this);
-#else
-	_folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
-#endif
-
-	_folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
-
-	table->Add (_folder, 1, wxEXPAND);
-
-	vertical->Add (table);
-
 	/* Make an overall sizer to get a nice border, and put some buttons in */
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -112,9 +86,3 @@ SelfDKDMDialog::cpl () const
 {
 	return _cpl->cpl ();
 }
-
-boost::filesystem::path
-SelfDKDMDialog::directory () const
-{
-	return wx_to_std (_folder->GetPath ());
-}
diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h
index edf64132d..5b1404081 100644
--- a/src/wx/self_dkdm_dialog.h
+++ b/src/wx/self_dkdm_dialog.h
@@ -26,8 +26,6 @@
 
 class Film;
 class KDMCPLPanel;
-class DirPickerCtrl;
-class wxDirPickerCtrl;
 
 class SelfDKDMDialog : public wxDialog
 {
@@ -35,15 +33,9 @@ public:
 	SelfDKDMDialog (wxWindow *, boost::shared_ptr<const Film>);
 
 	boost::filesystem::path cpl () const;
-	boost::filesystem::path directory () const;
 
 private:
 	void setup_sensitivity ();
 
 	KDMCPLPanel* _cpl;
-#ifdef DCPOMATIC_USE_OWN_PICKER
-	DirPickerCtrl* _folder;
-#else
-	wxDirPickerCtrl* _folder;
-#endif
 };