X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=5ce02b1ea1d8e2e2f0b538dac0c20beb417b1c4e;hb=1c73379ed8483dcf71c5ccfc459c2c22516a9aef;hp=7009d17ce652c864c04e8f199c261fe50752febd;hpb=b029cb06c4e0fca1fad9fecd78939efe5532fa9a;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 7009d17ce..5ce02b1ea 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2020 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,93 +18,109 @@ */ -#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" -#ifdef DCPOMATIC_VARIANT_SWAROOP -#include "wx/swaroop_controls.h" -#endif -#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 "lib/cross.h" -#include "lib/config.h" -#include "lib/util.h" -#include "lib/internet.h" -#include "lib/update_checker.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/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/monitor_checker.h" -#include "lib/lock_file_checker.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 -#ifdef __WXOSX__ -#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, @@ -124,36 +140,78 @@ enum { 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: + + 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) -{ - dcpomatic_log.reset (new NullLog()); + /* 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(); #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); @@ -168,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); @@ -186,135 +245,111 @@ 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)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - SwaroopControls* sc = new SwaroopControls (_overall_panel, _viewer); - _controls = sc; - sc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1)); -#else if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { - PlaylistControls* pc = new PlaylistControls (_overall_panel, _viewer); + 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); } -#endif - _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.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__ - int accelerators = 4; + int accelerators = 12; #else - int accelerators = 3; + int accelerators = 11; #endif _stress.setup (this, _controls); - 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); + 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 (); _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - sc->check_restart (); -#endif + SetDropTarget(new DCPDropTarget(this)); } -#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.stop(); } - void lock_checker_state_changed () + void close(wxCloseEvent& ev) { - if (!LockFileChecker::instance()->ok()) { - _viewer->stop (); - error_dialog (this, _("The lock file is not present.")); - } + FontConfig::drop(); + ev.Skip(); } -#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; } } -#ifdef DCPOMATIC_VARIANT_SWAROOP - BOOST_FOREACH (shared_ptr i, _film->content()) { - shared_ptr c = dynamic_pointer_cast(i); - if (c && !c->kdm_timing_window_valid()) { - ok = false; - } - } -#endif - if (!ok) { error_dialog (this, _("The KDM does not allow playback of this content at this time.")); } @@ -322,62 +357,28 @@ 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; - } - - shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); - if (dcp) { - DCPExaminer ex (dcp, true); - 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); - - _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().c_str() - ) - ); - } - - shared_ptr 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) + void too_many_frames_dropped () { -#ifdef DCPOMATIC_VARIANT_SWAROOP - try { - boost::filesystem::remove (Config::path("position")); - } catch (...) { - /* Never mind */ + if (!Config::instance()->nagged(Config::NAG_TOO_MANY_DROPPED_FRAMES)) { + _viewer.stop(); } -#endif - _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) { - _viewer->set_dcp_decode_reduction (reduction); + _viewer.set_dcp_decode_reduction(reduction); _info->triggered_update (); Config::instance()->set_decode_reduction (reduction); } @@ -389,30 +390,42 @@ public: reset_film (); try { _stress.set_suspended (true); - shared_ptr dcp (new DCPContent(dir)); - shared_ptr job (new ExamineContentJob(_film, dcp)); + 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; } -#ifndef DCPOMATIC_VARIANT_SWAROOP Config::instance()->add_to_player_history (dir); -#endif + 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 folder 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())); } } void add_dcp_to_film (weak_ptr weak_job, weak_ptr weak_content) { - shared_ptr job = weak_job.lock (); + auto job = weak_job.lock (); if (!job || !job->finished_ok()) { return; } - shared_ptr content = weak_content.lock (); + auto content = weak_content.lock (); if (!content) { return; } @@ -423,7 +436,7 @@ public: void reset_film_weak (weak_ptr weak_film) { - shared_ptr film = weak_film.lock (); + auto film = weak_film.lock (); if (film) { reset_film (film); } @@ -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 (); @@ -442,26 +455,26 @@ 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; } - if (_viewer->playing ()) { - _viewer->stop (); + if (_viewer.playing()) { + _viewer.stop(); } /* 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); + 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); @@ -469,31 +482,30 @@ 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); } } - _viewer->seek (DCPTime(), true); + _viewer.seek(DCPTime(), true); _info->triggered_update (); 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, true); 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; @@ -509,13 +521,26 @@ public: 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 { - JobManager* jm = JobManager::instance (); + auto jm = JobManager::instance (); DCPOMATIC_ASSERT (!jm->get().empty()); - shared_ptr last = jm->get().back(); + 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; @@ -530,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(); @@ -544,24 +571,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...")); @@ -571,14 +596,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 @@ -597,12 +622,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 = make_wx(this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); int r; while (true) { @@ -619,16 +644,19 @@ private: load_dcp (dcp); Config::instance()->set_last_player_load_directory (dcp.parent_path()); } - - c->Destroy (); } void file_add_ov () { - wxDirDialog* 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 ); @@ -644,70 +672,91 @@ 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); } } } - c->Destroy (); _info->triggered_update (); } void file_add_kdm () { - wxFileDialog* d = new wxFileDialog (this, _("Select KDM")); + auto d = make_wx(this, _("Select KDM")); if (d->ShowModal() == wxID_OK) { DCPOMATIC_ASSERT (_film); -#ifdef DCPOMATIC_VARIANT_SWAROOP - shared_ptr ffmpeg = boost::dynamic_pointer_cast(_film->content().front()); - if (ffmpeg) { - try { - ffmpeg->add_kdm (EncryptedECinemaKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); - } catch (exception& e) { - error_dialog (this, wxString::Format(_("Could not load KDM.")), std_to_wx(e.what())); - d->Destroy(); - return; - } - } -#endif - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); -#ifndef DCPOMATIC_VARIANT_SWAROOP + auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); -#endif 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))); - dcp->examine (_film, shared_ptr()); + 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 (); 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) { - 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 ())) { try { @@ -744,21 +793,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, 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())); - 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 () @@ -799,30 +851,32 @@ 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()) { 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); + _viewer.panel()->Reparent(_overall_panel); _dual_screen->Destroy (); _dual_screen = 0; } @@ -831,30 +885,36 @@ 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 () { - 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 = make_wx(this, _("DCP-o-matic Player")); + bool const completed = progress->run (job); + 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 = make_wx(this, job); d->ShowModal (); - d->Destroy (); } void tools_check_for_updates () @@ -865,9 +925,8 @@ private: void tools_timing () { - TimerDisplay* 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 () @@ -881,23 +940,21 @@ private: void help_about () { - AboutDialog* d = new AboutDialog (this); + auto d = make_wx(this); d->ShowModal (); - d->Destroy (); } void help_report_a_problem () { - ReportProblemDialog* d = new ReportProblemDialog (this); + auto d = make_wx(this); if (d->ShowModal () == wxID_OK) { d->report (); } - d->Destroy (); } void update_checker_state_changed () { - UpdateChecker* uc = UpdateChecker::instance (); + auto uc = UpdateChecker::instance (); bool const announce = _update_news_requested || @@ -910,11 +967,10 @@ private: return; } - if (uc->state() == UpdateChecker::YES) { - UpdateDialog* dialog = new UpdateDialog (this, uc->stable (), uc->test ()); + if (uc->state() == UpdateChecker::State::YES) { + auto dialog = make_wx(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.")); @@ -958,13 +1014,13 @@ private: _file_menu->Remove (_history_separator); } delete _history_separator; - _history_separator = 0; + _history_separator = nullptr; 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 (); - vector history = Config::instance()->player_history (); + auto history = Config::instance()->player_history (); if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); @@ -983,13 +1039,13 @@ private: _history_items = history.size (); if (prop == Config::PLAYER_DEBUG_LOG) { - optional p = Config::instance()->player_debug_log_file(); + auto p = Config::instance()->player_debug_log_file(); if (p) { - dcpomatic_log.reset (new FileLog(*p)); + dcpomatic_log = make_shared(*p); } else { - dcpomatic_log.reset (new NullLog()); + dcpomatic_log = make_shared(); } - dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_PLAYER); + dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW); } } @@ -998,51 +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 back_frame () + void go_back_frame () + { + _viewer.seek_by(-_viewer.one_video_frame(), true); + } + + void go_forward_frame () + { + _viewer.seek_by(_viewer.one_video_frame(), true); + } + + void go_seconds (int s) + { + _viewer.seek_by(DCPTime::from_seconds(s), true); + } + + void go_to_start () { - _viewer->seek_by (-_viewer->one_video_frame(), true); + _viewer.seek(DCPTime(), true); } - void forward_frame () + void go_to_end () { - _viewer->seek_by (_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; - boost::shared_ptr _film; + 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; + 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; }; @@ -1061,7 +1135,7 @@ public: , _frame (frame) {} - void handle (shared_ptr socket) + void handle (shared_ptr socket) override { try { int const length = socket->read_uint32 (); @@ -1087,7 +1161,6 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) { #ifdef DCPOMATIC_LINUX XInitThreads (); @@ -1096,9 +1169,9 @@ public: private: - bool OnInit () + bool OnInit () override { - wxSplashScreen* splash = 0; + wx_ptr splash; try { wxInitAllImageHandlers (); @@ -1117,10 +1190,8 @@ private: unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #endif dcpomatic_setup_path_encoding (); @@ -1150,12 +1221,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 { @@ -1190,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)); @@ -1241,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 (); } @@ -1268,7 +1346,7 @@ private: message_dialog (_frame, std_to_wx (m)); } - DOMFrame* _frame; + DOMFrame* _frame = nullptr; string _dcp_to_load; boost::optional _stress; };