X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=1ab83a23079436e9d9323a84aadc65f18f3f4414;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=e409b97311be1fa5c78a5952d6d5a20c51a2102b;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index e409b9731..1ab83a230 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -18,69 +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 "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_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 "lib/warnings.h" #include #include #include #include -#include -#include -#include +#include +DCPOMATIC_DISABLE_WARNINGS #include +#include #include #include -#include +#include +#include +#include +DCPOMATIC_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,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, @@ -199,8 +206,6 @@ public: _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()); @@ -294,51 +299,6 @@ 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 () { @@ -481,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()) @@ -738,11 +697,10 @@ 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; @@ -1070,7 +1028,7 @@ public: , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); @@ -1104,7 +1062,7 @@ public: private: - bool OnInit () + bool OnInit () override { wxSplashScreen* splash = nullptr; try { @@ -1203,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)); @@ -1254,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 (); }