X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=d8c3c59fe0570f9572ebd3bee2560cdf49c205a1;hb=cb82f3c177b53ce99c8443a74da316a94ae829ac;hp=9b45affd2a5c5576be947c29893fded65a541be0;hpb=b6d292349cbe43a97db7d7314a4fe3c0c5cb8566;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 9b45affd2..d8c3c59fe 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -18,6 +18,17 @@ */ + +#include "wx/wx_signal_manager.h" +#include "wx/wx_util.h" +#include "wx/about_dialog.h" +#include "wx/report_problem_dialog.h" +#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 "wx/controls.h" #include "lib/cross.h" #include "lib/config.h" #include "lib/util.h" @@ -26,20 +37,15 @@ #include "lib/dcp_content.h" #include "lib/job_manager.h" #include "lib/job.h" +#include "lib/film.h" #include "lib/video_content.h" -#include "lib/subtitle_content.h" +#include "lib/text_content.h" #include "lib/ratio.h" #include "lib/verify_dcp_job.h" #include "lib/dcp_examiner.h" -#include "wx/wx_signal_manager.h" -#include "wx/wx_util.h" -#include "wx/about_dialog.h" -#include "wx/report_problem_dialog.h" -#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 "lib/examine_content_job.h" +#include "lib/server.h" +#include "lib/dcpomatic_socket.h" #include #include #include @@ -64,8 +70,11 @@ 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, @@ -76,7 +85,8 @@ enum { ID_file_close = 100, ID_view_cpl, /* Allow spare IDs for CPLs */ - ID_view_scale_appropriate = 200, + ID_view_closed_captions = 200, + ID_view_scale_appropriate, ID_view_scale_full, ID_view_scale_half, ID_view_scale_quarter, @@ -101,7 +111,6 @@ public: , _history_items (0) , _history_position (0) , _history_separator (0) - , _viewer (0) { #if defined(DCPOMATIC_WINDOWS) @@ -128,6 +137,7 @@ public: 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); @@ -142,11 +152,13 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _viewer = new FilmViewer (overall_panel, false, false); + _viewer.reset (new FilmViewer (overall_panel)); + _controls = new Controls (overall_panel, _viewer); _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 (_viewer->panel(), 1, wxEXPAND | wxALL, 6); + main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); overall_panel->SetSizer (main_sizer); @@ -193,39 +205,17 @@ public: } _film->examine_and_add_content (dcp, true); - - JobManager* jm = JobManager::instance (); - - wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), _("Loading DCP")); - - while (jm->work_to_do() || signal_manager->ui_idle()) { - dcpomatic_sleep (1); - progress->Pulse (); - } - - progress->Destroy (); - - 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())); + bool const ok = progress (_("Loading DCP")); + if (!ok || !report_errors_from_last_job()) { return; } - if (dcp->subtitle) { - dcp->subtitle->set_use (true); - } + setup_from_dcp (dcp); if (dcp->three_d()) { _film->set_three_d (true); } - Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); - if (r) { - _film->set_container(r); - } - _viewer->set_film (_film); _viewer->set_position (DCPTime ()); _info->triggered_update (); @@ -242,10 +232,12 @@ public: 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); - } + 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; } } @@ -282,6 +274,7 @@ private: 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); @@ -362,11 +355,12 @@ private: shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); dcp->add_ov (wx_to_std(c->GetPath())); - dcp->examine (shared_ptr()); - /* Maybe we just gained some subtitles */ - if (dcp->subtitle) { - dcp->subtitle->set_use (true); + 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 (); @@ -444,6 +438,11 @@ private: 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()); @@ -451,21 +450,16 @@ private: JobManager* jm = JobManager::instance (); jm->add (shared_ptr (new VerifyDCPJob (dcp->directories()))); - - wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), _("Verifying DCP")); - - while (jm->work_to_do() || signal_manager->ui_idle()) { - dcpomatic_sleep (1); - progress->Pulse (); + bool const ok = progress (_("Verifying DCP")); + if (!ok) { + return; } - progress->Destroy (); - DCPOMATIC_ASSERT (!jm->get().empty()); shared_ptr last = dynamic_pointer_cast (jm->get().back()); DCPOMATIC_ASSERT (last); - VerifyDCPDialog* d = new VerifyDCPDialog (this, last->notes ()); + VerifyDCPDialog* d = new VerifyDCPDialog (this, last); d->ShowModal (); d->Destroy (); } @@ -585,12 +579,68 @@ private: void back_frame () { - _viewer->back_frame (); + _viewer->move (-_viewer->one_video_frame()); } void forward_frame () { - _viewer->forward_frame (); + _viewer->move (_viewer->one_video_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->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); + } + } } bool _update_news_requested; @@ -602,7 +652,8 @@ private: int _history_items; int _history_position; wxMenuItem* _history_separator; - FilmViewer* _viewer; + shared_ptr _viewer; + Controls* _controls; boost::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; wxMenuItem* _file_add_ov; @@ -615,6 +666,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. */ @@ -684,6 +761,9 @@ 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);