X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=d6b6bc2b72aaba15126950ebdf4244c7e051d260;hp=257bb7ab199b9d0596d49c3f577041ad69dc74e9;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=b7e65adf286ce20918797a06a910ededf8f07b7b diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 257bb7ab1..d6b6bc2b7 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -74,13 +74,13 @@ #include "lib/exceptions.h" #include "lib/ffmpeg_encoder.h" #include "lib/film.h" +#include "lib/font_config.h" #include "lib/hints.h" #include "lib/job_manager.h" #include "lib/kdm_with_metadata.h" #include "lib/log.h" #include "lib/make_dcp.h" #include "lib/release_notes.h" -#include "lib/scope_guard.h" #include "lib/screen.h" #include "lib/send_kdm_email_job.h" #include "lib/signal_manager.h" @@ -144,36 +144,27 @@ class FilmChangedClosingDialog { public: explicit FilmChangedClosingDialog (string name) - { - _dialog = new wxMessageDialog ( + : _dialog( 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"), wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION - ); - - _dialog->SetYesNoCancelLabels ( + ) + { + _dialog.SetYesNoCancelLabels( _("Save film and close"), _("Close without saving film"), _("Don't close") ); } - ~FilmChangedClosingDialog () - { - _dialog->Destroy (); - } - - FilmChangedClosingDialog (FilmChangedClosingDialog const&) = delete; - FilmChangedClosingDialog& operator= (FilmChangedClosingDialog const&) = delete; - int run () { - return _dialog->ShowModal (); + return _dialog.ShowModal(); } private: - wxMessageDialog* _dialog; + wxMessageDialog _dialog; }; @@ -181,36 +172,27 @@ class FilmChangedDuplicatingDialog { public: explicit FilmChangedDuplicatingDialog (string name) - { - _dialog = new wxMessageDialog ( + : _dialog( 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"), wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION - ); - - _dialog->SetYesNoCancelLabels ( + ) + { + _dialog.SetYesNoCancelLabels( _("Save film and duplicate"), _("Duplicate without saving film"), _("Don't duplicate") ); } - ~FilmChangedDuplicatingDialog () - { - _dialog->Destroy (); - } - - FilmChangedDuplicatingDialog (FilmChangedDuplicatingDialog const&) = delete; - FilmChangedDuplicatingDialog& operator= (FilmChangedDuplicatingDialog const&) = delete; - int run () { - return _dialog->ShowModal (); + return _dialog.ShowModal(); } private: - wxMessageDialog* _dialog; + wxMessageDialog _dialog; }; @@ -532,10 +514,7 @@ public: _film_viewer.set_film(_film); _film_editor->set_film(_film); _controls->set_film (_film); - if (_video_waveform_dialog) { - _video_waveform_dialog->Destroy (); - _video_waveform_dialog = nullptr; - } + _video_waveform_dialog.reset(); set_menu_sensitivity (); if (_film && _film->directory()) { Config::instance()->add_to_history (_film->directory().get()); @@ -577,20 +556,19 @@ private: void file_new () { - auto d = new FilmNameLocationDialog (this, _("New Film"), true); - ScopeGuard sg = [d]() { d->Destroy(); }; - int const r = d->ShowModal (); + FilmNameLocationDialog dialog(this, _("New Film"), true); + int const r = dialog.ShowModal(); - if (r != wxID_OK || !d->check_path() || !maybe_save_then_delete_film()) { + if (r != wxID_OK || !dialog.check_path() || !maybe_save_then_delete_film()) { return; } try { - new_film (d->path(), d->template_name()); + new_film(dialog.path(), dialog.template_name()); } catch (boost::filesystem::filesystem_error& e) { #ifdef DCPOMATIC_WINDOWS string bad_chars = "<>:\"/|?*"; - string const filename = d->path().filename().string(); + string const filename = dialog.path().filename().string(); string found_bad_chars; for (size_t i = 0; i < bad_chars.length(); ++i) { if (filename.find(bad_chars[i]) != string::npos && found_bad_chars.find(bad_chars[i]) == string::npos) { @@ -613,18 +591,17 @@ private: void file_open () { - auto c = new wxDirDialog ( + wxDirDialog dialog( this, _("Select film to open"), std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); - ScopeGuard sg = [c]() { c->Destroy(); }; int r; while (true) { - r = c->ShowModal (); - if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { + r = dialog.ShowModal(); + if (r == wxID_OK && dialog.GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); } else { break; @@ -632,60 +609,69 @@ private: } if (r == wxID_OK && maybe_save_then_delete_film()) { - load_film (wx_to_std (c->GetPath ())); + load_film(wx_to_std(dialog.GetPath())); } } void file_save () { - _film->write_metadata (); + try { + _film->write_metadata (); + } catch (exception& e) { + error_dialog(this, _("Could not save project."), std_to_wx(e.what())); + } } void file_save_as_template () { - auto d = new SaveTemplateDialog (this); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() == wxID_OK) { - Config::instance()->save_template (_film, d->name ()); + SaveTemplateDialog dialog(this); + if (dialog.ShowModal() == wxID_OK) { + try { + Config::instance()->save_template(_film, dialog.name()); + } catch (exception& e) { + error_dialog(this, _("Could not save template."), std_to_wx(e.what())); + } } } void file_duplicate () { - auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); - ScopeGuard sg = [d]() { d->Destroy(); }; + FilmNameLocationDialog dialog(this, _("Duplicate Film"), false); - if (d->ShowModal() == wxID_OK && d->check_path() && maybe_save_film()) { - shared_ptr film (new Film (d->path())); + if (dialog.ShowModal() == wxID_OK && dialog.check_path() && maybe_save_film()) { + auto film = make_shared(dialog.path()); film->copy_from (_film); - film->set_name (d->path().filename().generic_string()); - film->write_metadata (); + film->set_name(dialog.path().filename().generic_string()); + try { + film->write_metadata(); + } catch (exception& e) { + error_dialog(this, _("Could not duplicate project."), std_to_wx(e.what())); + } } } void file_duplicate_and_open () { - auto d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); - ScopeGuard sg = [d]() { d->Destroy(); }; + FilmNameLocationDialog dialog(this, _("Duplicate Film"), false); - if (d->ShowModal() == wxID_OK && d->check_path() && maybe_save_film()) { - shared_ptr film (new Film (d->path())); + if (dialog.ShowModal() == wxID_OK && dialog.check_path() && maybe_save_film()) { + auto film = make_shared(dialog.path()); film->copy_from (_film); - film->set_name (d->path().filename().generic_string()); - film->write_metadata (); - set_film (film); + film->set_name(dialog.path().filename().generic_string()); + try { + film->write_metadata (); + set_film (film); + } catch (exception& e) { + error_dialog(this, _("Could not duplicate project."), std_to_wx(e.what())); + } } } void file_close () { if (_film && _film->dirty ()) { - - auto dialog = new FilmChangedClosingDialog (_film->name ()); - int const r = dialog->run (); - delete dialog; - - switch (r) { + FilmChangedClosingDialog dialog(_film->name()); + switch (dialog.run()) { case wxID_NO: /* Don't save and carry on to close */ break; @@ -728,23 +714,22 @@ private: { DCPOMATIC_ASSERT (_clipboard); - auto d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() != wxID_OK) { + PasteDialog dialog(this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); + if (dialog.ShowModal() != wxID_OK) { return; } for (auto i: _film_editor->content_panel()->selected()) { - if (d->video() && i->video) { + if (dialog.video() && i->video) { DCPOMATIC_ASSERT (_clipboard->video); i->video->take_settings_from (_clipboard->video); } - if (d->audio() && i->audio) { + if (dialog.audio() && i->audio) { DCPOMATIC_ASSERT (_clipboard->audio); i->audio->take_settings_from (_clipboard->audio); } - if (d->text()) { + if (dialog.text()) { auto j = i->text.begin (); auto k = _clipboard->text.begin (); while (j != i->text.end() && k != _clipboard->text.end()) { @@ -771,29 +756,27 @@ private: void tools_restore_default_preferences () { - auto d = new wxMessageDialog ( - 0, + wxMessageDialog dialog( + nullptr, _("Are you sure you want to restore preferences to their defaults? This cannot be undone."), _("Restore default preferences"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION ); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() == wxID_YES) { + if (dialog.ShowModal() == wxID_YES) { Config::restore_defaults (); } } void tools_export_preferences () { - auto dialog = new wxFileDialog ( + wxFileDialog dialog( this, _("Specify ZIP file"), wxEmptyString, wxT("dcpomatic_config.zip"), wxT("ZIP files (*.zip)|*.zip"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - if (dialog->ShowModal() == wxID_OK) { - save_all_config_as_zip (wx_to_std(dialog->GetPath())); + if (dialog.ShowModal() == wxID_OK) { + save_all_config_as_zip(wx_to_std(dialog.GetPath())); } } @@ -816,9 +799,8 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - auto hints = new HintsDialog (this, _film, false); - ScopeGuard sg = [hints]() { hints->Destroy(); }; - if (hints->ShowModal() == wxID_CANCEL) { + HintsDialog hints(this, _film, false); + if (hints.ShowModal() == wxID_CANCEL) { return; } } @@ -862,12 +844,7 @@ private: return; } - if (_kdm_dialog) { - _kdm_dialog->Destroy (); - _kdm_dialog = 0; - } - - _kdm_dialog = new KDMDialog (this, _film); + _kdm_dialog.reset(this, _film); _kdm_dialog->Show (); } @@ -877,12 +854,7 @@ private: return; } - if (_dkdm_dialog) { - _dkdm_dialog->Destroy (); - _dkdm_dialog = nullptr; - } - - _dkdm_dialog = new DKDMDialog (this, _film); + _dkdm_dialog.reset(this, _film); _dkdm_dialog->Show (); } @@ -929,9 +901,8 @@ private: } if (Config::instance()->show_hints_before_make_dcp()) { - auto hints = new HintsDialog (this, _film, false); - ScopeGuard sg = [hints]() { hints->Destroy(); }; - if (hints->ShowModal() == wxID_CANCEL) { + HintsDialog hints(this, _film, false); + if (hints.ShowModal() == wxID_CANCEL) { return; } } @@ -968,9 +939,8 @@ private: return; } - auto d = new SelfDKDMDialog (this, _film); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal () != wxID_OK) { + SelfDKDMDialog dialog(this, _film); + if (dialog.ShowModal() != wxID_OK) { return; } @@ -991,17 +961,24 @@ private: dcp::LocalTime to (Config::instance()->signer_chain()->leaf().not_after()); to.add_days (-1); + auto signer = Config::instance()->signer_chain(); + if (!signer->valid()) { + error_dialog(this, _("The certificate chain for signing is invalid")); + return; + } + optional kdm; try { - kdm = _film->make_kdm ( - Config::instance()->decryption_chain()->leaf(), - vector(), - d->cpl (), - from, to, - dcp::Formulation::MODIFIED_TRANSITIONAL_1, - true, - 0 - ); + auto const decrypted_kdm = _film->make_kdm(dialog.cpl(), from, to); + auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0); + if (dialog.internal()) { + auto dkdms = Config::instance()->dkdms(); + dkdms->add(make_shared(kdm)); + Config::instance()->changed (); + } else { + auto path = dialog.directory() / (_film->dcp_name(false) + "_DKDM.xml"); + kdm.as_xml(path); + } } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -1009,32 +986,20 @@ private: } catch (...) { error_dialog (this, _("An unknown exception occurred.")); } - - if (kdm) { - if (d->internal ()) { - auto dkdms = Config::instance()->dkdms(); - dkdms->add (make_shared(kdm.get())); - Config::instance()->changed (); - } else { - auto path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); - kdm->as_xml (path); - } - } } void jobs_export_video_file () { - auto d = new ExportVideoFileDialog (this, _film->isdcf_name(true)); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() != wxID_OK) { + ExportVideoFileDialog dialog(this, _film->isdcf_name(true)); + if (dialog.ShowModal() != wxID_OK) { return; } - if (boost::filesystem::exists(d->path())) { + if (boost::filesystem::exists(dialog.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()) + wxString::Format(_("File %s already exists. Do you want to overwrite it?"), std_to_wx(dialog.path().string()).data()) ); if (!ok) { @@ -1045,7 +1010,7 @@ private: auto job = make_shared(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); job->set_encoder ( make_shared ( - _film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf()) + _film, job, dialog.path(), dialog.format(), dialog.mixdown_to_stereo(), dialog.split_reels(), dialog.split_streams(), dialog.x264_crf()) ); JobManager::instance()->add (job); } @@ -1053,14 +1018,13 @@ private: void jobs_export_subtitles () { - auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop()); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() != wxID_OK) { + ExportSubtitlesDialog dialog(this, _film->reels().size(), _film->interop()); + if (dialog.ShowModal() != wxID_OK) { return; } auto job = make_shared(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP); job->set_encoder( - make_shared(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font()) + make_shared(_film, job, dialog.path(), _film->isdcf_name(true), dialog.split_reels(), dialog.include_font()) ); JobManager::instance()->add(job); } @@ -1087,7 +1051,7 @@ private: void view_video_waveform () { if (!_video_waveform_dialog) { - _video_waveform_dialog = new VideoWaveformDialog (this, _film, _film_viewer); + _video_waveform_dialog.reset(this, _film, _film_viewer); } _video_waveform_dialog->Show (); @@ -1123,7 +1087,7 @@ private: void tools_manage_templates () { if (!_templates_dialog) { - _templates_dialog = new TemplatesDialog (this); + _templates_dialog.reset(this); } _templates_dialog->Show (); @@ -1137,46 +1101,44 @@ private: void tools_send_translations () { - auto d = new SendI18NDialog (this); - ScopeGuard sg = [d]() { d->Destroy(); }; - 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"; - auto translations = I18NHook::translations (); - for (auto i: translations) { - body += i.first + "\n" + i.second + "\n\n"; - } - list to = { "carl@dcpomatic.com" }; - if (d->email().find("@") == string::npos) { - error_dialog (this, _("You must enter a valid email address when sending translations, " - "otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions.")); - } else { - Emailer emailer (d->email(), to, "DCP-o-matic translations", body); - try { - emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS); - } catch (NetworkError& e) { - error_dialog (this, _("Could not send translations"), std_to_wx(e.what())); - } + SendI18NDialog dialog(this); + if (dialog.ShowModal() != wxID_OK) { + return; + } + + string body; + body += dialog.name() + "\n"; + body += dialog.language() + "\n"; + body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n"; + body += "--\n"; + auto translations = I18NHook::translations (); + for (auto i: translations) { + body += i.first + "\n" + i.second + "\n\n"; + } + if (dialog.email().find("@") == string::npos) { + error_dialog (this, _("You must enter a valid email address when sending translations, " + "otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions.")); + } else { + Emailer emailer(dialog.email(), { "carl@dcpomatic.com" }, "DCP-o-matic translations", body); + try { + emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS); + } catch (NetworkError& e) { + error_dialog (this, _("Could not send translations"), std_to_wx(e.what())); } } } void help_about () { - auto d = new AboutDialog (this); - ScopeGuard sg = [d]() { d->Destroy(); }; - d->ShowModal (); + AboutDialog dialog(this); + dialog.ShowModal(); } void help_report_a_problem () { - auto d = new ReportProblemDialog (this, _film); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal () == wxID_OK) { - d->report (); + ReportProblemDialog dialog(this, _film); + if (dialog.ShowModal() == wxID_OK) { + dialog.report(); } } @@ -1186,15 +1148,14 @@ private: return true; } - auto d = new wxMessageDialog ( - 0, + wxMessageDialog dialog( + nullptr, _("There are unfinished jobs; are you sure you want to quit?"), _("Unfinished jobs"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION ); - ScopeGuard sg = [d]() { d->Destroy(); }; - return d->ShowModal() == wxID_YES; + return dialog.ShowModal() == wxID_YES; } void close (wxCloseEvent& ev) @@ -1205,12 +1166,8 @@ private: } if (_film && _film->dirty ()) { - - auto dialog = new FilmChangedClosingDialog (_film->name ()); - int const r = dialog->run (); - delete dialog; - - switch (r) { + FilmChangedClosingDialog dialog(_film->name()); + switch (dialog.run()) { case wxID_NO: /* Don't save and carry on to close */ break; @@ -1234,6 +1191,8 @@ private: /* Also stop hearing about analytics-related stuff */ _analytics_message_connection.disconnect (); + FontConfig::drop(); + ev.Skip (); } @@ -1309,14 +1268,20 @@ private: return true; } - if (_film->dirty ()) { - T d (_film->name ()); - switch (d.run ()) { + while (_film->dirty()) { + T dialog(_film->name()); + switch (dialog.run()) { case wxID_NO: return true; case wxID_YES: - _film->write_metadata (); - return true; + try { + _film->write_metadata(); + return true; + } catch (exception& e) { + error_dialog(this, _("Could not save project."), std_to_wx(e.what())); + /* Go round again for another try */ + } + break; case wxID_CANCEL: return false; } @@ -1529,9 +1494,8 @@ private: } if (uc->state() == UpdateChecker::State::YES) { - auto dialog = new UpdateDialog (this, uc->stable(), uc->test()); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - dialog->ShowModal (); + UpdateDialog dialog(this, uc->stable(), uc->test()); + dialog.ShowModal(); } else if (uc->state() == UpdateChecker::State::FAILED) { error_dialog (this, _("The DCP-o-matic download server could not be contacted.")); } else { @@ -1567,9 +1531,8 @@ private: void analytics_message (string title, string html) { - auto d = new HTMLDialog(this, std_to_wx(title), std_to_wx(html)); - ScopeGuard sg = [d]() { d->Destroy(); }; - d->ShowModal(); + HTMLDialog dialog(this, std_to_wx(title), std_to_wx(html)); + dialog.ShowModal(); } void set_title () @@ -1592,14 +1555,14 @@ private: wxPanel* _right_panel; FilmViewer _film_viewer; StandardControls* _controls; - VideoWaveformDialog* _video_waveform_dialog = nullptr; + wx_ptr _video_waveform_dialog; 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; + wx_ptr _kdm_dialog; + wx_ptr _dkdm_dialog; + wx_ptr _templates_dialog; wxMenu* _file_menu = nullptr; shared_ptr _film; int _history_items = 0; @@ -1738,18 +1701,14 @@ private: auto release_notes = find_release_notes(gui_is_dark()); if (release_notes) { - auto notes = new HTMLDialog(nullptr, _("Release notes"), std_to_wx(*release_notes), true); - ScopeGuard sg = [notes]() { notes->Destroy(); }; - notes->Centre(); - notes->ShowModal(); + HTMLDialog notes(nullptr, _("Release notes"), std_to_wx(*release_notes), true); + notes.Centre(); + notes.ShowModal(); } } catch (exception& e) { - if (_splash) { - _splash->Destroy (); - _splash = nullptr; - } + close_splash(); error_dialog (nullptr, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); } @@ -1861,10 +1820,8 @@ private: void close_splash () { - if (_splash) { - _splash->Destroy (); - _splash = nullptr; - } + _splash->Destroy(); + _splash = nullptr; } void config_failed_to_load (Config::LoadFailure what) @@ -1882,8 +1839,7 @@ private: /* Destroy the splash screen here, as otherwise bad things seem to happen (for reasons unknown) when we open our recreate dialog, close it, *then* try to Destroy the splash (the Destroy fails). */ - _splash->Destroy (); - _splash = nullptr; + close_splash(); auto config = Config::instance(); switch (reason) { @@ -1892,7 +1848,7 @@ private: if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN_UTF8)) { return false; } - auto d = new RecreateChainDialog ( + RecreateChainDialog dialog( _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" @@ -1900,15 +1856,14 @@ private: _("Do nothing"), Config::NAG_BAD_SIGNER_CHAIN_UTF8 ); - ScopeGuard sg = [d]() { d->Destroy(); }; - return d->ShowModal() == wxID_OK; + return dialog.ShowModal() == wxID_OK; } case Config::BAD_SIGNER_VALIDITY_TOO_LONG: { if (config->nagged(Config::NAG_BAD_SIGNER_CHAIN_VALIDITY)) { return false; } - auto d = new RecreateChainDialog ( + RecreateChainDialog dialog( _frame, _("Recreate signing certificates"), _("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a validity period\n" "that is too long. This will cause problems playing back DCPs on some systems.\n" @@ -1916,27 +1871,25 @@ private: _("Do nothing"), Config::NAG_BAD_SIGNER_CHAIN_VALIDITY ); - ScopeGuard sg = [d]() { d->Destroy(); }; - return d->ShowModal() == wxID_OK; + return dialog.ShowModal() == wxID_OK; } case Config::BAD_SIGNER_INCONSISTENT: { - auto d = new RecreateChainDialog ( + RecreateChainDialog dialog( _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" "the certificate chain for signing DCPs and KDMs?"), _("Close DCP-o-matic") ); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { exit (EXIT_FAILURE); } return true; } case Config::BAD_DECRYPTION_INCONSISTENT: { - auto d = new RecreateChainDialog ( + RecreateChainDialog dialog( _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" @@ -1944,8 +1897,7 @@ private: "configuration before continuing."), _("Close DCP-o-matic") ); - ScopeGuard sg = [d]() { d->Destroy(); }; - if (d->ShowModal() != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { exit (EXIT_FAILURE); } return true; @@ -1956,7 +1908,7 @@ private: } DOMFrame* _frame = nullptr; - wxSplashScreen* _splash = nullptr; + wxSplashScreen* _splash; shared_ptr _timer; string _film_to_load; string _film_to_create;