X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=46dead8506200edf4cbf44c421de2f7b2ce8a4b5;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=6e1104b66eba5767910eb8f7069a799100096ee2;hpb=06330bc1cb426a6d40697057fb7d744381892a36;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 6e1104b66..46dead850 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -18,67 +18,75 @@ */ -#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 "lib/cross.h" -#include "lib/config.h" -#include "lib/util.h" -#include "lib/internet.h" -#include "lib/update_checker.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/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/internet.h" +#include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/null_log.h" +#include "lib/ratio.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 #include -#include #include -#include -#include -#include +#include +#include +#include +LIBDCP_DISABLE_WARNINGS #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; @@ -88,16 +96,17 @@ 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, @@ -137,20 +146,9 @@ 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) - , _system_information_dialog (0) - , _view_full_screen (0) - , _view_dual_screen (0) - , _main_sizer (new wxBoxSizer (wxVERTICAL)) + , _main_sizer (new wxBoxSizer(wxVERTICAL)) { dcpomatic_log = make_shared(); @@ -197,7 +195,7 @@ public: */ _overall_panel = new wxPanel (this, wxID_ANY); - _viewer.reset (new FilmViewer (_overall_panel)); + _viewer = make_shared(_overall_panel); if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { auto pc = new PlaylistControls (_overall_panel, _viewer); _controls = pc; @@ -206,9 +204,9 @@ public: _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->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__ @@ -252,12 +250,20 @@ 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)); } + ~DOMFrame () + { + /* 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 setup_main_sizer (Config::PlayerMode mode) { _main_sizer->Detach (_viewer->panel()); @@ -293,49 +299,23 @@ 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 too_many_frames_dropped () + { + if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { + _viewer->stop (); } - } - void playback_stopped (DCPTime time) - { - _controls->log (wxString::Format("playback-stopped %s", time.timecode(_film->video_frame_rate()).c_str())); + 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) @@ -352,6 +332,7 @@ 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))); @@ -361,6 +342,15 @@ public: return; } Config::instance()->add_to_player_history (dir); + } 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) { @@ -451,9 +441,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()) @@ -651,8 +640,10 @@ private: DCPOMATIC_ASSERT (dcp); try { 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())); @@ -706,19 +697,21 @@ 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); dcp->set_cpl ((*i)->id()); examine_content (); + _viewer->set_coalesce_player_changes (false); + _info->triggered_update (); } @@ -868,11 +861,11 @@ private: return; } - if (uc->state() == UpdateChecker::YES) { + 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.")); @@ -993,30 +986,30 @@ private: _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; + 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; - 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* _tools_verify = nullptr; + wxMenuItem* _view_full_screen = nullptr; + wxMenuItem* _view_dual_screen = nullptr; + wxSizer* _main_sizer = nullptr; PlayerStressTester _stress; }; @@ -1035,7 +1028,7 @@ public: , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); @@ -1061,7 +1054,6 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) { #ifdef DCPOMATIC_LINUX XInitThreads (); @@ -1070,9 +1062,9 @@ public: private: - bool OnInit () + bool OnInit () override { - wxSplashScreen* splash = 0; + wxSplashScreen* splash = nullptr; try { wxInitAllImageHandlers (); @@ -1122,12 +1114,19 @@ private: _frame->Maximize (); if (splash) { splash->Destroy (); - splash = 0; + splash = nullptr; } _frame->Show (); - PlayServer* server = new PlayServer (_frame); - new thread (boost::bind (&PlayServer::run, server)); + 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()); + } if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { try { @@ -1162,13 +1161,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)); @@ -1213,14 +1212,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 (); } @@ -1240,7 +1239,7 @@ private: message_dialog (_frame, std_to_wx (m)); } - DOMFrame* _frame; + DOMFrame* _frame = nullptr; string _dcp_to_load; boost::optional _stress; };