X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fexport_dialog.cc;h=68d3706ff7f4b48725535da50951555964348551;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=95814c5186d4a5c0b6e059f7de1c88ec1819d43c;hpb=b2709fad258847ba4321c23fbe9bef9a7802a468;p=dcpomatic.git

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 95814c518..68d3706ff 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -21,6 +21,7 @@
 #include "export_dialog.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
+#include "check_box.h"
 #include <wx/filepicker.h>
 #include <boost/bind.hpp>
 
@@ -38,9 +39,14 @@ wxString format_filters[] = {
 	_("MP4 files (*.mp4)|*.mp4"),
 };
 
-FFmpegEncoder::Format formats[] = {
-	FFmpegEncoder::FORMAT_PRORES,
-	FFmpegEncoder::FORMAT_H264,
+wxString format_extensions[] = {
+	"mov",
+	"mp4"
+};
+
+ExportFormat formats[] = {
+	EXPORT_FORMAT_PRORES,
+	EXPORT_FORMAT_H264,
 };
 
 ExportDialog::ExportDialog (wxWindow* parent)
@@ -50,8 +56,21 @@ ExportDialog::ExportDialog (wxWindow* parent)
 	_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);
+	add_spacer ();
+	_x264_crf_label[1] = add (_("0 is best, 51 is worst"), false);
+	wxFont font = _x264_crf_label[1]->GetFont();
+	font.SetStyle(wxFONTSTYLE_ITALIC);
+	font.SetPointSize(font.GetPointSize() - 1);
+	_x264_crf_label[1]->SetFont(font);
+
 	add (_("Output file"), true);
 	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
 	add (_file);
@@ -61,6 +80,11 @@ ExportDialog::ExportDialog (wxWindow* parent)
 	}
 	_format->SetSelection (0);
 
+	_x264_crf->Enable (false);
+	for (int i = 0; i < 2; ++i) {
+		_x264_crf_label[i]->Enable (false);
+	}
+
 	_format->Bind (wxEVT_CHOICE, bind (&ExportDialog::format_changed, this));
 	_file->Bind (wxEVT_FILEPICKER_CHANGED, bind (&ExportDialog::file_changed, this));
 
@@ -76,15 +100,21 @@ ExportDialog::format_changed ()
 	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
 	_file->SetWildcard (format_filters[_format->GetSelection()]);
 	_file->SetPath ("");
+	_x264_crf->Enable (_format->GetSelection() == 1);
+	for (int i = 0; i < 2; ++i) {
+		_x264_crf_label[i]->Enable (_format->GetSelection() == 1);
+	}
 }
 
 boost::filesystem::path
 ExportDialog::path () const
 {
-	return wx_to_std (_file->GetPath ());
+	wxFileName fn (_file->GetPath());
+	fn.SetExt (format_extensions[_format->GetSelection()]);
+	return wx_to_std (fn.GetFullPath());
 }
 
-FFmpegEncoder::Format
+ExportFormat
 ExportDialog::format () const
 {
 	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
@@ -97,6 +127,18 @@ ExportDialog::mixdown_to_stereo () const
 	return _mixdown->GetValue ();
 }
 
+bool
+ExportDialog::split_reels () const
+{
+	return _split_reels->GetValue ();
+}
+
+int
+ExportDialog::x264_crf () const
+{
+	return _x264_crf->GetValue ();
+}
+
 void
 ExportDialog::file_changed ()
 {