X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=9401bc3405f8e995551f2fdd74fc39a3f943f62f;hp=fe76c60436f2a50732872abc810a4a74444d5e66;hb=75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8;hpb=451ab9374cc32483489cdde27a9382b546cdecf5

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index fe76c6043..9401bc340 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -45,8 +45,8 @@
 #include "wx/save_template_dialog.h"
 #include "wx/templates_dialog.h"
 #include "wx/nag_dialog.h"
-#include "wx/export_dialog.h"
 #include "wx/export_subtitles_dialog.h"
+#include "wx/export_video_file_dialog.h"
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/html_dialog.h"
@@ -228,7 +228,7 @@ enum {
 	ID_jobs_make_kdms,
 	ID_jobs_make_dkdms,
 	ID_jobs_make_self_dkdm,
-	ID_jobs_export,
+	ID_jobs_export_video_file,
 	ID_jobs_export_subtitles,
 	ID_jobs_send_dcp_to_tms,
 	ID_jobs_show_dcp,
@@ -322,7 +322,7 @@ public:
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this),         ID_jobs_make_dkdms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
-		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);
+		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_video_file, this),  ID_jobs_export_video_file);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_subtitles, this),   ID_jobs_export_subtitles);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this),           ID_jobs_show_dcp);
@@ -955,9 +955,10 @@ private:
 		d->Destroy ();
 	}
 
-	void jobs_export ()
+
+	void jobs_export_video_file ()
 	{
-		ExportDialog* d = new ExportDialog (this, _film->isdcf_name(true));
+		ExportVideoFileDialog* d = new ExportVideoFileDialog (this, _film->isdcf_name(true));
 		if (d->ShowModal() == wxID_OK) {
 			if (boost::filesystem::exists(d->path())) {
 				bool ok = confirm_dialog(
@@ -972,21 +973,15 @@ private:
 			}
 
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
-			if (d->format() == EXPORT_FORMAT_SUBTITLES_DCP) {
-				job->set_encoder (
-					shared_ptr<SubtitleEncoder>(new SubtitleEncoder(_film, job, d->path(), d->split_reels()))
-					);
-			} else {
-				job->set_encoder (
-					shared_ptr<FFmpegEncoder> (
-						new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()
+			job->set_encoder (
+				shared_ptr<FFmpegEncoder> (
+					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-								   , optional<dcp::Key>(), optional<string>()
+							   , optional<dcp::Key>(), optional<string>()
 #endif
-							)
 						)
-					);
-			}
+					)
+				);
 			JobManager::instance()->add (job);
 		}
 		d->Destroy ();
@@ -1351,7 +1346,7 @@ private:
 		add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
 		add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
 		jobs_menu->AppendSeparator ();
-		add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
+		add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export_video_file, NEEDS_FILM);
 		add_item (jobs_menu, _("Export subtitles..."), ID_jobs_export_subtitles, 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);