X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=6e4f9960c167feb5d71db5ccd258b5d26dce2829;hp=8096e1bb474c6ff819a259844e809e8f5b421b89;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=70a87e2b99184230c2329582dc70d2fa93ebe4f5 diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 8096e1bb4..6e4f9960c 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -27,7 +27,8 @@ #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/swaroop_controls.h" #include "lib/cross.h" #include "lib/config.h" #include "lib/util.h" @@ -38,6 +39,7 @@ #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" @@ -48,6 +50,10 @@ #include "lib/dcpomatic_socket.h" #include "lib/scoped_temporary.h" #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 @@ -76,6 +82,7 @@ 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; @@ -124,6 +131,7 @@ public: , _view_full_screen (0) , _view_dual_screen (0) { + dcpomatic_log.reset (new NullLog()); #if defined(DCPOMATIC_WINDOWS) maybe_open_console (); @@ -140,7 +148,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); @@ -167,15 +175,17 @@ 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 + _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__ @@ -205,50 +215,30 @@ public: #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 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); - } - } - + 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 () { if (!MonitorChecker::instance()->ok()) { + _viewer->stop (); error_dialog (this, _("The required display devices are not connected correctly.")); + } + } + + void lock_checker_state_changed () + { + if (!LockFileChecker::instance()->ok()) { _viewer->stop (); + error_dialog (this, _("The lock file is not present.")); } } #endif @@ -272,6 +262,10 @@ public: 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; @@ -294,44 +288,39 @@ public: void playback_started (DCPTime time) { - optional log = Config::instance()->player_log_file(); - if (!log) { - return; - } - - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); - DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); - shared_ptr playing_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { - if (!dcp->cpl() || i->id() == *dcp->cpl()) { - playing_cpl = i; + /* 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); + 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() + ) + ); } - DCPOMATIC_ASSERT (playing_cpl) - - FILE* f = fopen_boost(*log, "a"); - 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() - ); - fclose (f); - } - void playback_seeked (DCPTime time) - { - optional log = Config::instance()->player_log_file(); - if (!log) { - return; + 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() + ) + ); } - - 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) @@ -344,14 +333,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) @@ -367,66 +349,35 @@ public: reset_film (); try { - shared_ptr dcp (new DCPContent(_film, dir)); - _film->examine_and_add_content (dcp); + shared_ptr dcp (new DCPContent(dir)); + _film->examine_and_add_content (dcp, true); 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 } catch (dcp::DCPReadError& 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 reset_film_weak (weak_ptr weak_film) { - 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 */ - } - } - return kdm; - } -#endif - - optional get_kdm_from_directory (shared_ptr dcp) - { - 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; _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) @@ -435,8 +386,6 @@ public: return; } - _film->write_metadata (Config::path("spl.xml")); - if (_viewer->playing ()) { _viewer->stop (); } @@ -446,20 +395,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 (shared_ptr()); - } - } BOOST_FOREACH (shared_ptr j, i->text) { j->set_use (true); @@ -660,7 +595,7 @@ private: DCPOMATIC_ASSERT (dcp); try { dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); - dcp->examine (shared_ptr()); + dcp->examine (_film, shared_ptr()); } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); d->Destroy (); @@ -721,7 +656,7 @@ private: } dcp->set_cpl ((*i)->id()); - dcp->examine (shared_ptr()); + dcp->examine (_film, shared_ptr()); } void view_full_screen () @@ -759,7 +694,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); @@ -893,10 +827,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); @@ -927,6 +861,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_PLAYER); + } } void set_menu_sensitivity () @@ -983,6 +927,7 @@ private: 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_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; @@ -1026,85 +971,90 @@ public: 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); + ProcessSerialNumber serial; + GetCurrentProcess (&serial); + TransformProcessType (&serial, kProcessTransformToForegroundApplication); #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 (); - - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); + 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 (); - signal_manager = new wxSignalManager (this); + PlayServer* server = new PlayServer (_frame); + new thread (boost::bind (&PlayServer::run, server)); - _frame = new DOMFrame (); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); - } - _frame->Show (); + 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())); + } + } - 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) { @@ -1118,6 +1068,11 @@ private: _dcp_to_load = wx_to_std (parser.GetParam (0)); } + wxString config; + if (parser.Found("c", &config)) { + Config::override_path = wx_to_std (config); + } + return true; }