X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=714bebc3dae6194200b988134931100151982c55;hb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;hp=bcef19f59bf608f8442242694d7b09802c543d7e;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index bcef19f59..714bebc3d 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,12 @@ */ + /** @file src/tools/dcpomatic.cc * @brief The main DCP-o-matic GUI. */ + #include "wx/standard_controls.h" #include "wx/film_viewer.h" #include "wx/film_editor.h" @@ -102,7 +104,6 @@ DCPOMATIC_ENABLE_WARNINGS #include #endif #include -#include #include #include #include @@ -113,20 +114,22 @@ DCPOMATIC_ENABLE_WARNINGS #undef check #endif + using std::cout; -using std::wcout; +using std::dynamic_pointer_cast; +using std::exception; +using std::function; +using std::list; +using std::make_pair; +using std::make_shared; +using std::map; +using std::shared_ptr; using std::string; using std::vector; +using std::wcout; using std::wstring; using std::wstringstream; -using std::map; -using std::make_pair; -using std::list; -using std::exception; -using std::shared_ptr; -using std::dynamic_pointer_cast; using boost::optional; -using boost::function; using boost::is_any_of; using boost::algorithm::find; #if BOOST_VERSION >= 106100 @@ -134,14 +137,15 @@ using namespace boost::placeholders; #endif using dcp::raw_convert; -class FilmChangedClosingDialog : public boost::noncopyable + +class FilmChangedClosingDialog { public: explicit FilmChangedClosingDialog (string name) { _dialog = new wxMessageDialog ( - 0, - wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()), + nullptr, + wxString::Format(_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()), /// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current /// project (Film) has been changed since it was last saved. _("Film changed"), @@ -158,6 +162,9 @@ public: _dialog->Destroy (); } + FilmChangedClosingDialog (FilmChangedClosingDialog const&) = delete; + FilmChangedClosingDialog& operator= (FilmChangedClosingDialog const&) = delete; + int run () { return _dialog->ShowModal (); @@ -167,14 +174,15 @@ private: wxMessageDialog* _dialog; }; -class FilmChangedDuplicatingDialog : public boost::noncopyable + +class FilmChangedDuplicatingDialog { public: explicit FilmChangedDuplicatingDialog (string name) { _dialog = new wxMessageDialog ( - 0, - wxString::Format (_("Save changes to film \"%s\" before duplicating?"), std_to_wx (name).data()), + nullptr, + wxString::Format(_("Save changes to film \"%s\" before duplicating?"), std_to_wx (name).data()), /// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current /// project (Film) has been changed since it was last saved. _("Film changed"), @@ -191,6 +199,9 @@ public: _dialog->Destroy (); } + FilmChangedDuplicatingDialog (FilmChangedDuplicatingDialog const&) = delete; + FilmChangedDuplicatingDialog& operator= (FilmChangedDuplicatingDialog const&) = delete; + int run () { return _dialog->ShowModal (); @@ -200,6 +211,7 @@ private: wxMessageDialog* _dialog; }; + #define ALWAYS 0x0 #define NEEDS_FILM 0x1 #define NOT_DURING_DCP_CREATION 0x2 @@ -210,6 +222,7 @@ private: #define NEEDS_CLIPBOARD 0x40 #define NEEDS_ENCRYPTION 0x80 + map menu_items; enum { @@ -224,6 +237,7 @@ enum { ID_file_close = 100, ID_edit_copy, ID_edit_paste, + ID_edit_select_all, ID_jobs_make_dcp, ID_jobs_make_dcp_batch, ID_jobs_make_kdms, @@ -253,28 +267,15 @@ enum { ID_forward_frame }; + class DOMFrame : public wxFrame { public: - explicit DOMFrame (wxString const & title) - : wxFrame (NULL, -1, title) - , _video_waveform_dialog (0) - , _system_information_dialog (0) - , _hints_dialog (0) - , _servers_list_dialog (0) - , _config_dialog (0) - , _kdm_dialog (0) - , _dkdm_dialog (0) - , _templates_dialog (0) - , _file_menu (0) - , _history_items (0) - , _history_position (0) - , _history_separator (0) - , _update_news_requested (false) - , _first_shown_called (false) + explicit DOMFrame (wxString const& title) + : wxFrame (nullptr, -1, title) { #if defined(DCPOMATIC_WINDOWS) - if (Config::instance()->win32_console ()) { + if (Config::instance()->win32_console()) { AllocConsole(); HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); @@ -293,7 +294,7 @@ public: } #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -301,7 +302,7 @@ public: SetIcon (wxIcon (std_to_wx ("id"))); #endif - _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); + _config_changed_connection = Config::instance()->Changed.connect(boost::bind(&DOMFrame::config_changed, this, _1)); config_changed (Config::OTHER); _analytics_message_connection = Analytics::instance()->Message.connect(boost::bind(&DOMFrame::analytics_message, this, _1, _2)); @@ -317,6 +318,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this), ID_edit_copy); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this), ID_edit_paste); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_select_all, this), ID_edit_select_all); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); @@ -346,14 +348,14 @@ public: /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ - wxPanel* overall_panel = new wxPanel (this, wxID_ANY); + auto overall_panel = new wxPanel (this, wxID_ANY); _film_viewer.reset (new FilmViewer (overall_panel)); _controls = new StandardControls (overall_panel, _film_viewer, true); _film_editor = new FilmEditor (overall_panel, _film_viewer); - JobManagerView* job_manager_view = new JobManagerView (overall_panel, false); + auto job_manager_view = new JobManagerView (overall_panel, false); - wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); + auto right_sizer = new wxBoxSizer (wxVERTICAL); right_sizer->Add (_film_viewer->panel(), 2, wxEXPAND | wxALL, 6); right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6); @@ -421,7 +423,7 @@ public: void new_film (boost::filesystem::path path, optional template_name) { - shared_ptr film (new Film (path)); + auto film = make_shared(path); if (template_name) { film->use_template (template_name.get()); } @@ -433,8 +435,8 @@ public: void load_film (boost::filesystem::path file) try { - shared_ptr film (new Film (file)); - list const notes = film->read_metadata (); + auto film = make_shared(file); + auto const notes = film->read_metadata (); if (film->state_version() == 4) { error_dialog ( @@ -453,19 +455,19 @@ public: JobManager::instance()->add(shared_ptr(new CheckContentChangeJob(film))); } catch (FileNotFoundError& e) { - boost::filesystem::path const dir = e.file().parent_path(); + auto const dir = e.file().parent_path(); if (boost::filesystem::exists(dir / "ASSETMAP") || boost::filesystem::exists(dir / "ASSETMAP.xml")) { error_dialog ( this, _("Could not open this folder as a DCP-o-matic project."), _("It looks like you are trying to open a DCP. File -> Open is for loading DCP-o-matic projects, not DCPs. To import a DCP, create a new project with File -> New and then click the \"Add DCP...\" button.") ); } else { - wxString const p = std_to_wx(file.string ()); + auto const p = std_to_wx(file.string ()); error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what())); } } catch (std::exception& e) { - wxString const p = std_to_wx (file.string()); + auto const p = std_to_wx (file.string()); error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what())); } @@ -477,7 +479,7 @@ public: _controls->set_film (_film); if (_video_waveform_dialog) { _video_waveform_dialog->Destroy (); - _video_waveform_dialog = 0; + _video_waveform_dialog = nullptr; } set_menu_sensitivity (); if (_film && _film->directory()) { @@ -511,14 +513,14 @@ private: void film_change (ChangeType type) { - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { set_menu_sensitivity (); } } void file_changed (boost::filesystem::path f) { - string s = wx_to_std (_("DCP-o-matic")); + auto s = wx_to_std(_("DCP-o-matic")); if (!f.empty ()) { s += " - " + f.string (); } @@ -528,7 +530,7 @@ private: void file_new () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("New Film"), true); + auto d = new FilmNameLocationDialog (this, _("New Film"), true); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_then_delete_film()) { @@ -563,7 +565,7 @@ private: void file_open () { - wxDirDialog* c = new wxDirDialog ( + auto c = new wxDirDialog ( this, _("Select film to open"), std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()), @@ -594,7 +596,7 @@ private: void file_save_as_template () { - SaveTemplateDialog* d = new SaveTemplateDialog (this); + auto d = new SaveTemplateDialog (this); int const r = d->ShowModal (); if (r == wxID_OK) { Config::instance()->save_template (_film, d->name ()); @@ -604,7 +606,7 @@ private: void file_duplicate () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_film()) { @@ -619,7 +621,7 @@ private: void file_duplicate_and_open () { - FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); int const r = d->ShowModal (); if (r == wxID_OK && d->check_path() && maybe_save_film()) { @@ -637,7 +639,7 @@ private: { if (_film && _film->dirty ()) { - FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); + auto dialog = new FilmChangedClosingDialog (_film->name ()); int const r = dialog->run (); delete dialog; @@ -660,7 +662,7 @@ private: void file_history (wxCommandEvent& event) { - vector history = Config::instance()->history (); + auto history = Config::instance()->history (); int n = event.GetId() - ID_file_history; if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { load_film (history[n]); @@ -675,7 +677,7 @@ private: void edit_copy () { - ContentList const sel = _film_editor->content_panel()->selected(); + auto const sel = _film_editor->content_panel()->selected(); DCPOMATIC_ASSERT (sel.size() == 1); _clipboard = sel.front()->clone(); } @@ -684,7 +686,7 @@ private: { DCPOMATIC_ASSERT (_clipboard); - PasteDialog* d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); + auto d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); if (d->ShowModal() == wxID_OK) { for (auto i: _film_editor->content_panel()->selected()) { if (d->video() && i->video) { @@ -697,8 +699,8 @@ private: } if (d->text()) { - list >::iterator j = i->text.begin (); - list >::const_iterator k = _clipboard->text.begin (); + auto j = i->text.begin (); + auto k = _clipboard->text.begin (); while (j != i->text.end() && k != _clipboard->text.end()) { (*j)->take_settings_from (*k); ++j; @@ -710,6 +712,11 @@ private: d->Destroy (); } + void edit_select_all () + { + _film_editor->content_panel()->select_all(); + } + void edit_preferences () { if (!_config_dialog) { @@ -720,7 +727,7 @@ private: void tools_restore_default_preferences () { - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("Are you sure you want to restore preferences to their defaults? This cannot be undone."), _("Restore default preferences"), @@ -754,7 +761,7 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - HintsDialog* hints = new HintsDialog (this, _film, false); + auto hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); if (r == wxID_CANCEL) { @@ -774,8 +781,8 @@ private: } /* Remove any existing DCP if the user agrees */ - boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name(), false); - if (boost::filesystem::exists (dcp_dir)) { + auto const dcp_dir = _film->dir (_film->dcp_name(), false); + if (boost::filesystem::exists(dcp_dir)) { if (!confirm_dialog (this, wxString::Format (_("Do you want to overwrite the existing DCP %s?"), std_to_wx(dcp_dir.string()).data()))) { return; } @@ -818,7 +825,7 @@ private: if (_dkdm_dialog) { _dkdm_dialog->Destroy (); - _dkdm_dialog = 0; + _dkdm_dialog = nullptr; } _dkdm_dialog = new DKDMDialog (this, _film); @@ -868,7 +875,7 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - HintsDialog* hints = new HintsDialog (this, _film, false); + auto hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); if (r == wxID_CANCEL) { @@ -908,7 +915,7 @@ private: return; } - SelfDKDMDialog* d = new SelfDKDMDialog (this, _film); + auto d = new SelfDKDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); return; @@ -938,7 +945,7 @@ private: vector(), d->cpl (), from, to, - dcp::MODIFIED_TRANSITIONAL_1, + dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0 ); @@ -952,11 +959,11 @@ private: if (kdm) { if (d->internal ()) { - shared_ptr dkdms = Config::instance()->dkdms (); - dkdms->add (shared_ptr (new DKDM (kdm.get()))); + auto dkdms = Config::instance()->dkdms(); + dkdms->add (make_shared(kdm.get())); Config::instance()->changed (); } else { - boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); + auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); kdm->as_xml (path); } } @@ -967,7 +974,7 @@ private: void jobs_export_video_file () { - ExportVideoFileDialog* d = new ExportVideoFileDialog (this, _film->isdcf_name(true)); + auto d = new ExportVideoFileDialog (this, _film->isdcf_name(true)); if (d->ShowModal() == wxID_OK) { if (boost::filesystem::exists(d->path())) { bool ok = confirm_dialog( @@ -981,11 +988,10 @@ private: } } - shared_ptr job (new TranscodeJob (_film)); + auto job = make_shared(_film); 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()) - ) + make_shared ( + _film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()) ); JobManager::instance()->add (job); } @@ -995,11 +1001,11 @@ private: void jobs_export_subtitles () { - ExportSubtitlesDialog* d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop()); + auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop()); if (d->ShowModal() == wxID_OK) { - shared_ptr job (new TranscodeJob (_film)); + auto job = make_shared(_film); job->set_encoder ( - shared_ptr(new SubtitleEncoder(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font())) + make_shared(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font()) ); JobManager::instance()->add (job); } @@ -1105,21 +1111,20 @@ private: void tools_send_translations () { - SendI18NDialog* d = new SendI18NDialog (this); + auto d = new SendI18NDialog (this); if (d->ShowModal() == wxID_OK) { string body; body += d->name() + "\n"; body += d->language() + "\n"; body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n"; body += "--\n"; - map translations = I18NHook::translations (); - for (map::const_iterator i = translations.begin(); i != translations.end(); ++i) { - body += i->first + "\n" + i->second + "\n\n"; + auto translations = I18NHook::translations (); + for (auto i: translations) { + body += i.first + "\n" + i.second + "\n\n"; } - list to; - to.push_back ("carl@dcpomatic.com"); + list to = { "carl@dcpomatic.com" }; Emailer emailer (d->email(), to, "DCP-o-matic translations", body); - emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS); + emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS); } d->Destroy (); @@ -1127,14 +1132,14 @@ private: void help_about () { - AboutDialog* d = new AboutDialog (this); + auto d = new AboutDialog (this); d->ShowModal (); d->Destroy (); } void help_report_a_problem () { - ReportProblemDialog* d = new ReportProblemDialog (this, _film); + auto d = new ReportProblemDialog (this, _film); if (d->ShowModal () == wxID_OK) { d->report (); } @@ -1147,7 +1152,7 @@ private: return true; } - wxMessageDialog* d = new wxMessageDialog ( + auto d = new wxMessageDialog ( 0, _("There are unfinished jobs; are you sure you want to quit?"), _("Unfinished jobs"), @@ -1168,7 +1173,7 @@ private: if (_film && _film->dirty ()) { - FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); + auto dialog = new FilmChangedClosingDialog (_film->name ()); int const r = dialog->run (); delete dialog; @@ -1201,8 +1206,8 @@ private: void set_menu_sensitivity () { - list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin(); + auto jobs = JobManager::instance()->get (); + auto i = jobs.begin(); while (i != jobs.end() && (*i)->json_name() != "transcode") { ++i; } @@ -1212,43 +1217,43 @@ private: bool const have_selected_content = !_film_editor->content_panel()->selected().empty(); bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty(); - for (map::iterator j = menu_items.begin(); j != menu_items.end(); ++j) { + for (auto j: menu_items) { bool enabled = true; - if ((j->second & NEEDS_FILM) && !_film) { + if ((j.second & NEEDS_FILM) && !_film) { enabled = false; } - if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { + if ((j.second & NOT_DURING_DCP_CREATION) && dcp_creation) { enabled = false; } - if ((j->second & NEEDS_CPL) && !have_cpl) { + if ((j.second & NEEDS_CPL) && !have_cpl) { enabled = false; } - if ((j->second & NEEDS_SELECTED_CONTENT) && !have_selected_content) { + if ((j.second & NEEDS_SELECTED_CONTENT) && !have_selected_content) { enabled = false; } - if ((j->second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) { + if ((j.second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) { enabled = false; } - if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { + if ((j.second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { enabled = false; } - if ((j->second & NEEDS_CLIPBOARD) && !_clipboard) { + if ((j.second & NEEDS_CLIPBOARD) && !_clipboard) { enabled = false; } - if ((j->second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) { + if ((j.second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) { enabled = false; } - j->first->Enable (enabled); + j.first->Enable (enabled); } } @@ -1290,7 +1295,7 @@ private: void add_item (wxMenu* menu, wxString text, int id, int sens) { - wxMenuItem* item = menu->Append (id, text); + auto item = menu->Append (id, text); menu_items.insert (make_pair (item, sens)); } @@ -1321,17 +1326,20 @@ private: add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS); #endif - wxMenu* edit = new wxMenu; + auto edit = new wxMenu; add_item (edit, _("Copy settings\tCtrl-C"), ID_edit_copy, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SINGLE_SELECTED_CONTENT); add_item (edit, _("Paste settings...\tCtrl-V"), ID_edit_paste, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SELECTED_CONTENT | NEEDS_CLIPBOARD); + edit->AppendSeparator (); + add_item (edit, _("Select all\tShift-Ctrl-A"), ID_edit_select_all, NEEDS_FILM); #ifdef __WXOSX__ add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else + edit->AppendSeparator (); add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #endif - wxMenu* jobs_menu = new wxMenu; + auto jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION); jobs_menu->AppendSeparator (); @@ -1354,11 +1362,11 @@ private: add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); - wxMenu* view = new wxMenu; + auto view = new wxMenu; add_item (view, _("Closed captions..."), ID_view_closed_captions, NEEDS_FILM); add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM); - wxMenu* tools = new wxMenu; + auto tools = new wxMenu; add_item (tools, _("Hints..."), ID_tools_hints, NEEDS_FILM); add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0); @@ -1427,7 +1435,7 @@ private: /* Clear out non-existant history items before we re-build the menu */ Config::instance()->clean_history (); - vector history = Config::instance()->history (); + auto history = Config::instance()->history(); if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); @@ -1450,7 +1458,7 @@ private: void update_checker_state_changed () { - UpdateChecker* uc = UpdateChecker::instance (); + auto uc = UpdateChecker::instance (); bool const announce = _update_news_requested || @@ -1463,11 +1471,11 @@ private: return; } - if (uc->state() == UpdateChecker::YES) { - UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ()); + if (uc->state() == UpdateChecker::State::YES) { + auto dialog = new UpdateDialog (this, uc->stable(), uc->test()); dialog->ShowModal (); dialog->Destroy (); - } else if (uc->state() == UpdateChecker::FAILED) { + } else if (uc->state() == UpdateChecker::State::FAILED) { error_dialog (this, _("The DCP-o-matic download server could not be contacted.")); } else { error_dialog (this, _("There are no new versions of DCP-o-matic available.")); @@ -1502,7 +1510,7 @@ private: void analytics_message (string title, string html) { - HTMLDialog* d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html)); + auto d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html)); d->ShowModal(); d->Destroy(); } @@ -1510,26 +1518,27 @@ private: FilmEditor* _film_editor; std::shared_ptr _film_viewer; StandardControls* _controls; - VideoWaveformDialog* _video_waveform_dialog; - SystemInformationDialog* _system_information_dialog; - HintsDialog* _hints_dialog; - ServersListDialog* _servers_list_dialog; - wxPreferencesEditor* _config_dialog; - KDMDialog* _kdm_dialog; - DKDMDialog* _dkdm_dialog; - TemplatesDialog* _templates_dialog; - wxMenu* _file_menu; + VideoWaveformDialog* _video_waveform_dialog = nullptr; + SystemInformationDialog* _system_information_dialog = nullptr; + HintsDialog* _hints_dialog = nullptr; + ServersListDialog* _servers_list_dialog = nullptr; + wxPreferencesEditor* _config_dialog = nullptr; + KDMDialog* _kdm_dialog = nullptr; + DKDMDialog* _dkdm_dialog = nullptr; + TemplatesDialog* _templates_dialog = nullptr; + wxMenu* _file_menu = nullptr; shared_ptr _film; - int _history_items; - int _history_position; - wxMenuItem* _history_separator; + int _history_items = 0; + int _history_position = 0; + wxMenuItem* _history_separator = nullptr; boost::signals2::scoped_connection _config_changed_connection; boost::signals2::scoped_connection _analytics_message_connection; - bool _update_news_requested; + bool _update_news_requested = false; shared_ptr _clipboard; - bool _first_shown_called; + bool _first_shown_called = false; }; + static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, @@ -1540,6 +1549,7 @@ static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; + /** @class App * @brief The magic App class for wxWidgets. */ @@ -1548,8 +1558,6 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) - , _splash (0) { #ifdef DCPOMATIC_LINUX XInitThreads (); @@ -1626,23 +1634,23 @@ private: signal_manager = new wxSignalManager (this); Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1)); - if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) { + if (!_film_to_load.empty() && boost::filesystem::is_directory(_film_to_load)) { try { _frame->load_film (_film_to_load); } catch (exception& e) { - error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what())); + error_dialog (nullptr, std_to_wx(String::compose(wx_to_std(_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what())); } } if (!_film_to_create.empty ()) { - _frame->new_film (_film_to_create, optional ()); - if (!_content_to_add.empty ()) { + _frame->new_film (_film_to_create, optional()); + if (!_content_to_add.empty()) { for (auto i: content_factory(_content_to_add)) { - _frame->film()->examine_and_add_content (i); + _frame->film()->examine_and_add_content(i); } } if (!_dcp_to_add.empty ()) { - _frame->film()->examine_and_add_content(shared_ptr(new DCPContent(_dcp_to_add))); + _frame->film()->examine_and_add_content(make_shared(_dcp_to_add)); } } @@ -1658,9 +1666,9 @@ private: { if (_splash) { _splash->Destroy (); - _splash = 0; + _splash = nullptr; } - error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); + error_dialog (nullptr, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); } return true; @@ -1711,17 +1719,27 @@ private: throw; } catch (FileError& e) { error_dialog ( - 0, - wxString::Format ( + nullptr, + wxString::Format( _("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM, std_to_wx (e.what()), - std_to_wx (e.file().string().c_str ()) + std_to_wx (e.file().string().c_str()) + ) + ); + } catch (boost::filesystem::filesystem_error& e) { + error_dialog ( + nullptr, + wxString::Format( + _("An exception occurred: %s (%s) (%s)\n\n") + REPORT_PROBLEM, + std_to_wx (e.what()), + std_to_wx (e.path1().string()), + std_to_wx (e.path2().string()) ) ); } catch (exception& e) { error_dialog ( - 0, - wxString::Format ( + nullptr, + wxString::Format( _("An exception occurred: %s.\n\n") + REPORT_PROBLEM, std_to_wx (e.what ()) ) @@ -1769,14 +1787,12 @@ private: void config_failed_to_load () { - close_splash (); message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); } void config_warning (string m) { - close_splash (); - message_dialog (_frame, std_to_wx (m)); + message_dialog (_frame, std_to_wx(m)); } bool config_bad (Config::BadReason reason) @@ -1785,16 +1801,16 @@ private: when we open our recreate dialog, close it, *then* try to Destroy the splash (the Destroy fails). */ _splash->Destroy (); - _splash = 0; + _splash = nullptr; - Config* config = Config::instance(); + auto config = Config::instance(); switch (reason) { case Config::BAD_SIGNER_UTF8_STRINGS: { if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN)) { return false; } - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate signing certificates"), _("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs contains a small error\n" "which will prevent DCPs from being validated correctly on some systems. Do you want to re-create\n" @@ -1808,7 +1824,7 @@ private: } case Config::BAD_SIGNER_INCONSISTENT: { - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate signing certificates"), _("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is inconsistent and\n" "cannot be used. DCP-o-matic cannot start unless you re-create it. Do you want to re-create\n" @@ -1824,7 +1840,7 @@ private: } case Config::BAD_DECRYPTION_INCONSISTENT: { - RecreateChainDialog* d = new RecreateChainDialog ( + auto d = new RecreateChainDialog ( _frame, _("Recreate KDM decryption chain"), _("The certificate chain that DCP-o-matic uses for decrypting KDMs is inconsistent and\n" "cannot be used. DCP-o-matic cannot start unless you re-create it. Do you want to re-create\n" @@ -1844,8 +1860,8 @@ private: } } - DOMFrame* _frame; - wxSplashScreen* _splash; + DOMFrame* _frame = nullptr; + wxSplashScreen* _splash = nullptr; shared_ptr _timer; string _film_to_load; string _film_to_create; @@ -1853,4 +1869,5 @@ private: string _dcp_to_add; }; + IMPLEMENT_APP (App)