X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=473cc6d8bd7f17e696c5e89d30afd2e070863041;hb=264583479e79b481251f1772b228f82cd77552d3;hp=e855a1cc6042dd582f7bcf19f15de724391117e5;hpb=f598e06928af82fee1d2b25bc4cf25f560478ad4;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index e855a1cc6..473cc6d8b 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -36,8 +36,6 @@ #include "lib/compose.hpp" #include "lib/dcp_content.h" #include "lib/job_manager.h" -#include "lib/spl.h" -#include "lib/spl_entry.h" #include "lib/job.h" #include "lib/film.h" #include "lib/video_content.h" @@ -50,8 +48,11 @@ #include "lib/dcpomatic_socket.h" #include "lib/scoped_temporary.h" #include "lib/monitor_checker.h" +#include "lib/lock_file_checker.h" +#include "lib/ffmpeg_content.h" #include #include +#include #include #include #include @@ -200,11 +201,14 @@ 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); + reset_film (); + 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 (); + LockFileChecker::instance()->StateChanged.connect(boost::bind(&DOMFrame::lock_checker_state_changed, this)); + LockFileChecker::instance()->run (); #endif setup_screen (); @@ -213,7 +217,9 @@ public: boost::filesystem::is_regular_file(Config::path("position")) && boost::filesystem::is_regular_file(Config::path("spl.xml"))) { - set_spl (SPL(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]; @@ -241,13 +247,23 @@ public: } } +#ifdef DCPOMATIC_VARIANT_SWAROOP void monitor_checker_state_changed () { if (!MonitorChecker::instance()->ok()) { + _viewer->stop (); error_dialog (this, _("The required display devices are not connected correctly.")); + } + } + + void lock_checker_state_changed () + { + if (!LockFileChecker::instance()->ok()) { _viewer->stop (); + error_dialog (this, _("The lock file is not present.")); } } +#endif void setup_main_sizer (Config::PlayerMode mode) { @@ -268,6 +284,10 @@ public: error_dialog (this, _("The required display devices are not connected correctly.")); return false; } + if (!LockFileChecker::instance()->ok()) { + error_dialog (this, _("The lock file is not present.")); + return false; + } #endif if (!_film || !Config::instance()->respect_kdm_validity_periods()) { return true; @@ -295,26 +315,42 @@ public: 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; + FILE* f = fopen_boost(*log, "a"); + + /* XXX: this only logs the first piece of content; probably should be each piece? */ + + shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); + if (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); + + 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() + ); + } + + shared_ptr ffmpeg = dynamic_pointer_cast(_film->content().front()); + if (ffmpeg) { + fprintf ( + f, + "%s playback-started %s %s\n", + dcp::LocalTime().as_string().c_str(), + time.timecode(_film->video_frame_rate()).c_str(), + ffmpeg->path(0).string().c_str() + ); } - 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); } @@ -359,14 +395,20 @@ public: void load_dcp (boost::filesystem::path dir) { - dcp::DCP dcp (dir); - dcp.read (); - SPL spl; - BOOST_FOREACH (shared_ptr j, dcp.cpls()) { - spl.playlist.push_back (SPLEntry(j, dir)); + DCPOMATIC_ASSERT (_film); + + reset_film (); + try { + 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())); } - set_spl (spl); - Config::instance()->add_to_player_history (dir); } #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -412,62 +454,37 @@ public: return optional(); } - void set_spl (SPL spl) + void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) { -#ifdef DCPOMATIC_VARIANT_SWAROOP - spl.as_xml (Config::path("spl.xml")); -#endif + _film = film; + _viewer->set_film (_film); + _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); + } - if (_viewer->playing ()) { - _viewer->stop (); + void film_changed (ChangeType type, Film::Property property) + { + if (type != CHANGE_TYPE_DONE || property != Film::CONTENT) { + return; } - _film.reset (new Film (optional())); + _film->write_metadata (Config::path("spl.xml")); - if (spl.playlist.empty ()) { - _viewer->set_film (_film); - _info->triggered_update (); - return; + if (_viewer->playing ()) { + _viewer->stop (); } /* Start off as Flat */ _film->set_container (Ratio::from_id("185")); - /* Put 1 frame of black at the start so when we seek to 0 we don't see anything */ - DCPTime position = DCPTime::from_frames(1, _film->video_frame_rate()); - shared_ptr first; - - BOOST_FOREACH (SPLEntry i, spl.playlist) { - 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()) { + 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); + kdm = get_kdm_from_directory (dcp); } if (kdm) { @@ -476,12 +493,12 @@ public: } } - BOOST_FOREACH (shared_ptr j, dcp->text) { + BOOST_FOREACH (shared_ptr j, i->text) { j->set_use (true); } - if (dcp->video) { - Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + 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); @@ -489,34 +506,35 @@ public: } /* Any 3D content means we use 3D mode */ - if (dcp->three_d()) { + 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 (); + _viewer->seek (DCPTime(), true); + _info->triggered_update (); - set_menu_sensitivity (); - _controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str())); - } + set_menu_sensitivity (); wxMenuItemList old = _cpl_menu->GetMenuItems(); for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) { _cpl_menu->Remove (*i); } - if (spl.playlist.size() == 1) { + if (_film->content().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; + 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; + } } } } @@ -645,8 +663,8 @@ 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; } BOOST_FOREACH (shared_ptr i, dcp->text) { @@ -697,8 +715,7 @@ private: void file_close () { - _viewer->set_film (shared_ptr()); - _film.reset (); + reset_film (); _info->triggered_update (); set_menu_sensitivity (); } @@ -778,6 +795,7 @@ private: _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); + _viewer->set_pad_black (_mode != Config::PLAYER_MODE_WINDOW); if (_mode == Config::PLAYER_MODE_DUAL) { _dual_screen = new wxFrame (this, wxID_ANY, wxT("")); @@ -821,7 +839,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; } @@ -972,46 +990,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; - } - wxFrame* _dual_screen; bool _update_news_requested; PlayerInformation* _info;