X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=a73fa4d304da174cfd7fc049c4f6c771ac826cfb;hp=dfe20ea644c598dfce4e885585b8a80a29380cbf;hb=ff623a7f045575169820b28a9e1d4ee10ec2fb69;hpb=c4f83cc70c38fc9aa887bbf54b48a21bd0c9881a diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index dfe20ea64..a73fa4d30 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2019 Carl Hetherington + Copyright (C) 2017-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -28,9 +28,13 @@ #include "wx/player_config_dialog.h" #include "wx/verify_dcp_dialog.h" #include "wx/standard_controls.h" +#include "wx/playlist_controls.h" +#ifdef DCPOMATIC_VARIANT_SWAROOP #include "wx/swaroop_controls.h" +#endif #include "wx/timer_display.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" @@ -66,10 +70,11 @@ #include #include #include -#ifdef __WXOSX__ -#include +#ifdef __WXGTK__ +#include #endif #include +#include #include #ifdef check @@ -90,6 +95,7 @@ using boost::optional; using boost::dynamic_pointer_cast; using boost::thread; using boost::bind; +using dcp::raw_convert; using namespace dcpomatic; enum { @@ -115,8 +121,16 @@ 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 @@ -136,7 +150,8 @@ public: , _system_information_dialog (0) , _view_full_screen (0) , _view_dual_screen (0) - { + , _main_sizer (new wxBoxSizer (wxVERTICAL)) +{ dcpomatic_log.reset (new NullLog()); #if defined(DCPOMATIC_WINDOWS) @@ -188,7 +203,13 @@ public: _controls = sc; sc->ResetFilm.connect (bind(&DOMFrame::reset_film_weak, this, _1)); #else - _controls = new StandardControls (_overall_panel, _viewer, false); + if (Config::instance()->player_mode() == Config::PLAYER_MODE_DUAL) { + PlaylistControls* 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)); @@ -197,25 +218,43 @@ public: _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); + 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); 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 (); @@ -228,6 +267,8 @@ public: #endif setup_screen (); + _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); + #ifdef DCPOMATIC_VARIANT_SWAROOP sc->check_restart (); #endif @@ -253,13 +294,15 @@ public: 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 (); } @@ -369,8 +412,11 @@ public: reset_film (); try { + _stress.set_suspended (true); shared_ptr dcp (new DCPContent(dir)); - _film->examine_and_add_content (dcp, true); + shared_ptr job (new ExamineContentJob(_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; @@ -378,9 +424,27 @@ public: #ifndef DCPOMATIC_VARIANT_SWAROOP Config::instance()->add_to_player_history (dir); #endif - } catch (dcp::DCPReadError& e) { + } 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 (); + if (!job || !job->finished_ok()) { + return; } + + shared_ptr content = weak_content.lock (); + if (!content) { + return; + } + + _film->add_content (content); + _stress.set_suspended (false); } void reset_film_weak (weak_ptr weak_film) @@ -395,6 +459,7 @@ public: { _film = film; _film->set_tolerant (true); + _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS); _viewer->set_film (_film); _controls->set_film (_film); _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); @@ -463,6 +528,11 @@ public: } } + void load_stress_script (boost::filesystem::path path) + { + _stress.load_script (path); + } + private: bool report_errors_from_last_job (wxWindow* parent) const @@ -767,10 +837,10 @@ private: 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; @@ -945,7 +1015,7 @@ private: } else { dcpomatic_log.reset (new NullLog()); } - 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); } } @@ -966,17 +1036,30 @@ private: } } - void back_frame () + void go_back_frame () { _viewer->seek_by (-_viewer->one_video_frame(), true); } - void forward_frame () + void go_forward_frame () { _viewer->seek_by (_viewer->one_video_frame(), true); } -private: + void go_seconds (int s) + { + _viewer->seek_by (DCPTime::from_seconds(s), true); + } + + void go_to_start () + { + _viewer->seek (DCPTime(), true); + } + + void go_to_end () + { + _viewer->seek (_film->length() - _viewer->one_video_frame(), true); + } wxFrame* _dual_screen; bool _update_news_requested; @@ -995,16 +1078,20 @@ private: SystemInformationDialog* _system_information_dialog; boost::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; + PlayerStressTester _stress; }; static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_PARAM, 0, 0, "DCP to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "c", "config", "Directory containing config.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_OPTION, "s", "stress", "File containing description of stress test", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; @@ -1043,7 +1130,11 @@ public: App () : wxApp () , _frame (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: @@ -1068,10 +1159,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 (); @@ -1116,6 +1205,14 @@ private: } } + if (_stress) { + try { + _frame->load_stress_script (*_stress); + } catch (exception& e) { + error_dialog (0, wxString::Format("Could not load stress test file %s", std_to_wx(*_stress))); + } + } + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); if (Config::instance()->check_for_updates ()) { @@ -1149,6 +1246,10 @@ private: if (parser.Found("c", &config)) { Config::override_path = wx_to_std (config); } + wxString stress; + if (parser.Found("s", &stress)) { + _stress = wx_to_std (stress); + } return true; } @@ -1209,6 +1310,7 @@ private: DOMFrame* _frame; string _dcp_to_load; + boost::optional _stress; }; IMPLEMENT_APP (App)