From 75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 Aug 2020 21:06:53 +0200 Subject: [PATCH] Rename export dialogue to export video. --- src/tools/dcpomatic.cc | 31 ++++++++----------- ..._dialog.cc => export_video_file_dialog.cc} | 30 +++++++++--------- ...rt_dialog.h => export_video_file_dialog.h} | 6 ++-- src/wx/wscript | 2 +- 4 files changed, 32 insertions(+), 37 deletions(-) rename src/wx/{export_dialog.cc => export_video_file_dialog.cc} (84%) rename src/wx/{export_dialog.h => export_video_file_dialog.h} (88%) diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index fe76c6043..9401bc340 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -45,8 +45,8 @@ #include "wx/save_template_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/export_video_file_dialog.h" #include "wx/paste_dialog.h" #include "wx/focus_manager.h" #include "wx/html_dialog.h" @@ -228,7 +228,7 @@ enum { ID_jobs_make_kdms, ID_jobs_make_dkdms, ID_jobs_make_self_dkdm, - ID_jobs_export, + ID_jobs_export_video_file, ID_jobs_export_subtitles, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, @@ -322,7 +322,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this), ID_jobs_make_dkdms); 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_video_file, this), ID_jobs_export_video_file); 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); @@ -955,9 +955,10 @@ private: d->Destroy (); } - void jobs_export () + + void jobs_export_video_file () { - ExportDialog* d = new ExportDialog (this, _film->isdcf_name(true)); + ExportVideoFileDialog* d = new ExportVideoFileDialog (this, _film->isdcf_name(true)); if (d->ShowModal() == wxID_OK) { if (boost::filesystem::exists(d->path())) { bool ok = confirm_dialog( @@ -972,21 +973,15 @@ private: } shared_ptr job (new TranscodeJob (_film)); - if (d->format() == EXPORT_FORMAT_SUBTITLES_DCP) { - job->set_encoder ( - shared_ptr(new SubtitleEncoder(_film, job, d->path(), d->split_reels())) - ); - } else { - job->set_encoder ( - shared_ptr ( - new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf() + job->set_encoder ( + shared_ptr ( + new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf() #ifdef DCPOMATIC_VARIANT_SWAROOP - , optional(), optional() + , optional(), optional() #endif - ) ) - ); - } + ) + ); JobManager::instance()->add (job); } d->Destroy (); @@ -1351,7 +1346,7 @@ 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, _("Export video file...\tCtrl-E"), ID_jobs_export, NEEDS_FILM); + add_item (jobs_menu, _("Export video file...\tCtrl-E"), ID_jobs_export_video_file, 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); diff --git a/src/wx/export_dialog.cc b/src/wx/export_video_file_dialog.cc similarity index 84% rename from src/wx/export_dialog.cc rename to src/wx/export_video_file_dialog.cc index 3553f3c7e..062fcc81f 100644 --- a/src/wx/export_dialog.cc +++ b/src/wx/export_video_file_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Carl Hetherington + Copyright (C) 2017-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,10 @@ */ -#include "export_dialog.h" +#include "check_box.h" +#include "export_video_file_dialog.h" #include "file_picker_ctrl.h" #include "wx_util.h" -#include "check_box.h" #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include @@ -53,8 +53,8 @@ ExportFormat formats[] = { EXPORT_FORMAT_H264_AAC, }; -ExportDialog::ExportDialog (wxWindow* parent, string name) - : TableDialog (parent, _("Export film"), 2, 1, true) +ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name) + : TableDialog (parent, _("Export video file"), 2, 1, true) , _initial_name (name) { add (_("Format"), true); @@ -99,8 +99,8 @@ ExportDialog::ExportDialog (wxWindow* parent, string name) _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)); + _format->Bind (wxEVT_CHOICE, bind (&ExportVideoFileDialog::format_changed, this)); + _file->Bind (wxEVT_FILEPICKER_CHANGED, bind (&ExportVideoFileDialog::file_changed, this)); layout (); @@ -109,7 +109,7 @@ ExportDialog::ExportDialog (wxWindow* parent, string name) } void -ExportDialog::format_changed () +ExportVideoFileDialog::format_changed () { DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS); _file->SetWildcard (format_filters[_format->GetSelection()]); @@ -122,7 +122,7 @@ ExportDialog::format_changed () } boost::filesystem::path -ExportDialog::path () const +ExportVideoFileDialog::path () const { wxFileName fn (_file->GetPath()); fn.SetExt (format_extensions[_format->GetSelection()]); @@ -130,38 +130,38 @@ ExportDialog::path () const } ExportFormat -ExportDialog::format () const +ExportVideoFileDialog::format () const { DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS); return formats[_format->GetSelection()]; } bool -ExportDialog::mixdown_to_stereo () const +ExportVideoFileDialog::mixdown_to_stereo () const { return _mixdown->GetValue (); } bool -ExportDialog::split_reels () const +ExportVideoFileDialog::split_reels () const { return _split_reels->GetValue (); } bool -ExportDialog::split_streams () const +ExportVideoFileDialog::split_streams () const { return _split_streams->GetValue (); } int -ExportDialog::x264_crf () const +ExportVideoFileDialog::x264_crf () const { return _x264_crf->GetValue (); } void -ExportDialog::file_changed () +ExportVideoFileDialog::file_changed () { wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); DCPOMATIC_ASSERT (ok); diff --git a/src/wx/export_dialog.h b/src/wx/export_video_file_dialog.h similarity index 88% rename from src/wx/export_dialog.h rename to src/wx/export_video_file_dialog.h index fc22d036a..a58fadd38 100644 --- a/src/wx/export_dialog.h +++ b/src/wx/export_video_file_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Carl Hetherington + Copyright (C) 2017-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -25,10 +25,10 @@ class FilePickerCtrl; -class ExportDialog : public TableDialog +class ExportVideoFileDialog : public TableDialog { public: - explicit ExportDialog (wxWindow* parent, std::string name); + ExportVideoFileDialog (wxWindow* parent, std::string name); boost::filesystem::path path () const; ExportFormat format () const; diff --git a/src/wx/wscript b/src/wx/wscript index 5d8fc16bb..d7a13e32b 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -65,8 +65,8 @@ sources = """ dolby_doremi_certificate_panel.cc download_certificate_dialog.cc download_certificate_panel.cc - export_dialog.cc export_subtitles_dialog.cc + export_video_file_dialog.cc file_picker_ctrl.cc film_editor.cc film_name_location_dialog.cc -- 2.30.2