X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=5bc9ace36fe6deb4e7fc5cf9747448a18d5d177d;hb=2eab969654eca2ef4b222790c8b730a6eb709565;hp=3be947cc623bcdec3637ed5488733ba12f7c628c;hpb=036b660b2764642ba430f706033f12d49b9c16b4;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 3be947cc6..5bc9ace36 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,9 @@ #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 @@ -134,7 +138,7 @@ public: #endif _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); - config_changed (); + 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,14 +165,14 @@ 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, _1)); _viewer->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1)); _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1)); _info = new PlayerInformation (_overall_panel, _viewer); - setup_main_sizer (true); + setup_main_sizer (Config::instance()->player_mode()); #ifdef __WXOSX__ int accelerators = 4; #else @@ -191,17 +195,29 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame); UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); - + _controls->SPLChanged.connect (boost::bind(&DOMFrame::set_spl, this, _1)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + MonitorChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::monitor_checker_state_changed, this)); + MonitorChecker::instance()->run (); +#endif setup_screen (); } - void setup_main_sizer (bool with_viewer) + void monitor_checker_state_changed () + { + if (!MonitorChecker::instance()->ok()) { + error_dialog (this, _("The required display devices are not connected correctly.")); + _viewer->stop (); + } + } + + 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 (); @@ -209,6 +225,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; } @@ -291,49 +313,160 @@ public: void load_dcp (boost::filesystem::path dir) { - _film.reset (new Film (optional())); - shared_ptr dcp; - 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; + dcp::DCP dcp (dir); + dcp.read (); + list spl; + BOOST_FOREACH (shared_ptr j, dcp.cpls()) { + spl.push_back (SPLEntry(j, dir)); } + set_spl (spl); + Config::instance()->add_to_player_history (dir); + } - _film->examine_and_add_content (dcp, true); - bool const ok = progress (_("Loading DCP")); - if (!ok || !report_errors_from_last_job()) { - return; +#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 - setup_from_dcp (dcp); + 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(); + } - if (dcp->three_d()) { - _film->set_three_d (true); + void set_spl (list spl) + { + if (_viewer->playing ()) { + _viewer->stop (); } - _viewer->set_film (_film); - _viewer->seek (DCPTime(), true); - _info->triggered_update (); + _film.reset (new Film (optional())); - Config::instance()->add_to_player_history (dir); + if (spl.empty ()) { + _viewer->set_film (_film); + _info->triggered_update (); + return; + } - set_menu_sensitivity (); + /* Start off as Flat */ + _film->set_container (Ratio::from_id("185")); + + DCPTime position; + shared_ptr first; + + BOOST_FOREACH (SPLEntry i, spl) { + shared_ptr dcp; + try { + dcp.reset (new DCPContent (_film, i.directory)); + } catch (boost::filesystem::filesystem_error& e) { + error_dialog (this, _("Could not load DCP"), std_to_wx (e.what())); + return; + } + + if (!first) { + first = dcp; + } + + _film->examine_and_add_content (dcp, true); + bool const ok = progress (_("Loading DCP")); + if (!ok || !report_errors_from_last_job()) { + return; + } + + dcp->set_position (position + i.black_before); + position += dcp->length_after_trim() + i.black_before; + + /* This DCP has been examined and loaded */ + + if (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, dcp->text) { + j->set_use (true); + } + + if (dcp->video) { + Ratio const * r = Ratio::nearest_from_ratio(dcp->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 (dcp->three_d()) { + _film->set_three_d (true); + } + + _viewer->set_film (_film); + _viewer->seek (DCPTime(), true); + _info->triggered_update (); + + set_menu_sensitivity (); + _controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str())); + } wxMenuItemList old = _cpl_menu->GetMenuItems(); for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) { _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 (spl.size() == 1) { + /* Offer a CPL menu */ + 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; + } } } @@ -359,12 +492,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; @@ -463,7 +598,15 @@ private: if (!ok || !report_errors_from_last_job()) { 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 (); @@ -516,6 +659,10 @@ private: void edit_preferences () { + if (!Config::instance()->have_write_permission()) { + return; + } + if (!_config_dialog) { _config_dialog = create_player_config_dialog (); } @@ -576,6 +723,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); @@ -607,7 +755,7 @@ private: } } - setup_main_sizer (_mode != Config::PLAYER_MODE_DUAL); + setup_main_sizer (_mode); } void view_closed_captions () @@ -691,16 +839,26 @@ private: /* Instantly save any config changes when using the player GUI */ try { Config::instance()->write_config(); - } catch (exception& e) { + } catch (FileError& e) { error_dialog ( this, - wxString::Format ( + 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() + std_to_wx(e.file().string()) ) ); + } catch (exception& e) { + error_dialog ( + this, + _("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); } @@ -801,20 +959,6 @@ private: 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;