X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=a73fa4d304da174cfd7fc049c4f6c771ac826cfb;hp=7028624a847116c270df7839a248f0781485ecfb;hb=ff623a7f045575169820b28a9e1d4ee10ec2fb69;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5 diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 7028624a8..a73fa4d30 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Carl Hetherington + Copyright (C) 2017-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -27,7 +27,14 @@ #include "wx/update_dialog.h" #include "wx/player_config_dialog.h" #include "wx/verify_dcp_dialog.h" -#include "wx/controls.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" @@ -51,6 +58,8 @@ #include "lib/monitor_checker.h" #include "lib/lock_file_checker.h" #include "lib/ffmpeg_content.h" +#include "lib/dcpomatic_log.h" +#include "lib/file_log.h" #include #include #include @@ -61,10 +70,11 @@ #include #include #include -#ifdef __WXOSX__ -#include +#ifdef __WXGTK__ +#include #endif #include +#include #include #ifdef check @@ -79,11 +89,14 @@ using std::list; using std::exception; using std::vector; using boost::shared_ptr; +using boost::weak_ptr; using boost::scoped_array; using boost::optional; using boost::dynamic_pointer_cast; using boost::thread; using boost::bind; +using dcp::raw_convert; +using namespace dcpomatic; enum { ID_file_open = 1, @@ -104,10 +117,20 @@ enum { ID_help_report_a_problem, ID_tools_verify, ID_tools_check_for_updates, + ID_tools_timing, + 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 @@ -124,12 +147,12 @@ public: , _history_items (0) , _history_position (0) , _history_separator (0) + , _system_information_dialog (0) , _view_full_screen (0) , _view_dual_screen (0) - { - /* XXX */ + , _main_sizer (new wxBoxSizer (wxVERTICAL)) +{ dcpomatic_log.reset (new NullLog()); - cout << "here's the log " << dcpomatic_log.get() << "\n"; #if defined(DCPOMATIC_WINDOWS) maybe_open_console (); @@ -146,7 +169,7 @@ public: #endif _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); - update_from_config (); + update_from_config (Config::PLAYER_DEBUG_LOG); 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); @@ -166,6 +189,8 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_verify, this), ID_tools_verify); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); + 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. @@ -173,37 +198,63 @@ public: _overall_panel = new wxPanel (this, wxID_ANY); _viewer.reset (new FilmViewer (_overall_panel)); - _controls = new Controls (_overall_panel, _viewer, false); +#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); + _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->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1)); _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - _viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this)); -#endif _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 (); @@ -216,41 +267,13 @@ public: #endif setup_screen (); -#ifdef DCPOMATIC_VARIANT_SWAROOP - if ( - boost::filesystem::is_regular_file(Config::path("position")) && - boost::filesystem::is_regular_file(Config::path("spl.xml"))) { - - shared_ptr film (new Film(boost::optional())); - film->read_metadata (Config::path("spl.xml")); - reset_film (film); - FILE* f = fopen_boost (Config::path("position"), "r"); - if (f) { - char buffer[64]; - fscanf (f, "%63s", buffer); - _viewer->seek (DCPTime(atoi(buffer)), true); - _viewer->start (); - fclose (f); - } - } + _stress.LoadDCP.connect (boost::bind(&DOMFrame::load_dcp, this, _1)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + sc->check_restart (); #endif } - void position_changed () - { - if (!_viewer->playing() || _viewer->position().get() % DCPTime::HZ) { - return; - } - - FILE* f = fopen_boost (Config::path("position"), "w"); - if (f) { - string const p = dcp::raw_convert (_viewer->position().get()); - fwrite (p.c_str(), p.length(), 1, f); - fclose (f); - } - } - #ifdef DCPOMATIC_VARIANT_SWAROOP void monitor_checker_state_changed () { @@ -271,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 (); } @@ -305,6 +330,15 @@ public: } } +#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.")); } @@ -314,18 +348,14 @@ public: void playback_started (DCPTime time) { - optional log = Config::instance()->player_log_file(); - if (!log) { + /* XXX: this only logs the first piece of content; probably should be each piece? */ + if (_film->content().empty()) { return; } - FILE* f = fopen_boost(*log, "a"); - - /* XXX: this only logs the first piece of content; probably should be each piece? */ - shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); if (dcp) { - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); shared_ptr playing_cpl; BOOST_FOREACH (shared_ptr i, ex.cpls()) { if (!dcp->cpl() || i->id() == *dcp->cpl()) { @@ -334,40 +364,26 @@ public: } DCPOMATIC_ASSERT (playing_cpl); - fprintf ( - f, - "%s playback-started %s %s %s\n", - dcp::LocalTime().as_string().c_str(), - time.timecode(_film->video_frame_rate()).c_str(), - dcp->directories().front().string().c_str(), - playing_cpl->annotation_text().c_str() + _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) { - fprintf ( - f, - "%s playback-started %s %s\n", - dcp::LocalTime().as_string().c_str(), - time.timecode(_film->video_frame_rate()).c_str(), - ffmpeg->path(0).string().c_str() + _controls->log ( + wxString::Format( + "playback-started %s %s", + time.timecode(_film->video_frame_rate()).c_str(), + ffmpeg->path(0).string().c_str() + ) ); } - - fclose (f); - } - - void playback_seeked (DCPTime time) - { - optional log = Config::instance()->player_log_file(); - if (!log) { - return; - } - - FILE* f = fopen_boost(*log, "a"); - fprintf (f, "%s playback-seeked %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str()); - fclose (f); } void playback_stopped (DCPTime time) @@ -380,14 +396,7 @@ public: } #endif - optional log = Config::instance()->player_log_file(); - if (!log) { - return; - } - - FILE* f = fopen_boost(*log, "a"); - fprintf (f, "%s playback-stopped %s\n", dcp::LocalTime().as_string().c_str(), time.timecode(_film->video_frame_rate()).c_str()); - fclose (f); + _controls->log (wxString::Format("playback-stopped %s", time.timecode(_film->video_frame_rate()).c_str())); } void set_decode_reduction (optional reduction) @@ -403,66 +412,58 @@ public: reset_film (); try { + _stress.set_suspended (true); shared_ptr dcp (new DCPContent(dir)); - _film->examine_and_add_content (dcp); + 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; } +#ifndef DCPOMATIC_VARIANT_SWAROOP Config::instance()->add_to_player_history (dir); - } catch (dcp::DCPReadError& e) { +#endif + } 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())); } } -#ifdef DCPOMATIC_VARIANT_SWAROOP - optional get_kdm_from_url (shared_ptr dcp) + void add_dcp_to_film (weak_ptr weak_job, weak_ptr weak_content) { - ScopedTemporary temp; - string url = Config::instance()->kdm_server_url(); - boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl()); - optional kdm; - if (dcp->cpl() && !get_from_url(url, false, temp)) { - try { - kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file())); - if (kdm->cpl_id() != dcp->cpl()) { - kdm = boost::none; - } - } catch (std::exception& e) { - /* Hey well */ - } + shared_ptr job = weak_job.lock (); + if (!job || !job->finished_ok()) { + return; + } + + shared_ptr content = weak_content.lock (); + if (!content) { + return; } - return kdm; + + _film->add_content (content); + _stress.set_suspended (false); } -#endif - optional get_kdm_from_directory (shared_ptr dcp) + void reset_film_weak (weak_ptr weak_film) { - using namespace boost::filesystem; - optional kdm_dir = Config::instance()->player_kdm_directory(); - if (!kdm_dir) { - return optional(); - } - for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) { - try { - if (file_size(i->path()) < MAX_KDM_SIZE) { - dcp::EncryptedKDM kdm (dcp::file_to_string(i->path())); - if (kdm.cpl_id() == dcp->cpl()) { - return kdm; - } - } - } catch (std::exception& e) { - /* Hey well */ - } + shared_ptr film = weak_film.lock (); + if (film) { + reset_film (film); } - return optional(); } void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) { _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)); + _info->triggered_update (); } void film_changed (ChangeType type, Film::Property property) @@ -471,8 +472,6 @@ public: return; } - _film->write_metadata (Config::path("spl.xml")); - if (_viewer->playing ()) { _viewer->stop (); } @@ -482,20 +481,6 @@ public: BOOST_FOREACH (shared_ptr i, _film->content()) { shared_ptr dcp = dynamic_pointer_cast(i); - if (dcp && dcp->needs_kdm()) { - optional kdm; -#ifdef DCPOMATIC_VARIANT_SWAROOP - kdm = get_kdm_from_url (dcp); -#endif - if (!kdm) { - kdm = get_kdm_from_directory (dcp); - } - - if (kdm) { - dcp->add_kdm (*kdm); - dcp->examine (_film, shared_ptr()); - } - } BOOST_FOREACH (shared_ptr j, i->text) { j->set_use (true); @@ -529,7 +514,7 @@ public: /* Offer a CPL menu */ shared_ptr first = dynamic_pointer_cast(_film->content().front()); if (first) { - DCPExaminer ex (first); + DCPExaminer ex (first, true); int id = ID_view_cpl; BOOST_FOREACH (shared_ptr i, ex.cpls()) { wxMenuItem* j = _cpl_menu->AppendRadioItem( @@ -543,14 +528,34 @@ public: } } + void load_stress_script (boost::filesystem::path path) + { + _stress.load_script (path); + } + private: + bool report_errors_from_last_job (wxWindow* parent) const + { + JobManager* jm = JobManager::instance (); + + DCPOMATIC_ASSERT (!jm->get().empty()); + + shared_ptr 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; + } + + return true; + } + void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; _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_add_kdm = _file_menu->Append (ID_file_add_kdm, _("Add &KDM...")); _history_position = _file_menu->GetMenuItems().GetCount(); @@ -596,6 +601,8 @@ private: _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; #ifdef __WXOSX__ @@ -692,11 +699,27 @@ private: 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 DCPOMATIC_ASSERT (dcp); +#endif try { - dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); - dcp->examine (_film, shared_ptr()); + if (dcp) { + dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); + dcp->examine (_film, shared_ptr()); + } } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); d->Destroy (); @@ -713,7 +736,11 @@ private: vector history = Config::instance()->player_history (); int n = event.GetId() - ID_file_history; if (n >= 0 && n < static_cast (history.size ())) { - load_dcp (history[n]); + try { + load_dcp (history[n]); + } catch (exception& e) { + error_dialog (0, std_to_wx(String::compose(wx_to_std(_("Could not load DCP %1.")), history[n])), std_to_wx(e.what())); + } } } @@ -745,7 +772,7 @@ private: { shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); int id = ev.GetId() - ID_view_cpl; DCPOMATIC_ASSERT (id >= 0); DCPOMATIC_ASSERT (id < int(ex.cpls().size())); @@ -795,7 +822,6 @@ private: void setup_screen () { _controls->Show (_mode != Config::PLAYER_MODE_FULL); - _controls->show_extended_player_controls (_mode == Config::PLAYER_MODE_DUAL); _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); @@ -811,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; @@ -863,6 +889,22 @@ private: _update_news_requested = true; } + void tools_timing () + { + TimerDisplay* d = new TimerDisplay (this, _viewer->state_timer(), _viewer->gets()); + d->ShowModal (); + d->Destroy (); + } + + void tools_system_information () + { + if (!_system_information_dialog) { + _system_information_dialog = new SystemInformationDialog (this, _viewer); + } + + _system_information_dialog->Show (); + } + void help_about () { AboutDialog* d = new AboutDialog (this); @@ -929,10 +971,10 @@ private: ); } - update_from_config (); + update_from_config (prop); } - void update_from_config () + void update_from_config (Config::Property prop) { for (int i = 0; i < _history_items; ++i) { delete _file_menu->Remove (ID_file_history + i); @@ -946,6 +988,8 @@ private: int pos = _history_position; + /* Clear out non-existant history items before we re-build the menu */ + Config::instance()->clean_player_history (); vector history = Config::instance()->player_history (); if (!history.empty ()) { @@ -963,6 +1007,16 @@ private: } _history_items = history.size (); + + if (prop == Config::PLAYER_DEBUG_LOG) { + optional p = Config::instance()->player_debug_log_file(); + if (p) { + dcpomatic_log.reset (new FileLog(*p)); + } else { + dcpomatic_log.reset (new NullLog()); + } + dcpomatic_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_VIDEO_VIEW); + } } void set_menu_sensitivity () @@ -982,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; @@ -1008,17 +1075,23 @@ private: wxMenuItem* _history_separator; shared_ptr _viewer; Controls* _controls; + 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 } }; @@ -1057,90 +1130,105 @@ public: App () : wxApp () , _frame (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: bool OnInit () - try { - wxInitAllImageHandlers (); + wxSplashScreen* splash = 0; + try { + wxInitAllImageHandlers (); - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - wxSplashScreen* splash = maybe_show_splash (); + splash = maybe_show_splash (); - SetAppName (_("DCP-o-matic Player")); + SetAppName (_("DCP-o-matic Player")); - if (!wxApp::OnInit()) { - return false; - } + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #endif - dcpomatic_setup_path_encoding (); - - /* Enable i18n; this will create a Config object - to look for a force-configured language. This Config - object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); - - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + signal_manager = new wxSignalManager (this); + + _frame = new DOMFrame (); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; + } + _frame->Show (); - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); + PlayServer* server = new PlayServer (_frame); + new thread (boost::bind (&PlayServer::run, server)); - signal_manager = new wxSignalManager (this); + if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { + try { + _frame->load_dcp (_dcp_to_load); + } catch (exception& e) { + error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what())); + } + } - _frame = new DOMFrame (); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); - } - _frame->Show (); + 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))); + } + } - PlayServer* server = new PlayServer (_frame); - new thread (boost::bind (&PlayServer::run, server)); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - if (!_dcp_to_load.empty() && boost::filesystem::is_directory (_dcp_to_load)) { - try { - _frame->load_dcp (_dcp_to_load); - } catch (exception& e) { - error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what())); + if (Config::instance()->check_for_updates ()) { + UpdateChecker::instance()->run (); } } - - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - - if (Config::instance()->check_for_updates ()) { - UpdateChecker::instance()->run (); + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what())); } return true; } - catch (exception& e) - { - error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what())); - return true; - } void OnInitCmdLine (wxCmdLineParser& parser) { @@ -1154,6 +1242,15 @@ private: _dcp_to_load = wx_to_std (parser.GetParam (0)); } + wxString config; + 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; } @@ -1213,6 +1310,7 @@ private: DOMFrame* _frame; string _dcp_to_load; + boost::optional _stress; }; IMPLEMENT_APP (App)