Fix black borders around the preview in some cases (#2331).

[dcpomatic.git] / src / wx / export_video_file_dialog.cc

diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 2dc452622e3f34c8206c23bada3886a7a5783c1e..ec54cc408e303fb509dd980b3f8a5ac4884c782f 100644 (file)
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -35,26 +35,30 @@ using std::string;
 using boost::bind;
 
 
-#define FORMATS 2
+int constexpr FORMATS = 3;
 
 
 wxString format_names[] = {
-       _("MOV / 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[] = {
-       ExportFormat::PRORES,
+       ExportFormat::PRORES_4444,
+       ExportFormat::PRORES_HQ,
        ExportFormat::H264_AAC,
 };
 
@@ -165,11 +169,10 @@ ExportVideoFileDialog::format_changed ()
        DCPOMATIC_ASSERT (selection >= 0 && selection < FORMATS);
        _file->SetWildcard (format_filters[selection]);
        _file->SetPath (_initial_name);
-       _x264_crf->Enable (selection == 1);
+       _x264_crf->Enable (formats[selection] == ExportFormat::H264_AAC);
        for (int i = 0; i < 2; ++i) {
-               _x264_crf_label[i]->Enable (selection == 1);
+               _x264_crf_label[i]->Enable(formats[selection] == ExportFormat::H264_AAC);
        }
-       _mixdown->Enable (selection != 2);
 
        Config::instance()->export_config().set_format(formats[selection]);
 }