X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=a68cc074ae61a8d7baf83cf35ec5b008b4429025;hb=a115088ca904a26d100e479a7fde21c9235bf7c9;hp=1b2b98729ddd789187a144d8bf51aab0dd0af40f;hpb=00fa987750d18ad8f0439bd8a4d940e2852854c3;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 1b2b98729..a68cc074a 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -19,7 +19,9 @@ */ #include "wx/about_dialog.h" +#include "wx/file_dialog.h" #include "wx/film_viewer.h" +#include "wx/id.h" #include "wx/nag_dialog.h" #include "wx/player_config_dialog.h" #include "wx/player_information.h" @@ -32,6 +34,7 @@ #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" @@ -46,6 +49,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" @@ -56,7 +60,6 @@ #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" @@ -66,7 +69,9 @@ #include #include #include +#include #include +#include #include #include LIBDCP_DISABLE_WARNINGS @@ -115,16 +120,16 @@ using namespace dcpomatic; enum { - ID_file_open = 1, + ID_file_open = DCPOMATIC_MAIN_MENU, 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, + ID_file_close = DCPOMATIC_MAIN_MENU + 100, ID_view_cpl, /* Allow spare IDs for CPLs */ - ID_view_full_screen = 200, + ID_view_full_screen = DCPOMATIC_MAIN_MENU + 200, ID_view_dual_screen, ID_view_closed_captions, ID_view_scale_appropriate, @@ -167,7 +172,7 @@ public: 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)) { + if (dcp::filesystem::is_directory(path)) { _frame->load_dcp(wx_to_std(filenames[0])); return true; } @@ -243,6 +248,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); + Bind(wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1)); + if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { auto pc = new PlaylistControls (_overall_panel, _viewer); _controls = pc; @@ -250,6 +257,7 @@ public: } else { _controls = new StandardControls (_overall_panel, _viewer, false); } + _controls->set_film(_viewer.film()); _viewer.set_dcp_decode_reduction(Config::instance()->decode_reduction()); _viewer.set_optimise_for_j2k(true); _viewer.PlaybackPermitted.connect(bind(&DOMFrame::playback_permitted, this)); @@ -312,6 +320,12 @@ public: _viewer.stop(); } + void close(wxCloseEvent& ev) + { + FontConfig::drop(); + ev.Skip(); + } + void setup_main_sizer (Config::PlayerMode mode) { _main_sizer->Detach(_viewer.panel()); @@ -443,9 +457,9 @@ public: _info->triggered_update (); } - void film_changed (ChangeType type, Film::Property property) + void film_changed (ChangeType type, FilmProperty property) { - if (type != ChangeType::DONE || property != Film::Property::CONTENT) { + if (type != ChangeType::DONE || property != FilmProperty::CONTENT) { return; } @@ -463,8 +477,8 @@ public: j->set_use (true); } - if (i->video) { - auto const r = Ratio::nearest_from_ratio(i->video->size().ratio()); + if (i->video && i->video->size()) { + 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); @@ -561,7 +575,7 @@ private: #endif #ifdef __WXOSX__ - auto prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + auto prefs = _file_menu->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,")); #else auto edit = new wxMenu; auto prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); @@ -602,12 +616,14 @@ private: help->Append (ID_help_report_a_problem, _("Report a problem...")); m->Append (_file_menu, _("&File")); + if (!Config::instance()->player_restricted_menus()) { #ifndef __WXOSX__ - m->Append (edit, _("&Edit")); + m->Append (edit, _("&Edit")); #endif - m->Append (view, _("&View")); - m->Append (tools, _("&Tools")); - m->Append (help, _("&Help")); + m->Append (view, _("&View")); + m->Append (tools, _("&Tools")); + m->Append (help, _("&Help")); + } } void file_open () @@ -617,8 +633,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); - ScopeGuard sg = [c]() { c->Destroy(); }; + auto c = make_wx(this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); int r; while (true) { @@ -644,13 +659,12 @@ private: initial_dir = std_to_wx(Config::instance()->last_player_load_directory()->string()); } - auto c = new wxDirDialog ( + auto c = make_wx( this, _("Select DCP to open as OV"), initial_dir, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); - ScopeGuard sg = [c]() { c->Destroy(); }; int r; while (true) { @@ -675,8 +689,8 @@ private: for (auto i: dcp->text) { i->set_use (true); } - if (dcp->video) { - auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + if (dcp->video && dcp->video->size()) { + auto const r = Ratio::nearest_from_ratio(dcp->video->size()->ratio()); if (r) { _film->set_container(r); } @@ -688,19 +702,23 @@ private: void file_add_kdm () { - auto d = new wxFileDialog (this, _("Select KDM")); - ScopeGuard sg = [d]() { d->Destroy(); }; + FileDialog dialog(this, _("Select KDM"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddKDMPath"); - if (d->ShowModal() == wxID_OK) { + if (dialog.show()) { DCPOMATIC_ASSERT (_film); auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); try { if (dcp) { + dcp::ScopeGuard sg([this]() { + _viewer.set_coalesce_player_changes(false); + }); _viewer.set_coalesce_player_changes(true); - dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); + for (auto path: dialog.paths()) { + dcp->add_kdm(dcp::EncryptedKDM(dcp::file_to_string(path))); + _kdms.push_back(path); + } 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())); @@ -713,7 +731,7 @@ private: 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; } @@ -853,18 +871,27 @@ private: _viewer.panel()->Reparent(_dual_screen); _viewer.panel()->SetFocus(); _dual_screen->Show (); + LOG_DEBUG_PLAYER("Setting up dual screen mode with %1 displays", wxDisplay::GetCount()); + for (auto index = 0U; index < wxDisplay::GetCount(); ++index) { + wxDisplay display(index); + auto client = display.GetClientArea(); + auto mode = display.GetCurrentMode(); + auto geometry = display.GetGeometry(); + LOG_DEBUG_PLAYER("Display %1", index); + LOG_DEBUG_PLAYER(" ClientArea position=(%1, %2) size=(%3, %4)", client.GetX(), client.GetY(), client.GetWidth(), client.GetHeight()); + LOG_DEBUG_PLAYER(" Geometry position=(%1, %2) size=(%3, %4)", geometry.GetX(), geometry.GetY(), geometry.GetWidth(), geometry.GetHeight()); + LOG_DEBUG_PLAYER(" Mode size=(%1, %2)", mode.GetWidth(), mode.GetHeight()); + LOG_DEBUG_PLAYER(" Primary? %1", static_cast(display.IsPrimary())); + } if (wxDisplay::GetCount() > 1) { - switch (Config::instance()->image_display()) { - case 0: - _dual_screen->Move (0, 0); - Move (wxDisplay(0U).GetClientArea().GetWidth(), 0); - break; - case 1: - _dual_screen->Move (wxDisplay(0U).GetClientArea().GetWidth(), 0); - // (0, 0) doesn't seem to work for some strange reason - Move (8, 8); - break; - } + wxRect geometry[2] = { + wxDisplay(0U).GetGeometry(), + wxDisplay(1U).GetGeometry() + }; + auto const image_display = Config::instance()->image_display(); + _dual_screen->Move(geometry[image_display].GetX(), geometry[image_display].GetY()); + _viewer.panel()->SetSize(geometry[image_display].GetWidth(), geometry[image_display].GetHeight()); + Move(geometry[1 - image_display].GetX(), geometry[1 - image_display].GetY()); } _dual_screen->Bind(wxEVT_CHAR_HOOK, boost::bind(&DOMFrame::dual_screen_key_press, this, _1)); } else { @@ -899,17 +926,15 @@ private: auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - auto job = make_shared(dcp->directories()); - auto progress = new VerifyDCPProgressDialog(this, _("DCP-o-matic Player")); - bool const completed = progress->run (job); - progress->Destroy (); - if (!completed) { - return; - } + auto job = make_shared(dcp->directories(), _kdms); + VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player")); + bool const completed = progress.run(job); + progress.Close(); - auto d = new VerifyDCPDialog (this, job); - d->ShowModal (); - d->Destroy (); + if (completed) { + VerifyDCPDialog dialog(this, job); + dialog.ShowModal(); + } } void tools_check_for_updates () @@ -920,9 +945,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 () @@ -936,18 +960,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 () @@ -966,9 +988,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 { @@ -1117,6 +1138,8 @@ private: wxMenuItem* _view_dual_screen = nullptr; wxSizer* _main_sizer = nullptr; PlayerStressTester _stress; + /** KDMs that have been loaded, so that we can pass them to the verifier */ + std::vector _kdms; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -1137,7 +1160,10 @@ public: void handle (shared_ptr socket) override { try { - int const length = socket->read_uint32 (); + uint32_t const length = socket->read_uint32 (); + if (length > 65536) { + return; + } scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); string s (buffer.get()); @@ -1170,7 +1196,7 @@ private: bool OnInit () override { - wxSplashScreen* splash = nullptr; + wxSplashScreen* splash; try { wxInitAllImageHandlers (); @@ -1234,7 +1260,7 @@ private: LOG_DEBUG_PLAYER ("Failed to start play server (%1)", e.what()); } - if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { + if (!_dcp_to_load.empty() && dcp::filesystem::is_directory(_dcp_to_load)) { try { _frame->load_dcp (_dcp_to_load); } catch (exception& e) {