X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=7008495c60e58f188bf4cd56fd206e93fe8eb45f;hb=634521677764f1c5f74ea46fa6531cb39f3a7492;hp=c20c3cbd88d5490aab84ab5b7cccb046804e8a42;hpb=23f2dc3bfb94930b938281c7f1e5663b761fa508;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index c20c3cbd8..7008495c6 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -49,6 +49,8 @@ #include "lib/scoped_temporary.h" #include "lib/monitor_checker.h" #include +#include +#include #include #include #include @@ -171,6 +173,9 @@ public: _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)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + _viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this)); +#endif _info = new PlayerInformation (_overall_panel, _viewer); setup_main_sizer (Config::instance()->player_mode()); #ifdef __WXOSX__ @@ -194,15 +199,51 @@ 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 (); #endif setup_screen (); + +#ifdef DCPOMATIC_VARIANT_SWAROOP + if ( + boost::filesystem::is_regular_file(Config::path("position")) && + boost::filesystem::is_regular_file(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]; + fscanf (f, "%63s", buffer); + _viewer->seek (DCPTime(atoi(buffer)), true); + _viewer->start (); + fclose (f); + } + } + +#endif + } + + void position_changed () + { + if (!_viewer->playing() || _viewer->position().get() % DCPTime::HZ) { + return; + } + + FILE* f = fopen_boost (Config::path("position"), "w"); + if (f) { + string const p = dcp::raw_convert (_viewer->position().get()); + fwrite (p.c_str(), p.length(), 1, f); + fclose (f); + } } +#ifdef DCPOMATIC_VARIANT_SWAROOP void monitor_checker_state_changed () { if (!MonitorChecker::instance()->ok()) { @@ -210,6 +251,7 @@ public: _viewer->stop (); } } +#endif void setup_main_sizer (Config::PlayerMode mode) { @@ -294,6 +336,14 @@ public: void playback_stopped (DCPTime time) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + try { + boost::filesystem::remove (Config::path("position")); + } catch (...) { + /* Never mind */ + } +#endif + optional log = Config::instance()->player_log_file(); if (!log) { return; @@ -313,14 +363,20 @@ public: void load_dcp (boost::filesystem::path dir) { - dcp::DCP dcp (dir); - dcp.read (); - list spl; - BOOST_FOREACH (shared_ptr j, dcp.cpls()) { - spl.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 @@ -366,52 +422,31 @@ public: return optional(); } - void set_spl (list spl) + void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) { - if (_viewer->playing ()) { - _viewer->stop (); + _film = film; + _viewer->set_film (_film); + _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); + } + + 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.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) { - 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); @@ -426,12 +461,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); @@ -439,34 +474,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.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; + } } } } @@ -595,8 +631,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) { @@ -647,8 +683,7 @@ private: void file_close () { - _viewer->set_film (shared_ptr()); - _film.reset (); + reset_film (); _info->triggered_update (); set_menu_sensitivity (); } @@ -771,7 +806,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; } @@ -922,46 +957,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; @@ -1075,6 +1070,8 @@ private: */ Config::drop (); + signal_manager = new wxSignalManager (this); + _frame = new DOMFrame (); SetTopWindow (_frame); _frame->Maximize (); @@ -1083,8 +1080,6 @@ private: } _frame->Show (); - signal_manager = new wxSignalManager (this); - PlayServer* server = new PlayServer (_frame); new thread (boost::bind (&PlayServer::run, server));