X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=0f1ed00b32f901fb544662978d3c2dbd9aca703c;hb=1f1661f36ffd7a5662847f0642c7a7ebdcadc0f0;hp=9a9316717b9efc86d33b644db2fe115655feb990;hpb=15895d47cebc0988aecf0a6b84947f4b6bae9aa3;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 9a9316717..0f1ed00b3 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -18,7 +18,6 @@ */ - #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/about_dialog.h" @@ -32,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" @@ -46,12 +46,14 @@ #include "lib/examine_content_job.h" #include "lib/server.h" #include "lib/dcpomatic_socket.h" +#include "lib/scoped_temporary.h" #include #include #include #include #include #include +#include #ifdef __WXOSX__ #include #endif @@ -86,6 +88,7 @@ enum { ID_view_cpl, /* Allow spare IDs for CPLs */ ID_view_full_screen = 200, + ID_view_dual_screen, ID_view_closed_captions, ID_view_scale_appropriate, ID_view_scale_full, @@ -105,14 +108,17 @@ class DOMFrame : public wxFrame public: DOMFrame () : wxFrame (0, -1, _("DCP-o-matic Player")) + , _dual_screen (0) , _update_news_requested (false) , _info (0) + , _mode (Config::instance()->player_mode()) , _config_dialog (0) - , _full_screen (false) , _file_menu (0) , _history_items (0) , _history_position (0) , _history_separator (0) + , _view_full_screen (0) + , _view_dual_screen (0) { #if defined(DCPOMATIC_WINDOWS) @@ -130,7 +136,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); @@ -140,6 +146,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_full_screen, this), ID_view_full_screen); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_dual_screen, this), ID_view_dual_screen); Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this), ID_view_closed_captions); Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_cpl, this, _1), ID_view_cpl, ID_view_cpl + MAX_CPLS); Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional(0)), ID_view_scale_full); @@ -156,15 +163,14 @@ public: _overall_panel = new wxPanel (this, wxID_ANY); _viewer.reset (new FilmViewer (_overall_panel)); - _controls = new Controls (_overall_panel, _viewer); + _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); - wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); - main_sizer->Add (_viewer->panel(), 1, wxEXPAND); - main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); - main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); - _overall_panel->SetSizer (main_sizer); - + setup_main_sizer (Config::instance()->player_mode()); #ifdef __WXOSX__ int accelerators = 4; #else @@ -187,6 +193,96 @@ 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)); + + setup_screen (); + } + + void setup_main_sizer (Config::PlayerMode mode) + { + wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); + if (mode != Config::PLAYER_MODE_DUAL) { + main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); + } + 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 (); + } + + bool playback_permitted () + { + if (!_film || !Config::instance()->respect_kdm_validity_periods()) { + return true; + } + + bool ok = true; + BOOST_FOREACH (shared_ptr i, _film->content()) { + shared_ptr d = dynamic_pointer_cast(i); + if (d && !d->kdm_timing_window_valid()) { + ok = false; + } + } + + if (!ok) { + error_dialog (this, _("The KDM does not allow playback of this content at this time.")); + } + + return ok; + } + + 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; + } + } + 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; + } + + 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) + { + 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); } void set_decode_reduction (optional reduction) @@ -198,49 +294,154 @@ 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; + list spl; + spl.push_back (SPLEntry(dir)); + set_spl (spl); + Config::instance()->add_to_player_history (dir); + } + + 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; + } - _film->examine_and_add_content (dcp, true); - bool const ok = progress (_("Loading DCP")); - if (!ok || !report_errors_from_last_job()) { - return; + 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) { + if (file_size(i->path()) < MAX_KDM_SIZE) { + try { + 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(); + } - setup_from_dcp (dcp); + void set_spl (list spl) + { + if (_viewer->playing ()) { + _viewer->stop (); + } + + _film.reset (new Film (optional())); - if (dcp->three_d()) { - _film->set_three_d (true); + if (spl.empty ()) { + _viewer->set_film (_film); + _info->triggered_update (); + return; } - _viewer->set_film (_film); - _viewer->seek (DCPTime(), true); - _info->triggered_update (); + /* Start off as Flat */ + _film->set_container (Ratio::from_id("185")); - Config::instance()->add_to_player_history (dir); + DCPTime position; + shared_ptr first; - set_menu_sensitivity (); + BOOST_FOREACH (SPLEntry i, spl) { + shared_ptr dcp; + try { + dcp.reset (new DCPContent (_film, i.dcp)); + } 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.dcp.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; + } } } @@ -266,18 +467,26 @@ 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; optional c = Config::instance()->decode_reduction(); _view_cpl = view->Append(ID_view_cpl, _("CPL"), _cpl_menu); - view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11"))->Check(_full_screen); + view->AppendSeparator(); +#ifndef DCPOMATIC_VARIANT_SWAROOP + _view_full_screen = view->AppendCheckItem(ID_view_full_screen, _("Full screen\tF11")); + _view_dual_screen = view->AppendCheckItem(ID_view_dual_screen, _("Dual screen\tShift+F11")); +#endif + setup_menu (); + view->AppendSeparator(); view->Append(ID_view_closed_captions, _("Closed captions...")); view->AppendSeparator(); view->AppendRadioItem(ID_view_scale_appropriate, _("Set decode resolution to match display"))->Check(!static_cast(c)); @@ -364,7 +573,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 (); @@ -417,6 +634,10 @@ private: void edit_preferences () { + if (!Config::instance()->have_write_permission()) { + return; + } + if (!_config_dialog) { _config_dialog = create_player_config_dialog (); } @@ -444,11 +665,72 @@ private: void view_full_screen () { - _full_screen = !_full_screen; - _controls->Show (!_full_screen); - _info->Show (!_full_screen); - _overall_panel->SetBackgroundColour (_full_screen ? wxColour(0, 0, 0) : wxNullColour); - ShowFullScreen (_full_screen); + if (_mode == Config::PLAYER_MODE_FULL) { + _mode = Config::PLAYER_MODE_WINDOW; + } else { + _mode = Config::PLAYER_MODE_FULL; + } + setup_screen (); + setup_menu (); + } + + void view_dual_screen () + { + if (_mode == Config::PLAYER_MODE_DUAL) { + _mode = Config::PLAYER_MODE_WINDOW; + } else { + _mode = Config::PLAYER_MODE_DUAL; + } + setup_screen (); + setup_menu (); + } + + void setup_menu () + { + if (_view_full_screen) { + _view_full_screen->Check (_mode == Config::PLAYER_MODE_FULL); + } + if (_view_dual_screen) { + _view_dual_screen->Check (_mode == Config::PLAYER_MODE_DUAL); + } + } + + 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); + + if (_mode == Config::PLAYER_MODE_DUAL) { + _dual_screen = new wxFrame (this, wxID_ANY, wxT("")); + _dual_screen->SetBackgroundColour (wxColour(0, 0, 0)); + _dual_screen->ShowFullScreen (true); + _viewer->panel()->Reparent (_dual_screen); + _dual_screen->Show (); + if (wxDisplay::GetCount() > 1) { + switch (Config::instance()->image_display()) { + case 0: + _dual_screen->Move (0, 0); + Move (wxDisplay(0).GetClientArea().GetWidth(), 0); + break; + case 1: + _dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0); + // (0, 0) doesn't seem to work for some strange reason + Move (8, 8); + break; + } + } + } else { + if (_dual_screen) { + _viewer->panel()->Reparent (_overall_panel); + _dual_screen->Destroy (); + _dual_screen = 0; + } + } + + setup_main_sizer (_mode); } void view_closed_captions () @@ -532,16 +814,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); } @@ -642,24 +934,11 @@ 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; + Config::PlayerMode _mode; wxPreferencesEditor* _config_dialog; - bool _full_screen; wxPanel* _overall_panel; wxMenu* _file_menu; wxMenuItem* _view_cpl; @@ -674,6 +953,8 @@ private: wxMenuItem* _file_add_ov; wxMenuItem* _file_add_kdm; wxMenuItem* _tools_verify; + wxMenuItem* _view_full_screen; + wxMenuItem* _view_dual_screen; }; static const wxCmdLineEntryDesc command_line_description[] = {