X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=6bd5b36ffd1f0f61974c6b94d9de177f7a632aa3;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hp=8422df28e78ff24dcf7666a5b5b757870a05d629;hpb=b7e546d9685c0a3304faa48e95516915d811ec5c;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 8422df28e..6bd5b36ff 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -30,6 +30,7 @@ #include "wx/standard_controls.h" #include "wx/swaroop_controls.h" #include "wx/timer_display.h" +#include "wx/system_information_dialog.h" #include "lib/cross.h" #include "lib/config.h" #include "lib/util.h" @@ -65,6 +66,9 @@ #include #include #include +#ifdef __WXGTK__ +#include +#endif #ifdef __WXOSX__ #include #endif @@ -89,6 +93,7 @@ using boost::optional; using boost::dynamic_pointer_cast; using boost::thread; using boost::bind; +using namespace dcpomatic; enum { ID_file_open = 1, @@ -110,6 +115,7 @@ enum { ID_tools_verify, ID_tools_check_for_updates, ID_tools_timing, + ID_tools_system_information, /* IDs for shortcuts (with no associated menu item) */ ID_start_stop, ID_back_frame, @@ -130,6 +136,7 @@ public: , _history_items (0) , _history_position (0) , _history_separator (0) + , _system_information_dialog (0) , _view_full_screen (0) , _view_dual_screen (0) { @@ -171,6 +178,7 @@ public: 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); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_timing, this), ID_tools_timing); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this), ID_tools_system_information); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. @@ -282,6 +290,15 @@ public: } } +#ifdef DCPOMATIC_VARIANT_SWAROOP + BOOST_FOREACH (shared_ptr i, _film->content()) { + shared_ptr c = dynamic_pointer_cast(i); + if (c && !c->kdm_timing_window_valid()) { + ok = false; + } + } +#endif + if (!ok) { error_dialog (this, _("The KDM does not allow playback of this content at this time.")); } @@ -298,7 +315,7 @@ public: shared_ptr dcp = dynamic_pointer_cast(_film->content().front()); if (dcp) { - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); shared_ptr playing_cpl; BOOST_FOREACH (shared_ptr i, ex.cpls()) { if (!dcp->cpl() || i->id() == *dcp->cpl()) { @@ -380,6 +397,8 @@ public: void reset_film (shared_ptr film = shared_ptr(new Film(optional()))) { _film = film; + _film->set_tolerant (true); + _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS); _viewer->set_film (_film); _controls->set_film (_film); _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2)); @@ -434,7 +453,7 @@ public: /* Offer a CPL menu */ shared_ptr first = dynamic_pointer_cast(_film->content().front()); if (first) { - DCPExaminer ex (first); + DCPExaminer ex (first, true); int id = ID_view_cpl; BOOST_FOREACH (shared_ptr i, ex.cpls()) { wxMenuItem* j = _cpl_menu->AppendRadioItem( @@ -450,12 +469,27 @@ public: private: + bool report_errors_from_last_job (wxWindow* parent) const + { + JobManager* jm = JobManager::instance (); + + DCPOMATIC_ASSERT (!jm->get().empty()); + + shared_ptr last = jm->get().back(); + if (last->finished_in_error()) { + error_dialog(parent, wxString::Format(_("Could not load DCP.\n\n%s."), std_to_wx(last->error_summary()).data()), std_to_wx(last->error_details())); + return false; + } + + return true; + } + void setup_menu (wxMenuBar* m) { _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...")); + _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("Add &KDM...")); _history_position = _file_menu->GetMenuItems().GetCount(); @@ -502,6 +536,7 @@ private: tools->AppendSeparator (); tools->Append (ID_tools_check_for_updates, _("Check for updates")); tools->Append (ID_tools_timing, _("Timing...")); + tools->Append (ID_tools_system_information, _("System information...")); wxMenu* help = new wxMenu; #ifdef __WXOSX__ @@ -598,11 +633,27 @@ private: if (d->ShowModal() == wxID_OK) { DCPOMATIC_ASSERT (_film); +#ifdef DCPOMATIC_VARIANT_SWAROOP + shared_ptr ffmpeg = boost::dynamic_pointer_cast(_film->content().front()); + if (ffmpeg) { + try { + ffmpeg->add_kdm (EncryptedECinemaKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); + } catch (exception& e) { + error_dialog (this, wxString::Format(_("Could not load KDM.")), std_to_wx(e.what())); + d->Destroy(); + return; + } + } +#endif shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); +#ifndef DCPOMATIC_VARIANT_SWAROOP DCPOMATIC_ASSERT (dcp); +#endif try { - dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); - dcp->examine (_film, shared_ptr()); + if (dcp) { + dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE))); + dcp->examine (_film, shared_ptr()); + } } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); d->Destroy (); @@ -655,7 +706,7 @@ private: { shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); int id = ev.GetId() - ID_view_cpl; DCPOMATIC_ASSERT (id >= 0); DCPOMATIC_ASSERT (id < int(ex.cpls().size())); @@ -779,6 +830,15 @@ private: d->Destroy (); } + void tools_system_information () + { + if (!_system_information_dialog) { + _system_information_dialog = new SystemInformationDialog (this, _viewer); + } + + _system_information_dialog->Show (); + } + void help_about () { AboutDialog* d = new AboutDialog (this); @@ -936,6 +996,7 @@ private: wxMenuItem* _history_separator; shared_ptr _viewer; Controls* _controls; + SystemInformationDialog* _system_information_dialog; boost::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; wxMenuItem* _file_add_ov; @@ -986,7 +1047,11 @@ public: App () : wxApp () , _frame (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: