X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=ab018c44b9b60d18ee2d3608999fc1eafd194f05;hb=3a1ddb9e182be28a22c5bbc85c06ee6629b72fe6;hp=d97bdd168edea4052da1a2ca1ec96b076566fefe;hpb=6f23f3ff80fbd73cdaf183ce8bbdeeea0007ad6b;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index d97bdd168..ab018c44b 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -32,10 +32,12 @@ #include "wx/update_dialog.h" #include "wx/verify_dcp_dialog.h" #include "wx/verify_dcp_progress_dialog.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/dcp_examiner.h" @@ -45,6 +47,7 @@ #include "lib/ffmpeg_content.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" @@ -55,11 +58,11 @@ #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/util.h" #include "lib/verify_dcp_job.h" #include "lib/video_content.h" #include @@ -194,6 +197,11 @@ public: DOMFrame () : wxFrame (nullptr, -1, _("DCP-o-matic Player")) , _mode (Config::instance()->player_mode()) + /* 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(); @@ -237,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 = make_shared(_overall_panel); if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { auto pc = new PlaylistControls (_overall_panel, _viewer); _controls = pc; @@ -250,10 +254,10 @@ public: } 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->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__ @@ -309,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); @@ -351,7 +361,7 @@ public: void too_many_frames_dropped () { if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { - _viewer->stop (); + _viewer.stop(); } NagDialog::maybe_nag ( @@ -368,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); } @@ -389,6 +399,9 @@ 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, @@ -434,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 (); @@ -446,8 +459,8 @@ public: return; } - if (_viewer->playing ()) { - _viewer->stop (); + if (_viewer.playing()) { + _viewer.stop(); } /* Start off as Flat */ @@ -474,7 +487,7 @@ public: } } - _viewer->seek (DCPTime(), true); + _viewer.seek(DCPTime(), true); _info->triggered_update (); set_menu_sensitivity (); @@ -614,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) { @@ -631,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 ); @@ -675,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); @@ -689,25 +704,23 @@ 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); + 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; } @@ -715,7 +728,7 @@ private: auto path = boost::filesystem::path (wx_to_std(dialog.GetPath())); auto player = make_shared(_film, Image::Alignment::PADDED); - player->seek (_viewer->position(), true); + player->seek(_viewer.position(), true); bool done = false; player->Video.connect ([path, &done, this](shared_ptr video, DCPTime) { @@ -792,10 +805,10 @@ private: --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 (); } @@ -838,14 +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()->SetFocus(); + _viewer.panel()->Reparent(_dual_screen); + _viewer.panel()->SetFocus(); _dual_screen->Show (); if (wxDisplay::GetCount() > 1) { switch (Config::instance()->image_display()) { @@ -863,7 +876,7 @@ private: _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; } @@ -885,7 +898,7 @@ private: void view_closed_captions () { - _viewer->show_closed_captions (); + _viewer.show_closed_captions(); } void tools_verify () @@ -894,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 () @@ -914,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 () @@ -930,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 () @@ -960,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 { @@ -1053,36 +1060,36 @@ private: 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 = nullptr; @@ -1097,7 +1104,7 @@ private: int _history_items = 0; int _history_position = 0; wxMenuItem* _history_separator = nullptr; - shared_ptr _viewer; + FilmViewer _viewer; Controls* _controls; SystemInformationDialog* _system_information_dialog = nullptr; std::shared_ptr _film; @@ -1164,7 +1171,7 @@ private: bool OnInit () override { - wxSplashScreen* splash = nullptr; + wxSplashScreen* splash; try { wxInitAllImageHandlers ();