Move subtitle export to its own dialogue.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3275984e641d090fa82be86ee56cf34fcc46eca5..fe76c60436f2a50732872abc810a4a74444d5e66 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -46,6 +46,7 @@
 #include "wx/templates_dialog.h"
 #include "wx/nag_dialog.h"
 #include "wx/export_dialog.h"
 #include "wx/templates_dialog.h"
 #include "wx/nag_dialog.h"
 #include "wx/export_dialog.h"

+#include "wx/export_subtitles_dialog.h"

 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/html_dialog.h"
 #include "wx/paste_dialog.h"
 #include "wx/focus_manager.h"
 #include "wx/html_dialog.h"


@@ -228,6 +229,7 @@ enum {
        ID_jobs_make_dkdms,
        ID_jobs_make_self_dkdm,
        ID_jobs_export,
        ID_jobs_make_dkdms,
        ID_jobs_make_self_dkdm,
        ID_jobs_export,

+       ID_jobs_export_subtitles,

        ID_jobs_send_dcp_to_tms,
        ID_jobs_show_dcp,
        ID_jobs_open_dcp_in_player,
        ID_jobs_send_dcp_to_tms,
        ID_jobs_show_dcp,
        ID_jobs_open_dcp_in_player,


@@ -321,6 +323,7 @@ public:
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this),     ID_jobs_make_dcp_batch);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this),     ID_jobs_make_self_dkdm);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this),             ID_jobs_export);

+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export_subtitles, this),   ID_jobs_export_subtitles);

                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this),           ID_jobs_show_dcp);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this),           ID_jobs_show_dcp);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player);


@@ -989,6 +992,33 @@ private:
                d->Destroy ();
        }
 
                d->Destroy ();
        }
 

+
+       void jobs_export_subtitles ()
+       {
+               ExportSubtitlesDialog* d = new ExportSubtitlesDialog (this, _film->isdcf_name(true));
+               if (d->ShowModal() == wxID_OK) {
+                       if (boost::filesystem::exists(d->path())) {
+                               bool ok = confirm_dialog(
+                                               this,
+                                               wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(d->path().string()).data())
+                                               );
+
+                               if (!ok) {
+                                       d->Destroy ();
+                                       return;
+                               }
+                       }
+
+                       shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
+                       job->set_encoder (
+                               shared_ptr<SubtitleEncoder>(new SubtitleEncoder(_film, job, d->path(), d->split_reels()))
+                               );
+                       JobManager::instance()->add (job);
+               }
+               d->Destroy ();
+       }
+
+

        void jobs_send_dcp_to_tms ()
        {
                _film->send_dcp_to_tms ();
        void jobs_send_dcp_to_tms ()
        {
                _film->send_dcp_to_tms ();


@@ -1321,7 +1351,8 @@ private:
                add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
                add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("Make &DKDMs...\tCtrl-D"), ID_jobs_make_dkdms, NEEDS_FILM);
                add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION);
                jobs_menu->AppendSeparator ();

-               add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
+               add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export, NEEDS_FILM);
+               add_item (jobs_menu, _("Export subtitles..."), ID_jobs_export_subtitles, NEEDS_FILM);

                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 
                jobs_menu->AppendSeparator ();
                add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index ca723ddeb9ef39575d17c77c3dc66377402aacbb..3553f3c7e9835de647a6ca95970efa384dab73bb 100644 (file)
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -31,30 +31,26 @@ DCPOMATIC_ENABLE_WARNINGS
 using std::string;
 using boost::bind;
 
 using std::string;
 using boost::bind;
 

-#define FORMATS 3
+#define FORMATS 2

 
 wxString format_names[] = {
        _("ProRes"),
        _("MP4 / H.264"),
 
 wxString format_names[] = {
        _("ProRes"),
        _("MP4 / H.264"),

-       _("DCP subtitles")

 };
 
 wxString format_filters[] = {
        _("MOV files (*.mov)|*.mov"),
        _("MP4 files (*.mp4)|*.mp4"),
 };
 
 wxString format_filters[] = {
        _("MOV files (*.mov)|*.mov"),
        _("MP4 files (*.mp4)|*.mp4"),

-       _("Subtitle files (*.xml)|*.xml"),

 };
 
 wxString format_extensions[] = {
        "mov",
        "mp4",
 };
 
 wxString format_extensions[] = {
        "mov",
        "mp4",

-       "xml",

 };
 
 ExportFormat formats[] = {
        EXPORT_FORMAT_PRORES,
        EXPORT_FORMAT_H264_AAC,
 };
 
 ExportFormat formats[] = {
        EXPORT_FORMAT_PRORES,
        EXPORT_FORMAT_H264_AAC,

-       EXPORT_FORMAT_SUBTITLES_DCP

 };
 
 ExportDialog::ExportDialog (wxWindow* parent, string name)
 };
 
 ExportDialog::ExportDialog (wxWindow* parent, string name)

diff --git a/src/wx/export_subtitles_dialog.cc b/src/wx/export_subtitles_dialog.cc
new file mode 100644 (file)
index 0000000..83e08fe
--- /dev/null
+++ b/src/wx/export_subtitles_dialog.cc
@@ -0,0 +1,86 @@
+/*
+    Copyright (C) 2017-2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "check_box.h"
+#include "export_subtitles_dialog.h"
+#include "file_picker_ctrl.h"
+#include "wx_util.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;
+
+
+ExportSubtitlesDialog::ExportSubtitlesDialog (wxWindow* parent, string name)
+       : TableDialog (parent, _("Export subtitles"), 2, 1, true)
+       , _initial_name (name)
+{
+       _split_reels = new CheckBox (this, _("Write reels into separate files"));
+       add (_split_reels, false);
+       add_spacer ();
+
+       add (_("Output file"), true);
+       /* 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"), _("Subtitle files (.xml)|*.xml"), false, false);
+       _file->SetPath (_initial_name);
+       add (_file);
+
+       _file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&ExportSubtitlesDialog::file_changed, this));
+
+       layout ();
+
+       wxButton* ok = dynamic_cast<wxButton *>(FindWindowById(wxID_OK, this));
+       ok->Enable (false);
+}
+
+
+boost::filesystem::path
+ExportSubtitlesDialog::path () const
+{
+       wxFileName fn (_file->GetPath());
+       fn.SetExt (".xml");
+       return wx_to_std (fn.GetFullPath());
+}
+
+
+bool
+ExportSubtitlesDialog::split_reels () const
+{
+       return _split_reels->GetValue ();
+}
+
+
+void
+ExportSubtitlesDialog::file_changed ()
+{
+       wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+       DCPOMATIC_ASSERT (ok);
+       ok->Enable (path().is_absolute());
+}

diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h
new file mode 100644 (file)
index 0000000..d4405cb
--- /dev/null
+++ b/src/wx/export_subtitles_dialog.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2017-2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "table_dialog.h"
+#include <wx/wx.h>
+#include <boost/filesystem.hpp>
+
+class FilePickerCtrl;
+
+class ExportSubtitlesDialog : public TableDialog
+{
+public:
+       ExportSubtitlesDialog (wxWindow* parent, std::string name);
+
+       boost::filesystem::path path () const;
+       bool split_reels () const;
+
+private:
+       void file_changed ();
+
+       std::string _initial_name;
+       wxCheckBox* _split_reels;
+       FilePickerCtrl* _file;
+};

diff --git a/src/wx/wscript b/src/wx/wscript
index 7b4b96653a052f1200e50c14e6c6887cdf5e9711..5d8fc16bb7b060cc89ddb383aa022756067a247b 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -66,6 +66,7 @@ sources = """
           download_certificate_dialog.cc
           download_certificate_panel.cc
           export_dialog.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
           export_dialog.cc

+          export_subtitles_dialog.cc

           file_picker_ctrl.cc
           film_editor.cc
           film_name_location_dialog.cc
           file_picker_ctrl.cc
           film_editor.cc
           film_name_location_dialog.cc