X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=7008495c60e58f188bf4cd56fd206e93fe8eb45f;hb=634521677764f1c5f74ea46fa6531cb39f3a7492;hp=0f0d84df2f1f785748ce011740aa097046b0f516;hpb=48ac836c1adf20629d75592bc87bf64d18c54139;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 0f0d84df2..7008495c6 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -31,6 +31,7 @@ #include "lib/cross.h" #include "lib/config.h" #include "lib/util.h" +#include "lib/internet.h" #include "lib/update_checker.h" #include "lib/compose.hpp" #include "lib/dcp_content.h" @@ -45,6 +46,11 @@ #include "lib/examine_content_job.h" #include "lib/server.h" #include "lib/dcpomatic_socket.h" +#include "lib/scoped_temporary.h" +#include "lib/monitor_checker.h" +#include +#include +#include #include #include #include @@ -133,8 +139,8 @@ public: SetIcon (wxIcon (std_to_wx ("id"))); #endif - _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); - config_changed (); + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); + update_from_config (); 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); @@ -161,13 +167,17 @@ public: _overall_panel = new wxPanel (this, wxID_ANY); _viewer.reset (new FilmViewer (_overall_panel)); - _controls = new Controls (_overall_panel, _viewer, false, false, false); + _controls = new Controls (_overall_panel, _viewer, false); _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)); - _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, 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 (true); + setup_main_sizer (Config::instance()->player_mode()); #ifdef __WXOSX__ int accelerators = 4; #else @@ -189,18 +199,67 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame); Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame); - UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); + 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 (); +#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); + } + } + +#endif } - void setup_main_sizer (bool with_viewer) + 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()) { + error_dialog (this, _("The required display devices are not connected correctly.")); + _viewer->stop (); + } + } +#endif + + void setup_main_sizer (Config::PlayerMode mode) { wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); - if (with_viewer) { + if (mode != Config::PLAYER_MODE_DUAL) { main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); } - main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); + 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 (); @@ -208,6 +267,12 @@ public: bool playback_permitted () { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (!MonitorChecker::instance()->ok()) { + error_dialog (this, _("The required display devices are not connected correctly.")); + return false; + } +#endif if (!_film || !Config::instance()->respect_kdm_validity_periods()) { return true; } @@ -227,7 +292,7 @@ public: return ok; } - void playback_started () + void playback_started (DCPTime time) { optional log = Config::instance()->player_log_file(); if (!log) { @@ -248,15 +313,16 @@ public: FILE* f = fopen_boost(*log, "a"); fprintf ( f, - "%s playback-started %s %s\n", + "%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_stopped () + void playback_seeked (DCPTime time) { optional log = Config::instance()->player_log_file(); if (!log) { @@ -264,7 +330,27 @@ public: } FILE* f = fopen_boost(*log, "a"); - fprintf (f, "%s playback-stopped\n", dcp::LocalTime().as_string().c_str()); + 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) + { +#ifdef DCPOMATIC_VARIANT_SWAROOP + try { + boost::filesystem::remove (Config::path("position")); + } catch (...) { + /* Never mind */ + } +#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); } @@ -277,33 +363,125 @@ public: void load_dcp (boost::filesystem::path dir) { - _film.reset (new Film (optional())); - shared_ptr dcp; + DCPOMATIC_ASSERT (_film); + + reset_film (); try { - dcp.reset (new DCPContent (_film, dir)); - } catch (boost::filesystem::filesystem_error& e) { - error_dialog (this, _("Could not load DCP"), std_to_wx (e.what())); - return; + shared_ptr dcp (new DCPContent(_film, dir)); + _film->examine_and_add_content (dcp); + bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content")); + if (!ok || !report_errors_from_last_job(this)) { + return; + } + Config::instance()->add_to_player_history (dir); + } 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) + { + 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 - _film->examine_and_add_content (dcp, true); - bool const ok = progress (_("Loading DCP")); - if (!ok || !report_errors_from_last_job()) { + 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 */ + } + } + return optional(); + } + + void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) + { + _film = film; + _viewer->set_film (_film); + _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); + } + + void film_changed (ChangeType type, Film::Property property) + { + if (type != CHANGE_TYPE_DONE || property != Film::CONTENT) { return; } - setup_from_dcp (dcp); + _film->write_metadata (Config::path("spl.xml")); - if (dcp->three_d()) { - _film->set_three_d (true); + 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); + if (dcp && dcp->needs_kdm()) { + optional kdm; +#ifdef DCPOMATIC_VARIANT_SWAROOP + kdm = get_kdm_from_url (dcp); +#endif + if (!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); + } + + if (i->video) { + Ratio 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); + } + } + + /* Any 3D content means we use 3D mode */ + if (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) { + _film->set_three_d (true); + } } - _viewer->set_film (_film); _viewer->seek (DCPTime(), true); _info->triggered_update (); - Config::instance()->add_to_player_history (dir); - set_menu_sensitivity (); wxMenuItemList old = _cpl_menu->GetMenuItems(); @@ -311,15 +489,21 @@ public: _cpl_menu->Remove (*i); } - DCPExaminer ex (dcp); - int id = ID_view_cpl; - BOOST_FOREACH (shared_ptr i, ex.cpls()) { - wxMenuItem* j = _cpl_menu->AppendRadioItem( - id, - wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data()) - ); - j->Check(!dcp->cpl() || i->id() == *dcp->cpl()); - ++id; + if (_film->content().size() == 1) { + /* Offer a CPL menu */ + shared_ptr first = dynamic_pointer_cast(_film->content().front()); + if (first) { + DCPExaminer ex (first); + int id = ID_view_cpl; + BOOST_FOREACH (shared_ptr i, ex.cpls()) { + wxMenuItem* j = _cpl_menu->AppendRadioItem( + id, + wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data()) + ); + j->Check(!first->cpl() || i->id() == *first->cpl()); + ++id; + } + } } } @@ -345,12 +529,14 @@ private: #endif #ifdef __WXOSX__ - _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + wxMenuItem* prefs = _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #else wxMenu* edit = new wxMenu; - edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + wxMenuItem* prefs = edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #endif + prefs->Enable (Config::instance()->have_write_permission()); + _cpl_menu = new wxMenu; wxMenu* view = new wxMenu; @@ -445,11 +631,19 @@ private: DCPOMATIC_ASSERT (dcp); dcp->add_ov (wx_to_std(c->GetPath())); JobManager::instance()->add(shared_ptr(new ExamineContentJob (_film, dcp))); - bool const ok = progress (_("Loading DCP")); - if (!ok || !report_errors_from_last_job()) { + bool const ok = display_progress (_("DCP-o-matic Player"), _("Loading content")); + if (!ok || !report_errors_from_last_job(this)) { return; } - setup_from_dcp (dcp); + BOOST_FOREACH (shared_ptr i, dcp->text) { + i->set_use (true); + } + if (dcp->video) { + Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + if (r) { + _film->set_container(r); + } + } } c->Destroy (); @@ -489,8 +683,7 @@ private: void file_close () { - _viewer->set_film (shared_ptr()); - _film.reset (); + reset_film (); _info->triggered_update (); set_menu_sensitivity (); } @@ -502,6 +695,10 @@ private: void edit_preferences () { + if (!Config::instance()->have_write_permission()) { + return; + } + if (!_config_dialog) { _config_dialog = create_player_config_dialog (); } @@ -562,6 +759,7 @@ 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); @@ -593,7 +791,7 @@ private: } } - setup_main_sizer (_mode != Config::PLAYER_MODE_DUAL); + setup_main_sizer (_mode); } void view_closed_captions () @@ -608,7 +806,7 @@ private: JobManager* jm = JobManager::instance (); jm->add (shared_ptr (new VerifyDCPJob (dcp->directories()))); - bool const ok = progress (_("Verifying DCP")); + bool const ok = display_progress (_("DCP-o-matic Player"), _("Verifying DCP")); if (!ok) { return; } @@ -672,21 +870,33 @@ private: _update_news_requested = false; } - void config_changed () + void config_changed (Config::Property prop) { /* Instantly save any config changes when using the player GUI */ try { Config::instance()->write_config(); + } catch (FileError& e) { + if (prop != Config::HISTORY) { + error_dialog ( + this, + wxString::Format( + _("Could not write to config file at %s. Your changes have not been saved."), + std_to_wx(e.file().string()) + ) + ); + } } catch (exception& e) { error_dialog ( this, - wxString::Format ( - _("Could not write to config file at %s. Your changes have not been saved."), - std_to_wx (Config::instance()->cinemas_file().string()).data() - ) + _("Could not write to config file. Your changes have not been saved.") ); } + update_from_config (); + } + + void update_from_config () + { for (int i = 0; i < _history_items; ++i) { delete _file_menu->Remove (ID_file_history + i); } @@ -747,60 +957,6 @@ private: private: - /** @return false if the task was cancelled */ - bool progress (wxString task) - { - JobManager* jm = JobManager::instance (); - - wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), task, 100, 0, wxPD_CAN_ABORT); - - bool ok = true; - - while (jm->work_to_do() || signal_manager->ui_idle()) { - dcpomatic_sleep (1); - if (!progress->Pulse()) { - /* user pressed cancel */ - BOOST_FOREACH (shared_ptr i, jm->get()) { - i->cancel(); - } - ok = false; - break; - } - } - - progress->Destroy (); - return ok; - } - - bool report_errors_from_last_job () - { - JobManager* jm = JobManager::instance (); - - DCPOMATIC_ASSERT (!jm->get().empty()); - - shared_ptr last = jm->get().back(); - if (last->finished_in_error()) { - error_dialog(this, std_to_wx(last->error_summary()) + ".\n", std_to_wx(last->error_details())); - return false; - } - - return true; - } - - void setup_from_dcp (shared_ptr dcp) - { - BOOST_FOREACH (shared_ptr i, dcp->text) { - i->set_use (true); - } - - if (dcp->video) { - Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); - if (r) { - _film->set_container(r); - } - } - } - wxFrame* _dual_screen; bool _update_news_requested; PlayerInformation* _info; @@ -914,6 +1070,8 @@ private: */ Config::drop (); + signal_manager = new wxSignalManager (this); + _frame = new DOMFrame (); SetTopWindow (_frame); _frame->Maximize (); @@ -922,8 +1080,6 @@ private: } _frame->Show (); - signal_manager = new wxSignalManager (this); - PlayServer* server = new PlayServer (_frame); new thread (boost::bind (&PlayServer::run, server));