Support basic drag-and-drop of DKDMs.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ccaa44edb74742cb288ca38258f222c7ce736a66..b5f317942749a2089a2ab94bc87cf697263fb8c0 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -64,8 +64,9 @@
 #include "lib/dcpomatic_socket.h"
 #include "lib/hints.h"
 #include "lib/dcp_content.h"
-#include "lib/ffmpeg_transcoder.h"
+#include "lib/ffmpeg_encoder.h"
 #include "lib/transcode_job.h"
+#include "lib/dkdm_wrapper.h"
 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
 #include <wx/generic/aboutdlgg.h>
@@ -690,9 +691,9 @@ private:
 
                if (kdm) {
                        if (d->internal ()) {
-                               vector<dcp::EncryptedKDM> dkdms = Config::instance()->dkdms ();
-                               dkdms.push_back (kdm.get());
-                               Config::instance()->set_dkdms (dkdms);
+                               shared_ptr<DKDMGroup> dkdms = Config::instance()->dkdms ();
+                               dkdms->add (shared_ptr<DKDM> (new DKDM (kdm.get())));
+                               Config::instance()->changed ();
                        } else {
                                boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml");
                                kdm->as_xml (path);
@@ -707,9 +708,7 @@ private:
                ExportDialog* d = new ExportDialog (this);
                if (d->ShowModal() == wxID_OK) {
                        shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
-                       shared_ptr<FFmpegTranscoder> tx (new FFmpegTranscoder (_film, job));
-                       tx->set_output (d->path ());
-                       job->set_transcoder (tx);
+                       job->set_encoder (shared_ptr<FFmpegEncoder> (new FFmpegEncoder (_film, job, d->path(), d->format())));
                        JobManager::instance()->add (job);
                }
                d->Destroy ();
@@ -1003,7 +1002,7 @@ private:
                add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
                add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM);
                jobs_menu->AppendSeparator ();
-               add_item (jobs_menu, _("Export..."), ID_jobs_export, NEEDS_FILM);
+               add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
                add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);