X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fexport_dialog.cc;h=fa627cd81d51a36c12e9f2e9ad10d95caeb885b1;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hp=4814085781abd2df857a5d4071b4a1bf300a2a6c;hpb=64b7c2e30a6adc62c373b9dcc7f39310f10ed994;p=dcpomatic.git

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 481408578..fa627cd81 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -21,42 +21,55 @@
 #include "export_dialog.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
+#include "check_box.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind.hpp>
 
+using std::string;
 using boost::bind;
 
-#define FORMATS 2
+#define FORMATS 3
 
 wxString format_names[] = {
 	_("ProRes"),
-	_("MP4 / H.264")
+	_("MP4 / H.264"),
+	_("DCP subtitles")
 };
 
 wxString format_filters[] = {
 	_("MOV files (*.mov)|*.mov"),
 	_("MP4 files (*.mp4)|*.mp4"),
+	_("Subtitle files (*.xml)|*.xml"),
 };
 
 wxString format_extensions[] = {
 	"mov",
-	"mp4"
+	"mp4",
+	"xml",
 };
 
-FFmpegEncoder::Format formats[] = {
-	FFmpegEncoder::FORMAT_PRORES,
-	FFmpegEncoder::FORMAT_H264,
+ExportFormat formats[] = {
+	EXPORT_FORMAT_PRORES,
+	EXPORT_FORMAT_H264_AAC,
+	EXPORT_FORMAT_SUBTITLES_DCP
 };
 
-ExportDialog::ExportDialog (wxWindow* parent)
+ExportDialog::ExportDialog (wxWindow* parent, string name)
 	: TableDialog (parent, _("Export film"), 2, 1, true)
+	, _initial_name (name)
 {
 	add (_("Format"), true);
 	_format = new wxChoice (this, wxID_ANY);
 	add (_format);
 	add_spacer ();
-	_mixdown = new wxCheckBox (this, wxID_ANY, _("Mix audio down to stereo"));
+	_mixdown = new CheckBox (this, _("Mix audio down to stereo"));
 	add (_mixdown, false);
+	add_spacer ();
+	_split_reels = new CheckBox (this, _("Write reels into separate files"));
+	add (_split_reels, false);
 	_x264_crf_label[0] = add (_("Quality"), true);
 	_x264_crf = new wxSlider (this, wxID_ANY, 23, 0, 51, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 	add (_x264_crf, false);
@@ -68,7 +81,13 @@ ExportDialog::ExportDialog (wxWindow* parent)
 	_x264_crf_label[1]->SetFont(font);
 
 	add (_("Output file"), true);
-	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
+	/* Don't warn overwrite here, because on Linux (at least) if we specify a filename like foo
+	   the wxFileDialog will check that foo exists, but we will add an extension so we actually
+	   need to check if foo.mov (or similar) exists.  I can't find a way to make wxWidgets do this,
+	   so disable its check and the caller will have to do it themselves.
+	*/
+	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false, false);
+	_file->SetPath (_initial_name);
 	add (_file);
 
 	for (int i = 0; i < FORMATS; ++i) {
@@ -95,11 +114,12 @@ ExportDialog::format_changed ()
 {
 	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
 	_file->SetWildcard (format_filters[_format->GetSelection()]);
-	_file->SetPath ("");
+	_file->SetPath (_initial_name);
 	_x264_crf->Enable (_format->GetSelection() == 1);
 	for (int i = 0; i < 2; ++i) {
 		_x264_crf_label[i]->Enable (_format->GetSelection() == 1);
 	}
+	_mixdown->Enable (_format->GetSelection() != 2);
 }
 
 boost::filesystem::path
@@ -110,7 +130,7 @@ ExportDialog::path () const
 	return wx_to_std (fn.GetFullPath());
 }
 
-FFmpegEncoder::Format
+ExportFormat
 ExportDialog::format () const
 {
 	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
@@ -123,6 +143,12 @@ ExportDialog::mixdown_to_stereo () const
 	return _mixdown->GetValue ();
 }
 
+bool
+ExportDialog::split_reels () const
+{
+	return _split_reels->GetValue ();
+}
+
 int
 ExportDialog::x264_crf () const
 {
@@ -133,5 +159,6 @@ void
 ExportDialog::file_changed ()
 {
 	wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
-	ok->Enable (true);
+	DCPOMATIC_ASSERT (ok);
+	ok->Enable (path().is_absolute());
 }