X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=90c37d08c726feb29a502585e81a717f3b9a92db;hp=11c152849f97cb77221c94187b823fac94cb4363;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=a6aa6b64b5a5e4c9263e4a519277cb5db213ba94 diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 11c152849..90c37d08c 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,80 +18,105 @@ */ -#include "wx/wx_signal_manager.h" -#include "wx/wx_util.h" #include "wx/about_dialog.h" -#include "wx/report_problem_dialog.h" #include "wx/film_viewer.h" +#include "wx/nag_dialog.h" +#include "wx/player_config_dialog.h" #include "wx/player_information.h" +#include "wx/player_stress_tester.h" +#include "wx/playlist_controls.h" +#include "wx/report_problem_dialog.h" +#include "wx/standard_controls.h" +#include "wx/system_information_dialog.h" +#include "wx/timer_display.h" #include "wx/update_dialog.h" -#include "wx/player_config_dialog.h" #include "wx/verify_dcp_dialog.h" -#include "wx/standard_controls.h" -#include "wx/swaroop_controls.h" -#include "lib/cross.h" -#include "lib/config.h" -#include "lib/util.h" -#include "lib/internet.h" -#include "lib/update_checker.h" +#include "wx/verify_dcp_progress_dialog.h" +#include "wx/wx_signal_manager.h" +#include "wx/wx_util.h" #include "lib/compose.hpp" +#include "lib/config.h" +#include "lib/cross.h" #include "lib/dcp_content.h" -#include "lib/job_manager.h" -#include "lib/job.h" +#include "lib/dcp_examiner.h" +#include "lib/dcpomatic_log.h" +#include "lib/dcpomatic_socket.h" +#include "lib/examine_content_job.h" +#include "lib/ffmpeg_content.h" +#include "lib/file_log.h" #include "lib/film.h" +#include "lib/image.h" +#include "lib/image_jpeg.h" +#include "lib/image_png.h" +#include "lib/internet.h" +#include "lib/job.h" +#include "lib/job_manager.h" #include "lib/null_log.h" -#include "lib/video_content.h" -#include "lib/text_content.h" +#include "lib/player.h" +#include "lib/player_video.h" #include "lib/ratio.h" -#include "lib/verify_dcp_job.h" -#include "lib/dcp_examiner.h" -#include "lib/examine_content_job.h" -#include "lib/server.h" -#include "lib/dcpomatic_socket.h" #include "lib/scoped_temporary.h" -#include "lib/monitor_checker.h" -#include "lib/lock_file_checker.h" -#include "lib/ffmpeg_content.h" -#include "lib/dcpomatic_log.h" +#include "lib/server.h" +#include "lib/text_content.h" +#include "lib/update_checker.h" +#include "lib/util.h" +#include "lib/verify_dcp_job.h" +#include "lib/video_content.h" +#include #include -#include #include -#include -#include -#include +#include +#include +#include +LIBDCP_DISABLE_WARNINGS #include +#include #include #include -#include -#ifdef __WXOSX__ -#include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS +#ifdef __WXGTK__ +#include #endif -#include +#include +#include #include #ifdef check #undef check #endif + #define MAX_CPLS 32 -using std::string; + using std::cout; -using std::list; +using std::dynamic_pointer_cast; using std::exception; +using std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::scoped_array; +using std::weak_ptr; +using boost::bind; using boost::optional; -using boost::dynamic_pointer_cast; +using boost::scoped_array; using boost::thread; -using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using dcp::raw_convert; +using namespace dcpomatic; + enum { ID_file_open = 1, ID_file_add_ov, ID_file_add_kdm, + ID_file_save_frame, ID_file_history, /* Allow spare IDs after _history for the recent files list */ ID_file_close = 100, @@ -107,37 +132,38 @@ enum { ID_help_report_a_problem, ID_tools_verify, ID_tools_check_for_updates, + ID_tools_timing, + ID_tools_system_information, /* IDs for shortcuts (with no associated menu item) */ ID_start_stop, - ID_back_frame, - ID_forward_frame + ID_go_back_frame, + ID_go_forward_frame, + ID_go_back_small_amount, + ID_go_forward_small_amount, + ID_go_back_medium_amount, + ID_go_forward_medium_amount, + ID_go_back_large_amount, + ID_go_forward_large_amount, + ID_go_to_start, + ID_go_to_end }; class DOMFrame : public wxFrame { public: DOMFrame () - : wxFrame (0, -1, _("DCP-o-matic Player")) - , _dual_screen (0) - , _update_news_requested (false) - , _info (0) + : wxFrame (nullptr, -1, _("DCP-o-matic Player")) , _mode (Config::instance()->player_mode()) - , _config_dialog (0) - , _file_menu (0) - , _history_items (0) - , _history_position (0) - , _history_separator (0) - , _view_full_screen (0) - , _view_dual_screen (0) + , _main_sizer (new wxBoxSizer(wxVERTICAL)) { - dcpomatic_log.reset (new NullLog()); + dcpomatic_log = make_shared(); #if defined(DCPOMATIC_WINDOWS) maybe_open_console (); cout << "DCP-o-matic Player is starting." << "\n"; #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); set_menu_sensitivity (); SetMenuBar (bar); @@ -147,11 +173,12 @@ public: #endif _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); - update_from_config (); + update_from_config (Config::PLAYER_DEBUG_LOG); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this), ID_file_open); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_ov, this), ID_file_add_ov); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_kdm, this), ID_file_add_kdm); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save_frame, this), ID_file_save_frame); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); @@ -167,113 +194,105 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_verify, this), ID_tools_verify); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_timing, this), ID_tools_timing); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this), ID_tools_system_information); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ _overall_panel = new wxPanel (this, wxID_ANY); - _viewer.reset (new FilmViewer (_overall_panel)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - SwaroopControls* sc = new SwaroopControls (_overall_panel, _viewer); - _controls = sc; - sc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1)); -#else - _controls = new StandardControls (_overall_panel, _viewer, false); -#endif + _viewer = make_shared(_overall_panel); + if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { + auto pc = new PlaylistControls (_overall_panel, _viewer); + _controls = pc; + pc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1)); + } else { + _controls = new StandardControls (_overall_panel, _viewer, false); + } _viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ()); + _viewer->set_optimise_for_j2k (true); _viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this)); - _viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1)); - _viewer->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1)); - _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1)); + _viewer->TooManyDropped.connect (bind(&DOMFrame::too_many_frames_dropped, this)); _info = new PlayerInformation (_overall_panel, _viewer); setup_main_sizer (Config::instance()->player_mode()); #ifdef __WXOSX__ - int accelerators = 4; + int accelerators = 12; #else - int accelerators = 3; + int accelerators = 11; #endif - wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators]; - accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop); - accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_back_frame); - accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame); + _stress.setup (this, _controls); + + std::vector accel(accelerators); + accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop); + accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_go_back_frame); + accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_go_forward_frame); + accel[3].Set(wxACCEL_SHIFT, WXK_LEFT, ID_go_back_small_amount); + accel[4].Set(wxACCEL_SHIFT, WXK_RIGHT, ID_go_forward_small_amount); + accel[5].Set(wxACCEL_CTRL, WXK_LEFT, ID_go_back_medium_amount); + accel[6].Set(wxACCEL_CTRL, WXK_RIGHT, ID_go_forward_medium_amount); + accel[7].Set(wxACCEL_SHIFT | wxACCEL_CTRL, WXK_LEFT, ID_go_back_large_amount); + accel[8].Set(wxACCEL_SHIFT | wxACCEL_CTRL, WXK_RIGHT, ID_go_forward_large_amount); + accel[9].Set(wxACCEL_NORMAL, WXK_HOME, ID_go_to_start); + accel[10].Set(wxACCEL_NORMAL, WXK_END, ID_go_to_end); #ifdef __WXOSX__ - accel[3].Set(wxACCEL_CTRL, static_cast('W'), ID_file_close); + accel[11].Set(wxACCEL_CTRL, static_cast('W'), ID_file_close); #endif - wxAcceleratorTable accel_table (accelerators, accel); + wxAcceleratorTable accel_table (accelerators, accel.data()); SetAcceleratorTable (accel_table); - delete[] accel; - Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::start_stop_pressed, this), ID_start_stop); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_back_frame, this), ID_go_back_frame); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_forward_frame, this), ID_go_forward_frame); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -60), ID_go_back_small_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 60), ID_go_forward_small_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -600), ID_go_back_medium_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 600), ID_go_forward_medium_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, -3600), ID_go_back_large_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_seconds, this, 3600), ID_go_forward_large_amount); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_start, this), ID_go_to_start); + Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_to_end, this), ID_go_to_end); reset_film (); - UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - MonitorChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::monitor_checker_state_changed, this)); - MonitorChecker::instance()->run (); - LockFileChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::lock_checker_state_changed, this)); - LockFileChecker::instance()->run (); -#endif + UpdateChecker::instance()->StateChanged.connect (boost::bind(&DOMFrame::update_checker_state_changed, this)); setup_screen (); -#ifdef DCPOMATIC_VARIANT_SWAROOP - sc->check_restart (); -#endif + _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); } -#ifdef DCPOMATIC_VARIANT_SWAROOP - void monitor_checker_state_changed () + ~DOMFrame () { - if (!MonitorChecker::instance()->ok()) { - _viewer->stop (); - error_dialog (this, _("The required display devices are not connected correctly.")); - } + /* It's important that this is stopped before our frame starts destroying its children, + * otherwise UI elements that it depends on will disappear from under it. + */ + _viewer.reset (); } - void lock_checker_state_changed () - { - if (!LockFileChecker::instance()->ok()) { - _viewer->stop (); - error_dialog (this, _("The lock file is not present.")); - } - } -#endif - void setup_main_sizer (Config::PlayerMode mode) { - wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); + _main_sizer->Detach (_viewer->panel()); + _main_sizer->Detach (_controls); + _main_sizer->Detach (_info); if (mode != Config::PLAYER_MODE_DUAL) { - main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); + _main_sizer->Add (_viewer->panel(), 1, wxEXPAND); } - main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6); - main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); - _overall_panel->SetSizer (main_sizer); + _main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6); + _main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); + _overall_panel->SetSizer (_main_sizer); _overall_panel->Layout (); } bool playback_permitted () { -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (!MonitorChecker::instance()->ok()) { - error_dialog (this, _("The required display devices are not connected correctly.")); - return false; - } - if (!LockFileChecker::instance()->ok()) { - error_dialog (this, _("The lock file is not present.")); - return false; - } -#endif if (!_film || !Config::instance()->respect_kdm_validity_periods()) { return true; } bool ok = true; - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr d = dynamic_pointer_cast(i); + for (auto i: _film->content()) { + auto d = dynamic_pointer_cast(i); if (d && !d->kdm_timing_window_valid()) { ok = false; } @@ -286,82 +305,23 @@ public: return ok; } - void playback_started (DCPTime time) - { - optional log = Config::instance()->player_log_file(); - if (!log) { - return; - } - - FILE* f = fopen_boost(*log, "a"); - - /* XXX: this only logs the first piece of content; probably should be each piece? */ - - shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); - if (dcp) { - DCPExaminer ex (dcp); - shared_ptr playing_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { - if (!dcp->cpl() || i->id() == *dcp->cpl()) { - playing_cpl = i; - } - } - DCPOMATIC_ASSERT (playing_cpl); - - fprintf ( - f, - "%s playback-started %s %s %s\n", - dcp::LocalTime().as_string().c_str(), - time.timecode(_film->video_frame_rate()).c_str(), - dcp->directories().front().string().c_str(), - playing_cpl->annotation_text().c_str() - ); - } - - shared_ptr ffmpeg = dynamic_pointer_cast(_film->content().front()); - if (ffmpeg) { - fprintf ( - f, - "%s playback-started %s %s\n", - dcp::LocalTime().as_string().c_str(), - time.timecode(_film->video_frame_rate()).c_str(), - ffmpeg->path(0).string().c_str() - ); - } - - fclose (f); - } - - void playback_seeked (DCPTime time) - { - optional log = Config::instance()->player_log_file(); - if (!log) { - return; - } - - FILE* f = fopen_boost(*log, "a"); - fprintf (f, "%s playback-seeked %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str()); - fclose (f); - } - void playback_stopped (DCPTime time) + void too_many_frames_dropped () { -#ifdef DCPOMATIC_VARIANT_SWAROOP - try { - boost::filesystem::remove (Config::path("position")); - } catch (...) { - /* Never mind */ - } -#endif - - optional log = Config::instance()->player_log_file(); - if (!log) { - return; + if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { + _viewer->stop (); } - FILE* f = fopen_boost(*log, "a"); - fprintf (f, "%s playback-stopped %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str()); - fclose (f); + NagDialog::maybe_nag ( + this, + Config::NAG_TOO_MANY_DROPPED_FRAMES, + _(wxS("The player is dropping a lot of frames, so playback may not be accurate.\n\n" + "This does not necessarily mean that the DCP you are playing is defective!\n\n" + "You may be able to improve player performance by:\n" + "• choosing 'decode at half resolution' or 'decode at quarter resolution' from the View menu\n" + "• using a more powerful computer.\n" + )) + ); } void set_decode_reduction (optional reduction) @@ -377,64 +337,52 @@ public: reset_film (); try { - shared_ptr dcp (new DCPContent(dir)); - _film->examine_and_add_content (dcp, true); + _stress.set_suspended (true); + // here + auto dcp = make_shared(dir); + auto job = make_shared(_film, dcp); + _examine_job_connection = job->Finished.connect(bind(&DOMFrame::add_dcp_to_film, this, weak_ptr(job), weak_ptr(dcp))); + JobManager::instance()->add (job); bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content")); if (!ok || !report_errors_from_last_job(this)) { return; } Config::instance()->add_to_player_history (dir); - } catch (dcp::DCPReadError& e) { + } catch (ProjectFolderError &) { + error_dialog ( + this, + wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), + _( + "This looks like a DCP-o-matic project folder, which cannot be loaded into the player. " + "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to play." + ) + ); + } catch (dcp::ReadError& e) { + error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what())); + } catch (DCPError& e) { error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what())); } } -#ifdef DCPOMATIC_VARIANT_SWAROOP - optional get_kdm_from_url (shared_ptr dcp) + void add_dcp_to_film (weak_ptr weak_job, weak_ptr weak_content) { - ScopedTemporary temp; - string url = Config::instance()->kdm_server_url(); - boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl()); - optional kdm; - if (dcp->cpl() && !get_from_url(url, false, temp)) { - try { - kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file())); - if (kdm->cpl_id() != dcp->cpl()) { - kdm = boost::none; - } - } catch (std::exception& e) { - /* Hey well */ - } + auto job = weak_job.lock (); + if (!job || !job->finished_ok()) { + return; } - return kdm; - } -#endif - optional get_kdm_from_directory (shared_ptr dcp) - { - using namespace boost::filesystem; - optional kdm_dir = Config::instance()->player_kdm_directory(); - if (!kdm_dir) { - return optional(); - } - for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) { - try { - if (file_size(i->path()) < MAX_KDM_SIZE) { - dcp::EncryptedKDM kdm (dcp::file_to_string(i->path())); - if (kdm.cpl_id() == dcp->cpl()) { - return kdm; - } - } - } catch (std::exception& e) { - /* Hey well */ - } + auto content = weak_content.lock (); + if (!content) { + return; } - return optional(); + + _film->add_content (content); + _stress.set_suspended (false); } void reset_film_weak (weak_ptr weak_film) { - shared_ptr film = weak_film.lock (); + auto film = weak_film.lock (); if (film) { reset_film (film); } @@ -443,6 +391,8 @@ public: void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) { _film = film; + _film->set_tolerant (true); + _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS); _viewer->set_film (_film); _controls->set_film (_film); _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); @@ -451,7 +401,7 @@ public: void film_changed (ChangeType type, Film::Property property) { - if (type != CHANGE_TYPE_DONE || property != Film::CONTENT) { + if (type != ChangeType::DONE || property != Film::Property::CONTENT) { return; } @@ -462,29 +412,15 @@ public: /* Start off as Flat */ _film->set_container (Ratio::from_id("185")); - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr dcp = dynamic_pointer_cast(i); - if (dcp && dcp->needs_kdm()) { - optional kdm; -#ifdef DCPOMATIC_VARIANT_SWAROOP - kdm = get_kdm_from_url (dcp); -#endif - if (!kdm) { - kdm = get_kdm_from_directory (dcp); - } - - if (kdm) { - dcp->add_kdm (*kdm); - dcp->examine (_film, shared_ptr()); - } - } + for (auto i: _film->content()) { + auto dcp = dynamic_pointer_cast(i); - BOOST_FOREACH (shared_ptr j, i->text) { + for (auto j: i->text) { j->set_use (true); } if (i->video) { - Ratio const * r = Ratio::nearest_from_ratio(i->video->size().ratio()); + auto const r = Ratio::nearest_from_ratio(i->video->size().ratio()); if (r->id() == "239") { /* Any scope content means we use scope */ _film->set_container(r); @@ -492,7 +428,7 @@ public: } /* Any 3D content means we use 3D mode */ - if (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) { + if (i->video && i->video->frame_type() != VideoFrameType::TWO_D) { _film->set_three_d (true); } } @@ -502,21 +438,20 @@ public: set_menu_sensitivity (); - wxMenuItemList old = _cpl_menu->GetMenuItems(); - for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) { - _cpl_menu->Remove (*i); + auto old = _cpl_menu->GetMenuItems(); + for (auto const& i: old) { + _cpl_menu->Remove (i); } if (_film->content().size() == 1) { /* Offer a CPL menu */ - shared_ptr first = dynamic_pointer_cast(_film->content().front()); + auto first = dynamic_pointer_cast(_film->content().front()); if (first) { - DCPExaminer ex (first); int id = ID_view_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { - wxMenuItem* j = _cpl_menu->AppendRadioItem( + for (auto i: dcp::find_and_resolve_cpls(first->directories(), true)) { + auto j = _cpl_menu->AppendRadioItem( id, - wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data()) + wxString::Format("%s (%s)", std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data()) ); j->Check(!first->cpl() || i->id() == *first->cpl()); ++id; @@ -525,14 +460,49 @@ public: } } + void load_stress_script (boost::filesystem::path path) + { + _stress.load_script (path); + } + private: + void examine_content () + { + DCPOMATIC_ASSERT (_film); + auto dcp = dynamic_pointer_cast(_film->content().front()); + DCPOMATIC_ASSERT (dcp); + dcp->examine (_film, shared_ptr()); + + /* Examining content re-creates the TextContent objects, so we must re-enable them */ + for (auto i: dcp->text) { + i->set_use (true); + } + } + + bool report_errors_from_last_job (wxWindow* parent) const + { + auto jm = JobManager::instance (); + + DCPOMATIC_ASSERT (!jm->get().empty()); + + auto last = jm->get().back(); + if (last->finished_in_error()) { + error_dialog(parent, wxString::Format(_("Could not load DCP.\n\n%s."), std_to_wx(last->error_summary()).data()), std_to_wx(last->error_details())); + return false; + } + + return true; + } + void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; _file_menu->Append (ID_file_open, _("&Open...\tCtrl-O")); _file_add_ov = _file_menu->Append (ID_file_add_ov, _("&Add OV...")); - _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("&Add KDM...")); + _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("Add &KDM...")); + _file_menu->AppendSeparator (); + _file_save_frame = _file_menu->Append (ID_file_save_frame, _("&Save frame to file...\tCtrl-S")); _history_position = _file_menu->GetMenuItems().GetCount(); @@ -547,24 +517,22 @@ private: #endif #ifdef __WXOSX__ - wxMenuItem* prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + auto prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #else - wxMenu* edit = new wxMenu; - wxMenuItem* prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + auto edit = new wxMenu; + auto prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #endif prefs->Enable (Config::instance()->have_write_permission()); _cpl_menu = new wxMenu; - wxMenu* view = new wxMenu; - optional c = Config::instance()->decode_reduction(); + auto view = new wxMenu; + auto c = Config::instance()->decode_reduction(); _view_cpl = view->Append(ID_view_cpl, _("CPL"), _cpl_menu); view->AppendSeparator(); -#ifndef DCPOMATIC_VARIANT_SWAROOP _view_full_screen = view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11")); _view_dual_screen = view->AppendCheckItem(ID_view_dual_screen, _("Dual screen\tShift+F11")); -#endif setup_menu (); view->AppendSeparator(); view->Append(ID_view_closed_captions, _("Closed captions...")); @@ -574,12 +542,14 @@ private: view->AppendRadioItem(ID_view_scale_half, _("Decode at half resolution"))->Check(c && c.get() == 1); view->AppendRadioItem(ID_view_scale_quarter, _("Decode at quarter resolution"))->Check(c && c.get() == 2); - wxMenu* tools = new wxMenu; - _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP")); + auto tools = new wxMenu; + _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP...")); tools->AppendSeparator (); tools->Append (ID_tools_check_for_updates, _("Check for updates")); + tools->Append (ID_tools_timing, _("Timing...")); + tools->Append (ID_tools_system_information, _("System information...")); - wxMenu* help = new wxMenu; + auto help = new wxMenu; #ifdef __WXOSX__ help->Append (wxID_ABOUT, _("About DCP-o-matic")); #else @@ -598,12 +568,12 @@ private: void file_open () { - wxString d = wxStandardPaths::Get().GetDocumentsDir(); + auto d = wxStandardPaths::Get().GetDocumentsDir(); if (Config::instance()->last_player_load_directory()) { d = std_to_wx (Config::instance()->last_player_load_directory()->string()); } - wxDirDialog* c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + auto c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); int r; while (true) { @@ -626,7 +596,7 @@ private: void file_add_ov () { - wxDirDialog* c = new wxDirDialog ( + auto c = new wxDirDialog ( this, _("Select DCP to open as OV"), wxStandardPaths::Get().GetDocumentsDir(), @@ -645,19 +615,19 @@ private: if (r == wxID_OK) { DCPOMATIC_ASSERT (_film); - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); dcp->add_ov (wx_to_std(c->GetPath())); - JobManager::instance()->add(shared_ptr(new ExamineContentJob (_film, dcp))); + JobManager::instance()->add(make_shared(_film, dcp)); bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content")); if (!ok || !report_errors_from_last_job(this)) { return; } - BOOST_FOREACH (shared_ptr i, dcp->text) { + for (auto i: dcp->text) { i->set_use (true); } if (dcp->video) { - Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); if (r) { _film->set_container(r); } @@ -670,15 +640,19 @@ private: void file_add_kdm () { - wxFileDialog* d = new wxFileDialog (this, _("Select KDM")); + auto d = new wxFileDialog (this, _("Select KDM")); if (d->ShowModal() == wxID_OK) { DCPOMATIC_ASSERT (_film); - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); try { - dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); - dcp->examine (_film, shared_ptr()); + if (dcp) { + _viewer->set_coalesce_player_changes (true); + dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); + examine_content(); + _viewer->set_coalesce_player_changes (false); + } } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); d->Destroy (); @@ -690,12 +664,52 @@ private: _info->triggered_update (); } + void file_save_frame () + { + wxFileDialog dialog (this, _("Save frame to file"), "", "", "PNG files (*.png)|*.png|JPEG files (*.jpg,*.jpeg)|*.jpg,*.jpeg", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); + if (dialog.ShowModal() == wxID_CANCEL) { + return; + } + + auto path = boost::filesystem::path (wx_to_std(dialog.GetPath())); + + auto player = make_shared(_film, Image::Alignment::PADDED); + player->seek (_viewer->position(), true); + + bool done = false; + player->Video.connect ([path, &done, this](shared_ptr video, DCPTime) { + auto ext = boost::algorithm::to_lower_copy(path.extension().string()); + if (ext == ".png") { + auto image = video->image(boost::bind(PlayerVideo::force, AV_PIX_FMT_RGBA), VideoRange::FULL, false); + image_as_png(image).write(path); + } else if (ext == ".jpg" || ext == ".jpeg") { + auto image = video->image(boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, false); + image_as_jpeg(image, 80).write(path); + } else { + error_dialog (this, _(wxString::Format("Unrecognised file extension %s (use .jpg, .jpeg or .png)", std_to_wx(ext)))); + } + done = true; + }); + + int tries_left = 50; + while (!done && tries_left >= 0) { + player->pass(); + --tries_left; + } + + DCPOMATIC_ASSERT (tries_left >= 0); + } + void file_history (wxCommandEvent& event) { - vector history = Config::instance()->player_history (); + auto history = Config::instance()->player_history (); int n = event.GetId() - ID_file_history; if (n >= 0 && n < static_cast (history.size ())) { - load_dcp (history[n]); + try { + load_dcp (history[n]); + } catch (exception& e) { + error_dialog (0, std_to_wx(String::compose(wx_to_std(_("Could not load DCP %1.")), history[n])), std_to_wx(e.what())); + } } } @@ -725,21 +739,24 @@ private: void view_cpl (wxCommandEvent& ev) { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); int id = ev.GetId() - ID_view_cpl; DCPOMATIC_ASSERT (id >= 0); - DCPOMATIC_ASSERT (id < int(ex.cpls().size())); - list > cpls = ex.cpls(); - list >::iterator i = cpls.begin(); + DCPOMATIC_ASSERT (id < int(cpls.size())); + auto i = cpls.begin(); while (id > 0) { ++i; --id; } + _viewer->set_coalesce_player_changes (true); dcp->set_cpl ((*i)->id()); - dcp->examine (_film, shared_ptr()); + examine_content (); + _viewer->set_coalesce_player_changes (false); + + _info->triggered_update (); } void view_full_screen () @@ -787,20 +804,22 @@ private: _dual_screen->SetBackgroundColour (wxColour(0, 0, 0)); _dual_screen->ShowFullScreen (true); _viewer->panel()->Reparent (_dual_screen); + _viewer->panel()->SetFocus(); _dual_screen->Show (); if (wxDisplay::GetCount() > 1) { switch (Config::instance()->image_display()) { case 0: _dual_screen->Move (0, 0); - Move (wxDisplay(0).GetClientArea().GetWidth(), 0); + Move (wxDisplay(0U).GetClientArea().GetWidth(), 0); break; case 1: - _dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0); + _dual_screen->Move (wxDisplay(0U).GetClientArea().GetWidth(), 0); // (0, 0) doesn't seem to work for some strange reason Move (8, 8); break; } } + _dual_screen->Bind(wxEVT_CHAR_HOOK, boost::bind(&DOMFrame::dual_screen_key_press, this, _1)); } else { if (_dual_screen) { _viewer->panel()->Reparent (_overall_panel); @@ -812,6 +831,17 @@ private: setup_main_sizer (_mode); } + void dual_screen_key_press(wxKeyEvent& ev) + { + if (ev.GetKeyCode() == WXK_F11) { + if (ev.ShiftDown()) { + view_dual_screen(); + } else if (!ev.HasAnyModifiers()) { + view_full_screen(); + } + } + } + void view_closed_captions () { _viewer->show_closed_captions (); @@ -819,21 +849,18 @@ private: void tools_verify () { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - JobManager* jm = JobManager::instance (); - jm->add (shared_ptr (new VerifyDCPJob (dcp->directories()))); - bool const ok = display_progress (_("DCP-o-matic Player"), _("Verifying DCP")); - if (!ok) { + auto job = make_shared(dcp->directories()); + auto progress = new VerifyDCPProgressDialog(this, _("DCP-o-matic Player")); + bool const completed = progress->run (job); + progress->Destroy (); + if (!completed) { return; } - DCPOMATIC_ASSERT (!jm->get().empty()); - shared_ptr last = dynamic_pointer_cast (jm->get().back()); - DCPOMATIC_ASSERT (last); - - VerifyDCPDialog* d = new VerifyDCPDialog (this, last); + auto d = new VerifyDCPDialog (this, job); d->ShowModal (); d->Destroy (); } @@ -844,16 +871,32 @@ private: _update_news_requested = true; } + void tools_timing () + { + auto d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets()); + d->ShowModal (); + d->Destroy (); + } + + void tools_system_information () + { + if (!_system_information_dialog) { + _system_information_dialog = new SystemInformationDialog (this, _viewer); + } + + _system_information_dialog->Show (); + } + 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); + auto d = new ReportProblemDialog (this); if (d->ShowModal () == wxID_OK) { d->report (); } @@ -862,7 +905,7 @@ private: void update_checker_state_changed () { - UpdateChecker* uc = UpdateChecker::instance (); + auto uc = UpdateChecker::instance (); bool const announce = _update_news_requested || @@ -875,11 +918,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.")); @@ -910,10 +953,10 @@ private: ); } - update_from_config (); + update_from_config (prop); } - void update_from_config () + void update_from_config (Config::Property prop) { for (int i = 0; i < _history_items; ++i) { delete _file_menu->Remove (ID_file_history + i); @@ -923,11 +966,13 @@ private: _file_menu->Remove (_history_separator); } delete _history_separator; - _history_separator = 0; + _history_separator = nullptr; int pos = _history_position; - vector history = Config::instance()->player_history (); + /* Clear out non-existent history items before we re-build the menu */ + Config::instance()->clean_player_history (); + auto history = Config::instance()->player_history (); if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); @@ -944,6 +989,16 @@ private: } _history_items = history.size (); + + if (prop == Config::PLAYER_DEBUG_LOG) { + auto p = Config::instance()->player_debug_log_file(); + if (p) { + dcpomatic_log = make_shared(*p); + } else { + dcpomatic_log = make_shared(); + } + dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW); + } } void set_menu_sensitivity () @@ -951,6 +1006,7 @@ private: _tools_verify->Enable (static_cast(_film)); _file_add_ov->Enable (static_cast(_film)); _file_add_kdm->Enable (static_cast(_film)); + _file_save_frame->Enable (static_cast(_film)); _view_cpl->Enable (static_cast(_film)); } @@ -963,44 +1019,63 @@ private: } } - void back_frame () + void go_back_frame () { _viewer->seek_by (-_viewer->one_video_frame(), true); } - void forward_frame () + void go_forward_frame () { _viewer->seek_by (_viewer->one_video_frame(), true); } -private: + void go_seconds (int s) + { + _viewer->seek_by (DCPTime::from_seconds(s), true); + } + + void go_to_start () + { + _viewer->seek (DCPTime(), true); + } - wxFrame* _dual_screen; - bool _update_news_requested; - PlayerInformation* _info; + void go_to_end () + { + _viewer->seek (_film->length() - _viewer->one_video_frame(), true); + } + + wxFrame* _dual_screen = nullptr; + bool _update_news_requested = false; + PlayerInformation* _info = nullptr; Config::PlayerMode _mode; - wxPreferencesEditor* _config_dialog; - wxPanel* _overall_panel; - wxMenu* _file_menu; - wxMenuItem* _view_cpl; - wxMenu* _cpl_menu; - int _history_items; - int _history_position; - wxMenuItem* _history_separator; + wxPreferencesEditor* _config_dialog = nullptr; + wxPanel* _overall_panel = nullptr; + wxMenu* _file_menu = nullptr; + wxMenuItem* _view_cpl = nullptr; + wxMenu* _cpl_menu = nullptr; + int _history_items = 0; + int _history_position = 0; + wxMenuItem* _history_separator = nullptr; shared_ptr _viewer; Controls* _controls; - boost::shared_ptr _film; + SystemInformationDialog* _system_information_dialog = nullptr; + std::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; - wxMenuItem* _file_add_ov; - wxMenuItem* _file_add_kdm; - wxMenuItem* _tools_verify; - wxMenuItem* _view_full_screen; - wxMenuItem* _view_dual_screen; + boost::signals2::scoped_connection _examine_job_connection; + wxMenuItem* _file_add_ov = nullptr; + wxMenuItem* _file_add_kdm = nullptr; + wxMenuItem* _file_save_frame = nullptr; + wxMenuItem* _tools_verify = nullptr; + wxMenuItem* _view_full_screen = nullptr; + wxMenuItem* _view_dual_screen = nullptr; + wxSizer* _main_sizer = nullptr; + PlayerStressTester _stress; }; static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_PARAM, 0, 0, "DCP to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_OPTION, "c", "config", "Directory containing config.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY }, + { wxCMD_LINE_OPTION, "c", "config", "Directory containing config.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_OPTION, "s", "stress", "File containing description of stress test", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; @@ -1012,7 +1087,7 @@ public: , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); @@ -1038,99 +1113,120 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: - bool OnInit () - try + bool OnInit () override { - wxInitAllImageHandlers (); + wxSplashScreen* splash = nullptr; + try { + wxInitAllImageHandlers (); - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - wxSplashScreen* splash = maybe_show_splash (); + splash = maybe_show_splash (); - SetAppName (_("DCP-o-matic Player")); + SetAppName (_("DCP-o-matic Player")); - if (!wxApp::OnInit()) { - return false; - } + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #endif - dcpomatic_setup_path_encoding (); - - /* Enable i18n; this will create a Config object - to look for a force-configured language. This Config - object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); - - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + signal_manager = new wxSignalManager (this); + + _frame = new DOMFrame (); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = nullptr; + } + _frame->Show (); - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); + try { + auto server = new PlayServer (_frame); + new thread (boost::bind (&PlayServer::run, server)); + } catch (std::exception& e) { + /* This is not the end of the world; probably a failure to bind the server socket + * because there's already another player running. + */ + LOG_DEBUG_PLAYER ("Failed to start play server (%1)", e.what()); + } - signal_manager = new wxSignalManager (this); + if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { + try { + _frame->load_dcp (_dcp_to_load); + } catch (exception& e) { + error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what())); + } + } - _frame = new DOMFrame (); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); - } - _frame->Show (); + if (_stress) { + try { + _frame->load_stress_script (*_stress); + } catch (exception& e) { + error_dialog (0, wxString::Format("Could not load stress test file %s", std_to_wx(*_stress))); + } + } - PlayServer* server = new PlayServer (_frame); - new thread (boost::bind (&PlayServer::run, server)); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { - try { - _frame->load_dcp (_dcp_to_load); - } catch (exception& e) { - error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what())); + if (Config::instance()->check_for_updates ()) { + UpdateChecker::instance()->run (); } } - - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - - if (Config::instance()->check_for_updates ()) { - UpdateChecker::instance()->run (); + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what())); } return true; } - catch (exception& e) - { - error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what())); - return true; - } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { if (parser.GetParamCount() > 0) { _dcp_to_load = wx_to_std (parser.GetParam (0)); @@ -1140,6 +1236,10 @@ private: if (parser.Found("c", &config)) { Config::override_path = wx_to_std (config); } + wxString stress; + if (parser.Found("s", &stress)) { + _stress = wx_to_std (stress); + } return true; } @@ -1171,14 +1271,14 @@ private: } /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { report_exception (); /* This will terminate the program */ return false; } - void OnUnhandledException () + void OnUnhandledException () override { report_exception (); } @@ -1198,8 +1298,9 @@ private: message_dialog (_frame, std_to_wx (m)); } - DOMFrame* _frame; + DOMFrame* _frame = nullptr; string _dcp_to_load; + boost::optional _stress; }; IMPLEMENT_APP (App)