X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=44c6b8606cbe57c9364bfcde8fae496dcdccfb55;hp=fb962d1bb135eb57359811342b300d64f3523fec;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=d6b1e2c0884d80c36bf490596e0e4dee262002d1 diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index fb962d1bb..44c6b8606 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington + Copyright (C) 2017-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -23,10 +23,17 @@ #include "lib/util.h" #include "lib/update_checker.h" #include "lib/compose.hpp" -#include "lib/encode_server_finder.h" #include "lib/dcp_content.h" #include "lib/job_manager.h" #include "lib/job.h" +#include "lib/video_content.h" +#include "lib/text_content.h" +#include "lib/ratio.h" +#include "lib/verify_dcp_job.h" +#include "lib/dcp_examiner.h" +#include "lib/examine_content_job.h" +#include "lib/server.h" +#include "lib/dcpomatic_socket.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/about_dialog.h" @@ -34,23 +41,59 @@ #include "wx/film_viewer.h" #include "wx/player_information.h" #include "wx/update_dialog.h" +#include "wx/player_config_dialog.h" +#include "wx/verify_dcp_dialog.h" #include #include #include #include +#include +#include +#ifdef __WXOSX__ +#include +#endif #include #include +#ifdef check +#undef check +#endif + +#define MAX_CPLS 32 + using std::string; using std::cout; +using std::list; using std::exception; +using std::vector; using boost::shared_ptr; +using boost::scoped_array; using boost::optional; +using boost::dynamic_pointer_cast; +using boost::thread; +using boost::bind; enum { ID_file_open = 1, + ID_file_add_ov, + ID_file_add_kdm, + ID_file_history, + /* Allow spare IDs after _history for the recent files list */ + ID_file_close = 100, + ID_view_cpl, + /* Allow spare IDs for CPLs */ + ID_view_closed_captions = 200, + ID_view_scale_appropriate, + ID_view_scale_full, + ID_view_scale_half, + ID_view_scale_quarter, ID_help_report_a_problem, + ID_tools_verify, ID_tools_check_for_updates, + /* IDs for shortcuts (with no associated menu item) */ + ID_start_stop, + ID_back_frame, + ID_forward_frame }; class DOMFrame : public wxFrame @@ -59,6 +102,13 @@ public: DOMFrame () : wxFrame (0, -1, _("DCP-o-matic Player")) , _update_news_requested (false) + , _info (0) + , _config_dialog (0) + , _file_menu (0) + , _history_items (0) + , _history_position (0) + , _history_separator (0) + , _viewer (0) { #if defined(DCPOMATIC_WINDOWS) @@ -68,16 +118,31 @@ public: wxMenuBar* bar = new wxMenuBar; setup_menu (bar); + set_menu_sensitivity (); SetMenuBar (bar); #ifdef DCPOMATIC_WINDOWS SetIcon (wxIcon (std_to_wx ("id"))); #endif + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); + config_changed (); + 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); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_kdm, this), ID_file_add_kdm); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close); 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_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); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional(1)), ID_view_scale_half); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional(2)), ID_view_scale_quarter); Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); 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); /* Use a panel as the only child of the Frame so that we avoid @@ -86,66 +151,134 @@ public: wxPanel* overall_panel = new wxPanel (this, wxID_ANY); _viewer = new FilmViewer (overall_panel, false, false); + _viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ()); _info = new PlayerInformation (overall_panel, _viewer); wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); main_sizer->Add (_viewer, 1, wxEXPAND | wxALL, 6); main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); overall_panel->SetSizer (main_sizer); +#ifdef __WXOSX__ + int accelerators = 4; +#else + int accelerators = 3; +#endif + + 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); +#ifdef __WXOSX__ + accel[3].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); + UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); } + void set_decode_reduction (optional reduction) + { + _viewer->set_dcp_decode_reduction (reduction); + _info->triggered_update (); + Config::instance()->set_decode_reduction (reduction); + } + void load_dcp (boost::filesystem::path dir) { _film.reset (new Film (optional())); - shared_ptr dcp (new DCPContent (_film, dir)); - _film->examine_and_add_content (dcp); + 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; + } - JobManager* jm = JobManager::instance (); - while (jm->work_to_do ()) { - /* XXX: progress dialog */ - while (signal_manager->ui_idle ()) {} - dcpomatic_sleep (1); + _film->examine_and_add_content (dcp, true); + bool const ok = progress (_("Loading DCP")); + if (!ok || !report_errors_from_last_job()) { + return; } - while (signal_manager->ui_idle ()) {} + setup_from_dcp (dcp); - if (jm->errors ()) { - wxString errors; - BOOST_FOREACH (shared_ptr i, jm->get()) { - if (i->finished_in_error()) { - errors += std_to_wx (i->error_summary()) + "\n"; - } - } - error_dialog (this, errors); - return; + if (dcp->three_d()) { + _film->set_three_d (true); } _viewer->set_film (_film); - _info->update (); + _viewer->set_position (DCPTime ()); + _info->triggered_update (); + + Config::instance()->add_to_player_history (dir); + + set_menu_sensitivity (); + + 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, i->id()); + if (!dcp->cpl() || i->id() == *dcp->cpl()) { + j->Check(true); + } + ++id; + } } private: void setup_menu (wxMenuBar* m) { - wxMenu* file = new wxMenu; - file->Append (ID_file_open, _("&Open...\tCtrl-O")); + _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...")); + + _history_position = _file_menu->GetMenuItems().GetCount(); + + _file_menu->AppendSeparator (); + _file_menu->Append (ID_file_close, _("&Close")); + _file_menu->AppendSeparator (); #ifdef __WXOSX__ - file->Append (wxID_EXIT, _("&Exit")); + _file_menu->Append (wxID_EXIT, _("&Exit")); #else - file->Append (wxID_EXIT, _("&Quit")); + _file_menu->Append (wxID_EXIT, _("&Quit")); #endif #ifdef __WXOSX__ - file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + _file_menu->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #else wxMenu* edit = new wxMenu; edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); #endif + _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->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)); + view->AppendRadioItem(ID_view_scale_full, _("Decode at full resolution"))->Check(c && c.get() == 0); + view->AppendRadioItem(ID_view_scale_half, _("Decode at half resolution"))->Check(c && c.get() == 1); + view->AppendRadioItem(ID_view_scale_quarter, _("Decode at quarter resolution"))->Check(c && c.get() == 2); + wxMenu* tools = new wxMenu; + _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP")); + tools->AppendSeparator (); tools->Append (ID_tools_check_for_updates, _("Check for updates")); wxMenu* help = new wxMenu; @@ -156,16 +289,48 @@ private: #endif help->Append (ID_help_report_a_problem, _("Report a problem...")); - m->Append (file, _("&File")); + m->Append (_file_menu, _("&File")); +#ifndef __WXOSX__ + m->Append (edit, _("&Edit")); +#endif + m->Append (view, _("&View")); m->Append (tools, _("&Tools")); m->Append (help, _("&Help")); } void file_open () + { + wxString d = wxStandardPaths::Get().GetDocumentsDir(); + if (Config::instance()->last_player_load_directory()) { + d = std_to_wx (Config::instance()->last_player_load_directory()->string()); + } + + wxDirDialog* c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + + int r; + while (true) { + r = c->ShowModal (); + if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { + error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); + } else { + break; + } + } + + if (r == wxID_OK) { + boost::filesystem::path const dcp (wx_to_std (c->GetPath ())); + load_dcp (dcp); + Config::instance()->set_last_player_load_directory (dcp.parent_path()); + } + + c->Destroy (); + } + + void file_add_ov () { wxDirDialog* c = new wxDirDialog ( this, - _("Select DCP to open"), + _("Select DCP to open as OV"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); @@ -181,10 +346,59 @@ private: } if (r == wxID_OK) { - load_dcp (wx_to_std (c->GetPath ())); + DCPOMATIC_ASSERT (_film); + shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + 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()) { + return; + } + setup_from_dcp (dcp); } c->Destroy (); + _info->triggered_update (); + } + + void file_add_kdm () + { + wxFileDialog* d = new wxFileDialog (this, _("Select KDM")); + + if (d->ShowModal() == wxID_OK) { + DCPOMATIC_ASSERT (_film); + shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + 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()); + } catch (exception& e) { + error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); + d->Destroy (); + return; + } + } + + d->Destroy (); + _info->triggered_update (); + } + + void file_history (wxCommandEvent& event) + { + 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]); + } + } + + void file_close () + { + _viewer->set_film (shared_ptr()); + _film.reset (); + _info->triggered_update (); + set_menu_sensitivity (); } void file_exit () @@ -192,6 +406,59 @@ private: Close (); } + void edit_preferences () + { + if (!_config_dialog) { + _config_dialog = create_player_config_dialog (); + } + _config_dialog->Show (this); + } + + void view_cpl (wxCommandEvent& ev) + { + shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + DCPOMATIC_ASSERT (dcp); + DCPExaminer ex (dcp); + int id = ev.GetId() - ID_view_cpl; + DCPOMATIC_ASSERT (id >= 0); + DCPOMATIC_ASSERT (id < int(ex.cpls().size())); + list > cpls = ex.cpls(); + list >::iterator i = cpls.begin(); + while (id > 0) { + ++i; + --id; + } + + dcp->set_cpl ((*i)->id()); + dcp->examine (shared_ptr()); + } + + void view_closed_captions () + { + _viewer->show_closed_captions (); + } + + void tools_verify () + { + shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + DCPOMATIC_ASSERT (dcp); + + JobManager* jm = JobManager::instance (); + jm->add (shared_ptr (new VerifyDCPJob (dcp->directories()))); + bool const ok = progress (_("Verifying DCP")); + if (!ok) { + return; + } + + DCPOMATIC_ASSERT (!jm->get().empty()); + shared_ptr last = dynamic_pointer_cast (jm->get().back()); + DCPOMATIC_ASSERT (last); + + VerifyDCPDialog* d = new VerifyDCPDialog (this, last); + d->ShowModal (); + d->Destroy (); + } + void tools_check_for_updates () { UpdateChecker::instance()->run (); @@ -242,10 +509,150 @@ private: _update_news_requested = false; } + void config_changed () + { + /* Instantly save any config changes when using the player GUI */ + try { + Config::instance()->write_config(); + } 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() + ) + ); + } + + for (int i = 0; i < _history_items; ++i) { + delete _file_menu->Remove (ID_file_history + i); + } + + if (_history_separator) { + _file_menu->Remove (_history_separator); + } + delete _history_separator; + _history_separator = 0; + + int pos = _history_position; + + vector history = Config::instance()->player_history (); + + if (!history.empty ()) { + _history_separator = _file_menu->InsertSeparator (pos++); + } + + for (size_t i = 0; i < history.size(); ++i) { + string s; + if (i < 9) { + s = String::compose ("&%1 %2", i + 1, history[i].string()); + } else { + s = history[i].string(); + } + _file_menu->Insert (pos++, ID_file_history + i, std_to_wx (s)); + } + + _history_items = history.size (); + } + + void set_menu_sensitivity () + { + _tools_verify->Enable (static_cast(_film)); + _file_add_ov->Enable (static_cast(_film)); + _file_add_kdm->Enable (static_cast(_film)); + _view_cpl->Enable (static_cast(_film)); + } + + void start_stop_pressed () + { + if (_viewer->playing()) { + _viewer->stop(); + } else { + _viewer->start(); + } + } + + void back_frame () + { + _viewer->back_frame (); + } + + void forward_frame () + { + _viewer->forward_frame (); + } + +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->caption) { + i->set_use (true); + } + + if (dcp->video) { + Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + if (r) { + _film->set_container(r); + } + } + } + bool _update_news_requested; PlayerInformation* _info; + wxPreferencesEditor* _config_dialog; + wxMenu* _file_menu; + wxMenuItem* _view_cpl; + wxMenu* _cpl_menu; + int _history_items; + int _history_position; + wxMenuItem* _history_separator; FilmViewer* _viewer; boost::shared_ptr _film; + boost::signals2::scoped_connection _config_changed_connection; + wxMenuItem* _file_add_ov; + wxMenuItem* _file_add_kdm; + wxMenuItem* _tools_verify; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -253,6 +660,32 @@ static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; +class PlayServer : public Server +{ +public: + explicit PlayServer (DOMFrame* frame) + : Server (PLAYER_PLAY_PORT) + , _frame (frame) + {} + + void handle (shared_ptr socket) + { + try { + int const length = socket->read_uint32 (); + scoped_array buffer (new char[length]); + socket->read (reinterpret_cast (buffer.get()), length); + string s (buffer.get()); + signal_manager->when_idle (bind (&DOMFrame::load_dcp, _frame, s)); + socket->write (reinterpret_cast ("OK"), 3); + } catch (...) { + + } + } + +private: + DOMFrame* _frame; +}; + /** @class App * @brief The magic App class for wxWidgets. */ @@ -272,20 +705,9 @@ private: wxInitAllImageHandlers (); Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - wxSplashScreen* splash = 0; - try { - if (!Config::have_existing ("config.xml")) { - wxBitmap bitmap; - boost::filesystem::path p = shared_path () / "splash.png"; - if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { - splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); - wxYield (); - } - } - } catch (boost::filesystem::filesystem_error& e) { - /* Maybe we couldn't find the splash image; never mind */ - } + wxSplashScreen* splash = maybe_show_splash (); SetAppName (_("DCP-o-matic Player")); @@ -333,20 +755,19 @@ private: signal_manager = new wxSignalManager (this); + PlayServer* server = new PlayServer (_frame); + new thread (boost::bind (&PlayServer::run, server)); + 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 (%2)")), _dcp_to_load, e.what()))); + error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what())); } } Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - Bind (wxEVT_TIMER, boost::bind (&App::check, this)); - _timer.reset (new wxTimer (this)); - _timer->Start (1000); - if (Config::instance()->check_for_updates ()) { UpdateChecker::instance()->run (); } @@ -355,7 +776,7 @@ private: } catch (exception& e) { - error_dialog (0, wxString::Format ("DCP-o-matic Player could not start: %s", e.what ())); + error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what())); return true; } @@ -418,22 +839,17 @@ private: signal_manager->ui_idle (); } - void check () + void config_failed_to_load () { - try { - EncodeServerFinder::instance()->rethrow (); - } catch (exception& e) { - error_dialog (0, std_to_wx (e.what ())); - } + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); } - void config_failed_to_load () + void config_warning (string m) { - message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + message_dialog (_frame, std_to_wx (m)); } DOMFrame* _frame; - shared_ptr _timer; string _dcp_to_load; };