Move subtitle export to its own dialogue.

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

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 65ce14092683b0a1496cbde9d384fdc9dbbf2d69..3553f3c7e9835de647a6ca95970efa384dab73bb 100644 (file)
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -22,36 +22,35 @@
 #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 3
+#define FORMATS 2
 
 wxString format_names[] = {
        _("ProRes"),
        _("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",
-       "xml",
 };
 
 ExportFormat formats[] = {
        EXPORT_FORMAT_PRORES,
        EXPORT_FORMAT_H264_AAC,
-       EXPORT_FORMAT_SUBTITLES_DCP
 };
 
 ExportDialog::ExportDialog (wxWindow* parent, string name)
@@ -67,6 +66,9 @@ ExportDialog::ExportDialog (wxWindow* parent, string name)
        add_spacer ();
        _split_reels = new CheckBox (this, _("Write reels into separate files"));
        add (_split_reels, false);
+       add_spacer ();
+       _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);
        add (_x264_crf, false);
@@ -78,7 +80,12 @@ ExportDialog::ExportDialog (wxWindow* parent, string name)
        _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);
 
@@ -141,6 +148,12 @@ ExportDialog::split_reels () const
        return _split_reels->GetValue ();
 }
 
+bool
+ExportDialog::split_streams () const
+{
+       return _split_streams->GetValue ();
+}
+
 int
 ExportDialog::x264_crf () const
 {
@@ -151,5 +164,6 @@ void
 ExportDialog::file_changed ()
 {
        wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
-       ok->Enable (_file->GetPath().Length() > 0);
+       DCPOMATIC_ASSERT (ok);
+       ok->Enable (path().is_absolute());
 }