X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fexport_video_file_dialog.cc;h=3cc4b133fdf672a0f1f4a4793440de647288478f;hp=062fcc81f4732400104c63a845cc52499211393a;hb=1c57df596882f15403ee97d01862f8b76cfb797b;hpb=75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8

diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 062fcc81f..3cc4b133f 100644
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -18,45 +18,56 @@
 
 */
 
+
 #include "check_box.h"
 #include "export_video_file_dialog.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/config.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/bind/bind.hpp>
+
 
 using std::string;
 using boost::bind;
 
-#define FORMATS 2
+
+int constexpr FORMATS = 3;
+
 
 wxString format_names[] = {
-	_("ProRes"),
+	_("MOV / ProRes 4444"),
+	_("MOV / ProRes HQ"),
 	_("MP4 / H.264"),
 };
 
 wxString format_filters[] = {
+	_("MOV files (*.mov)|*.mov"),
 	_("MOV files (*.mov)|*.mov"),
 	_("MP4 files (*.mp4)|*.mp4"),
 };
 
 wxString format_extensions[] = {
+	"mov",
 	"mov",
 	"mp4",
 };
 
 ExportFormat formats[] = {
-	EXPORT_FORMAT_PRORES,
-	EXPORT_FORMAT_H264_AAC,
+	ExportFormat::PRORES_4444,
+	ExportFormat::PRORES_HQ,
+	ExportFormat::H264_AAC,
 };
 
 ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 	: TableDialog (parent, _("Export video file"), 2, 1, true)
 	, _initial_name (name)
 {
+	auto& config = Config::instance()->export_config();
+
 	add (_("Format"), true);
 	_format = new wxChoice (this, wxID_ANY);
 	add (_format);
@@ -70,7 +81,7 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 	_split_streams = new CheckBox (this, _("Write each audio channel to its own stream"));
 	add (_split_streams, false);
 	_x264_crf_label[0] = add (_("Quality"), true);
-	_x264_crf = new wxSlider (this, wxID_ANY, 23, 0, 51, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_x264_crf = new wxSlider (this, wxID_ANY, config.x264_crf(), 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);
@@ -92,33 +103,79 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 	for (int i = 0; i < FORMATS; ++i) {
 		_format->Append (format_names[i]);
 	}
-	_format->SetSelection (0);
+	for (int i = 0; i < FORMATS; ++i) {
+		if (config.format() == formats[i]) {
+			_format->SetSelection(i);
+		}
+	}
+
+	_mixdown->SetValue(config.mixdown_to_stereo());
+	_split_reels->SetValue(config.split_reels());
+	_split_streams->SetValue(config.split_streams());
 
 	_x264_crf->Enable (false);
 	for (int i = 0; i < 2; ++i) {
 		_x264_crf_label[i]->Enable (false);
 	}
 
+	_mixdown->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::mixdown_changed, this));
+	_split_reels->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::split_reels_changed, this));
+	_split_streams->Bind (wxEVT_CHECKBOX, bind(&ExportVideoFileDialog::split_streams_changed, this));
+	_x264_crf->Bind (wxEVT_SLIDER, bind(&ExportVideoFileDialog::x264_crf_changed, this));
 	_format->Bind (wxEVT_CHOICE, bind (&ExportVideoFileDialog::format_changed, this));
 	_file->Bind (wxEVT_FILEPICKER_CHANGED, bind (&ExportVideoFileDialog::file_changed, this));
 
+	format_changed ();
+
 	layout ();
 
-	wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+	auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
 	ok->Enable (false);
 }
 
+
+void
+ExportVideoFileDialog::mixdown_changed()
+{
+	Config::instance()->export_config().set_mixdown_to_stereo(_mixdown->GetValue());
+}
+
+
+void
+ExportVideoFileDialog::split_reels_changed()
+{
+	Config::instance()->export_config().set_split_reels(_split_reels->GetValue());
+}
+
+
+void
+ExportVideoFileDialog::split_streams_changed()
+{
+	Config::instance()->export_config().set_split_streams(_split_streams->GetValue());
+}
+
+
+void
+ExportVideoFileDialog::x264_crf_changed()
+{
+	Config::instance()->export_config().set_x264_crf(_x264_crf->GetValue());
+}
+
+
 void
 ExportVideoFileDialog::format_changed ()
 {
-	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
-	_file->SetWildcard (format_filters[_format->GetSelection()]);
+	auto const selection = _format->GetSelection();
+	DCPOMATIC_ASSERT (selection >= 0 && selection < FORMATS);
+	_file->SetWildcard (format_filters[selection]);
 	_file->SetPath (_initial_name);
-	_x264_crf->Enable (_format->GetSelection() == 1);
+	_x264_crf->Enable (formats[selection] == ExportFormat::H264_AAC);
 	for (int i = 0; i < 2; ++i) {
-		_x264_crf_label[i]->Enable (_format->GetSelection() == 1);
+		_x264_crf_label[i]->Enable(formats[selection] == ExportFormat::H264_AAC);
 	}
-	_mixdown->Enable (_format->GetSelection() != 2);
+	_mixdown->Enable (selection != 2);
+
+	Config::instance()->export_config().set_format(formats[selection]);
 }
 
 boost::filesystem::path
@@ -163,7 +220,7 @@ ExportVideoFileDialog::x264_crf () const
 void
 ExportVideoFileDialog::file_changed ()
 {
-	wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+	auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
 	DCPOMATIC_ASSERT (ok);
 	ok->Enable (path().is_absolute());
 }