X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=a75f6b9f40d2422fde57527920c1e50f37cf4872;hb=f1dbcec7552052856369631e77c5eb160badd619;hp=5ea341fe97718929bde1c9d880e81b2e037d48e5;hpb=0b7c380031db6aa2ce546a2a0c89926f40eae6b5;p=dcpomatic.git diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 5ea341fe9..a75f6b9f4 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -23,11 +23,11 @@ #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/subtitle_content.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/about_dialog.h" @@ -35,15 +35,23 @@ #include "wx/film_viewer.h" #include "wx/player_information.h" #include "wx/update_dialog.h" -#include "wx/config_dialog.h" +#include "wx/player_config_dialog.h" #include #include #include #include #include +#include +#ifdef __WXOSX__ +#include +#endif #include #include +#ifdef check +#undef check +#endif + using std::string; using std::cout; using std::exception; @@ -52,6 +60,9 @@ using boost::optional; enum { ID_file_open = 1, + ID_file_add_ov, + ID_file_add_kdm, + ID_file_close, ID_view_scale_appropriate, ID_view_scale_full, ID_view_scale_half, @@ -78,13 +89,19 @@ 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)); + 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_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::set_decode_reduction, this, optional()), ID_view_scale_appropriate); @@ -113,36 +130,43 @@ public: void set_decode_reduction (optional reduction) { _viewer->set_dcp_decode_reduction (reduction); + _info->triggered_update (); } 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); + _film->examine_and_add_content (dcp, true); JobManager* jm = JobManager::instance (); - while (jm->work_to_do ()) { - /* XXX: progress dialog */ - while (signal_manager->ui_idle ()) {} + + wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), _("Loading DCP")); + + while (jm->work_to_do() || signal_manager->ui_idle()) { dcpomatic_sleep (1); + progress->Pulse (); } - while (signal_manager->ui_idle ()) {} + progress->Destroy (); - 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); + 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"); return; } + if (dcp->subtitle) { + dcp->subtitle->set_use (true); + } + _viewer->set_film (_film); + _viewer->set_position (DCPTime ()); _info->triggered_update (); + + set_menu_sensitivity (); } private: @@ -151,6 +175,11 @@ private: { wxMenu* file = new wxMenu; file->Append (ID_file_open, _("&Open...\tCtrl-O")); + _file_add_ov = file->Append (ID_file_add_ov, _("&Add OV...")); + _file_add_kdm = file->Append (ID_file_add_kdm, _("&Add KDM...")); + file->AppendSeparator (); + file->Append (ID_file_close, _("&Close")); + file->AppendSeparator (); #ifdef __WXOSX__ file->Append (wxID_EXIT, _("&Exit")); @@ -192,10 +221,38 @@ private: } 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 ); @@ -211,10 +268,45 @@ 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())); + dcp->examine (shared_ptr()); } 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_close () + { + _viewer->set_film (shared_ptr()); + _film.reset (); + _info->triggered_update (); + set_menu_sensitivity (); } void file_exit () @@ -225,7 +317,7 @@ private: void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_player_config_dialog (); } _config_dialog->Show (this); } @@ -280,11 +372,36 @@ 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() + ) + ); + } + } + + void set_menu_sensitivity () + { + _file_add_ov->Enable (static_cast(_film)); + _file_add_kdm->Enable (static_cast(_film)); + } + bool _update_news_requested; PlayerInformation* _info; wxPreferencesEditor* _config_dialog; FilmViewer* _viewer; boost::shared_ptr _film; + boost::signals2::scoped_connection _config_changed_connection; + wxMenuItem* _file_add_ov; + wxMenuItem* _file_add_kdm; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -311,20 +428,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")); @@ -376,16 +482,12 @@ private: 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 (); } @@ -394,7 +496,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; } @@ -457,22 +559,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; };