X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=ab018c44b9b60d18ee2d3608999fc1eafd194f05;hb=3a1ddb9e182be28a22c5bbc85c06ee6629b72fe6;hp=7181ad12968b7de52d1ece39ea0e105891bfe669;hpb=03e0b16f47542996b1a711df265bf3dd4fbebdad;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 7181ad129..ab018c44b 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -18,69 +18,84 @@ */ -#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/player_information.h" -#include "wx/update_dialog.h" +#include "wx/nag_dialog.h" #include "wx/player_config_dialog.h" -#include "wx/verify_dcp_dialog.h" -#include "wx/standard_controls.h" +#include "wx/player_information.h" +#include "wx/player_stress_tester.h" #include "wx/playlist_controls.h" -#include "wx/timer_display.h" +#include "wx/report_problem_dialog.h" +#include "wx/standard_controls.h" #include "wx/system_information_dialog.h" -#include "wx/player_stress_tester.h" +#include "wx/timer_display.h" +#include "wx/update_dialog.h" +#include "wx/verify_dcp_dialog.h" #include "wx/verify_dcp_progress_dialog.h" -#include "wx/nag_dialog.h" -#include "lib/cross.h" -#include "lib/config.h" -#include "lib/util.h" -#include "lib/internet.h" -#include "lib/update_checker.h" +#include "wx/wx_ptr.h" +#include "wx/wx_signal_manager.h" +#include "wx/wx_util.h" #include "lib/compose.hpp" +#include "lib/config.h" +#include "lib/constants.h" +#include "lib/cross.h" #include "lib/dcp_content.h" -#include "lib/job_manager.h" -#include "lib/job.h" -#include "lib/film.h" -#include "lib/null_log.h" -#include "lib/video_content.h" -#include "lib/text_content.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_log.h" #include "lib/dcpomatic_socket.h" -#include "lib/scoped_temporary.h" +#include "lib/examine_content_job.h" #include "lib/ffmpeg_content.h" -#include "lib/dcpomatic_log.h" #include "lib/file_log.h" +#include "lib/film.h" +#include "lib/font_config.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/player.h" +#include "lib/player_video.h" +#include "lib/ratio.h" +#include "lib/scope_guard.h" +#include "lib/scoped_temporary.h" +#include "lib/server.h" +#include "lib/text_content.h" +#include "lib/update_checker.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 -#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::cout; using std::dynamic_pointer_cast; using std::exception; @@ -90,20 +105,22 @@ using std::shared_ptr; using std::string; using std::vector; using std::weak_ptr; -using boost::scoped_array; +using boost::bind; using boost::optional; +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, @@ -135,24 +152,57 @@ enum { ID_go_to_end }; + class DOMFrame : public wxFrame { public: + + class DCPDropTarget : public wxFileDropTarget + { + public: + DCPDropTarget(DOMFrame* owner) + : _frame(owner) + {} + + bool OnDropFiles(wxCoord, wxCoord, wxArrayString const& filenames) override + { + if (filenames.GetCount() == 1) { + /* Try to load a directory */ + auto path = boost::filesystem::path(wx_to_std(filenames[0])); + if (boost::filesystem::is_directory(path)) { + _frame->load_dcp(wx_to_std(filenames[0])); + return true; + } + } + + if (filenames.GetCount() >= 1) { + /* Try to load the parent if we drop some files, one if which is an asset map */ + for (size_t i = 0; i < filenames.GetCount(); ++i) { + auto path = boost::filesystem::path(wx_to_std(filenames[i])); + if (path.filename() == "ASSETMAP" || path.filename() == "ASSETMAP.xml") { + _frame->load_dcp(path.parent_path()); + return true; + } + } + } + + return false; + } + + private: + DOMFrame* _frame; + }; + + 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) - , _system_information_dialog (0) - , _view_full_screen (0) - , _view_dual_screen (0) - , _main_sizer (new wxBoxSizer (wxVERTICAL)) + /* 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(_overall_panel) + , _main_sizer (new wxBoxSizer(wxVERTICAL)) { dcpomatic_log = make_shared(); @@ -176,6 +226,7 @@ public: 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); @@ -194,12 +245,8 @@ public: 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); + Bind(wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1)); - _viewer.reset (new FilmViewer (_overall_panel)); if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { auto pc = new PlaylistControls (_overall_panel, _viewer); _controls = pc; @@ -207,11 +254,10 @@ public: } else { _controls = new StandardControls (_overall_panel, _viewer, false); } - _viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ()); - _viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this)); - _viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1)); - _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1)); - _viewer->TooManyDropped.connect (bind(&DOMFrame::too_many_frames_dropped, this)); + _viewer.set_dcp_decode_reduction(Config::instance()->decode_reduction()); + _viewer.set_optimise_for_j2k(true); + _viewer.PlaybackPermitted.connect(bind(&DOMFrame::playback_permitted, this)); + _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__ @@ -222,7 +268,7 @@ public: _stress.setup (this, _controls); - wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators]; + 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); @@ -237,9 +283,8 @@ public: #ifdef __WXOSX__ 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::go_back_frame, this), ID_go_back_frame); @@ -255,10 +300,12 @@ public: reset_film (); - UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); + UpdateChecker::instance()->StateChanged.connect (boost::bind(&DOMFrame::update_checker_state_changed, this)); setup_screen (); _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); + + SetDropTarget(new DCPDropTarget(this)); } ~DOMFrame () @@ -266,16 +313,22 @@ public: /* 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 (); + _viewer.stop(); + } + + void close(wxCloseEvent& ev) + { + FontConfig::drop(); + ev.Skip(); } void setup_main_sizer (Config::PlayerMode mode) { - _main_sizer->Detach (_viewer->panel()); + _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); + _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); @@ -304,56 +357,11 @@ public: return ok; } - void playback_started (DCPTime time) - { - /* XXX: this only logs the first piece of content; probably should be each piece? */ - if (_film->content().empty()) { - return; - } - - auto dcp = dynamic_pointer_cast(_film->content().front()); - if (dcp) { - DCPExaminer ex (dcp, true); - shared_ptr playing_cpl; - for (auto i: ex.cpls()) { - if (!dcp->cpl() || i->id() == *dcp->cpl()) { - playing_cpl = i; - } - } - DCPOMATIC_ASSERT (playing_cpl); - - _controls->log ( - wxString::Format( - "playback-started %s %s %s", - time.timecode(_film->video_frame_rate()).c_str(), - dcp->directories().front().string().c_str(), - playing_cpl->annotation_text().get_value_or("").c_str() - ) - ); - } - - auto ffmpeg = dynamic_pointer_cast(_film->content().front()); - if (ffmpeg) { - _controls->log ( - wxString::Format( - "playback-started %s %s", - time.timecode(_film->video_frame_rate()).c_str(), - ffmpeg->path(0).string().c_str() - ) - ); - } - } - - void playback_stopped (DCPTime time) - { - _controls->log (wxString::Format("playback-stopped %s", time.timecode(_film->video_frame_rate()).c_str())); - } - void too_many_frames_dropped () { if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { - _viewer->stop (); + _viewer.stop(); } NagDialog::maybe_nag ( @@ -370,7 +378,7 @@ public: void set_decode_reduction (optional reduction) { - _viewer->set_dcp_decode_reduction (reduction); + _viewer.set_dcp_decode_reduction(reduction); _info->triggered_update (); Config::instance()->set_decode_reduction (reduction); } @@ -382,7 +390,6 @@ public: reset_film (); try { _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))); @@ -392,13 +399,16 @@ public: return; } Config::instance()->add_to_player_history (dir); + if (dcp->video_frame_rate()) { + _film->set_video_frame_rate(dcp->video_frame_rate().get(), true); + } } 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." + "Choose the DCP folder inside the DCP-o-matic project folder if that's what you want to play." ) ); } catch (dcp::ReadError& e) { @@ -437,7 +447,7 @@ public: _film = film; _film->set_tolerant (true); _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS); - _viewer->set_film (_film); + _viewer.set_film(_film); _controls->set_film (_film); _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); _info->triggered_update (); @@ -449,8 +459,8 @@ public: return; } - if (_viewer->playing ()) { - _viewer->stop (); + if (_viewer.playing()) { + _viewer.stop(); } /* Start off as Flat */ @@ -477,7 +487,7 @@ public: } } - _viewer->seek (DCPTime(), true); + _viewer.seek(DCPTime(), true); _info->triggered_update (); set_menu_sensitivity (); @@ -491,9 +501,8 @@ public: /* Offer a CPL menu */ auto first = dynamic_pointer_cast(_film->content().front()); if (first) { - DCPExaminer ex (first, true); int id = ID_view_cpl; - for (auto i: ex.cpls()) { + 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().get_value_or("")).data(), std_to_wx(i->id()).data()) @@ -546,6 +555,8 @@ private: _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_menu->AppendSeparator (); + _file_save_frame = _file_menu->Append (ID_file_save_frame, _("&Save frame to file...\tCtrl-S")); _history_position = _file_menu->GetMenuItems().GetCount(); @@ -616,7 +627,7 @@ private: d = std_to_wx (Config::instance()->last_player_load_directory()->string()); } - auto c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + auto c = make_wx(this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); int r; while (true) { @@ -633,16 +644,19 @@ private: load_dcp (dcp); Config::instance()->set_last_player_load_directory (dcp.parent_path()); } - - c->Destroy (); } void file_add_ov () { - auto c = new wxDirDialog ( + auto initial_dir = wxStandardPaths::Get().GetDocumentsDir(); + if (Config::instance()->last_player_load_directory()) { + initial_dir = std_to_wx(Config::instance()->last_player_load_directory()->string()); + } + + auto c = make_wx( this, _("Select DCP to open as OV"), - wxStandardPaths::Get().GetDocumentsDir(), + initial_dir, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); @@ -677,13 +691,12 @@ private: } } - c->Destroy (); _info->triggered_update (); } void file_add_kdm () { - auto d = new wxFileDialog (this, _("Select KDM")); + auto d = make_wx(this, _("Select KDM")); if (d->ShowModal() == wxID_OK) { DCPOMATIC_ASSERT (_film); @@ -691,22 +704,56 @@ private: DCPOMATIC_ASSERT (dcp); try { if (dcp) { - _viewer->set_coalesce_player_changes (true); + _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); + _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 (); return; } } - d->Destroy (); _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) { auto history = Config::instance()->player_history (); @@ -748,21 +795,20 @@ private: { auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp, true); + 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())); - auto cpls = ex.cpls(); + DCPOMATIC_ASSERT (id < int(cpls.size())); auto i = cpls.begin(); while (id > 0) { ++i; --id; } - _viewer->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); dcp->set_cpl ((*i)->id()); examine_content (); - _viewer->set_coalesce_player_changes (false); + _viewer.set_coalesce_player_changes(false); _info->triggered_update (); } @@ -805,13 +851,14 @@ private: _info->Show (_mode != Config::PLAYER_MODE_FULL); _overall_panel->SetBackgroundColour (_mode == Config::PLAYER_MODE_FULL ? wxColour(0, 0, 0) : wxNullColour); ShowFullScreen (_mode == Config::PLAYER_MODE_FULL); - _viewer->set_pad_black (_mode != Config::PLAYER_MODE_WINDOW); + _viewer.set_pad_black(_mode != Config::PLAYER_MODE_WINDOW); if (_mode == Config::PLAYER_MODE_DUAL) { _dual_screen = new wxFrame (this, wxID_ANY, wxT("")); _dual_screen->SetBackgroundColour (wxColour(0, 0, 0)); _dual_screen->ShowFullScreen (true); - _viewer->panel()->Reparent (_dual_screen); + _viewer.panel()->Reparent(_dual_screen); + _viewer.panel()->SetFocus(); _dual_screen->Show (); if (wxDisplay::GetCount() > 1) { switch (Config::instance()->image_display()) { @@ -826,9 +873,10 @@ private: 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); + _viewer.panel()->Reparent(_overall_panel); _dual_screen->Destroy (); _dual_screen = 0; } @@ -837,9 +885,20 @@ 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 (); + _viewer.show_closed_captions(); } void tools_verify () @@ -848,16 +907,14 @@ private: DCPOMATIC_ASSERT (dcp); auto job = make_shared(dcp->directories()); - auto progress = new VerifyDCPProgressDialog(this, _("DCP-o-matic Player")); + auto progress = make_wx(this, _("DCP-o-matic Player")); bool const completed = progress->run (job); - progress->Destroy (); if (!completed) { return; } - auto d = new VerifyDCPDialog (this, job); + auto d = make_wx(this, job); d->ShowModal (); - d->Destroy (); } void tools_check_for_updates () @@ -868,9 +925,8 @@ private: void tools_timing () { - auto d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets()); + auto d = make_wx(this, _viewer.state_timer(), _viewer.gets()); d->ShowModal (); - d->Destroy (); } void tools_system_information () @@ -884,18 +940,16 @@ private: void help_about () { - auto d = new AboutDialog (this); + auto d = make_wx(this); d->ShowModal (); - d->Destroy (); } void help_report_a_problem () { - auto d = new ReportProblemDialog (this); + auto d = make_wx(this); if (d->ShowModal () == wxID_OK) { d->report (); } - d->Destroy (); } void update_checker_state_changed () @@ -914,9 +968,8 @@ private: } if (uc->state() == UpdateChecker::State::YES) { - auto dialog = new UpdateDialog (this, uc->stable (), uc->test ()); + auto dialog = make_wx(this, uc->stable (), uc->test ()); dialog->ShowModal (); - dialog->Destroy (); } else if (uc->state() == UpdateChecker::State::FAILED) { error_dialog (this, _("The DCP-o-matic download server could not be contacted.")); } else { @@ -965,7 +1018,7 @@ private: int pos = _history_position; - /* Clear out non-existant history items before we re-build the menu */ + /* Clear out non-existent history items before we re-build the menu */ Config::instance()->clean_player_history (); auto history = Config::instance()->player_history (); @@ -1001,67 +1054,69 @@ 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)); } void start_stop_pressed () { - if (_viewer->playing()) { - _viewer->stop(); + if (_viewer.playing()) { + _viewer.stop(); } else { - _viewer->start(); + _viewer.start(); } } void go_back_frame () { - _viewer->seek_by (-_viewer->one_video_frame(), true); + _viewer.seek_by(-_viewer.one_video_frame(), true); } void go_forward_frame () { - _viewer->seek_by (_viewer->one_video_frame(), true); + _viewer.seek_by(_viewer.one_video_frame(), true); } void go_seconds (int s) { - _viewer->seek_by (DCPTime::from_seconds(s), true); + _viewer.seek_by(DCPTime::from_seconds(s), true); } void go_to_start () { - _viewer->seek (DCPTime(), true); + _viewer.seek(DCPTime(), true); } void go_to_end () { - _viewer->seek (_film->length() - _viewer->one_video_frame(), true); + _viewer.seek(_film->length() - _viewer.one_video_frame(), true); } - wxFrame* _dual_screen; - bool _update_news_requested; - PlayerInformation* _info; + 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; - shared_ptr _viewer; + 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; + FilmViewer _viewer; Controls* _controls; - SystemInformationDialog* _system_information_dialog; + SystemInformationDialog* _system_information_dialog = nullptr; std::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; boost::signals2::scoped_connection _examine_job_connection; - wxMenuItem* _file_add_ov; - wxMenuItem* _file_add_kdm; - wxMenuItem* _tools_verify; - wxMenuItem* _view_full_screen; - wxMenuItem* _view_dual_screen; - wxSizer* _main_sizer; + 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; }; @@ -1080,7 +1135,7 @@ public: , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); @@ -1106,7 +1161,6 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) { #ifdef DCPOMATIC_LINUX XInitThreads (); @@ -1115,9 +1169,9 @@ public: private: - bool OnInit () + bool OnInit () override { - wxSplashScreen* splash = 0; + wxSplashScreen* splash; try { wxInitAllImageHandlers (); @@ -1167,7 +1221,7 @@ private: _frame->Maximize (); if (splash) { splash->Destroy (); - splash = 0; + splash = nullptr; } _frame->Show (); @@ -1214,13 +1268,13 @@ private: 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)); @@ -1265,14 +1319,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 (); } @@ -1292,7 +1346,7 @@ private: message_dialog (_frame, std_to_wx (m)); } - DOMFrame* _frame; + DOMFrame* _frame = nullptr; string _dcp_to_load; boost::optional _stress; };