A couple of missing std_to_wx calls.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index a0221424e24a999cf8b97c8395abcb57d1595d83..850d1ed8a5778efb500bc612fe7d6cdc9c7b8834 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -41,6 +41,7 @@
 #include <wx/splash.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
+#include <wx/progdlg.h>
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -61,6 +62,7 @@ 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,
@@ -98,6 +100,7 @@ public:
                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<int>()), ID_view_scale_appropriate);
@@ -126,22 +129,25 @@ public:
        void set_decode_reduction (optional<int> reduction)
        {
                _viewer->set_dcp_decode_reduction (reduction);
+               _info->triggered_update ();
        }
 
        void load_dcp (boost::filesystem::path dir)
        {
                _film.reset (new Film (optional<boost::filesystem::path>()));
                shared_ptr<DCPContent> 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 ();
 
                DCPOMATIC_ASSERT (!jm->get().empty());
 
@@ -167,6 +173,9 @@ private:
                file->Append (ID_file_open, _("&Open...\tCtrl-O"));
                file->Append (ID_file_add_ov, _("&Add OV..."));
                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"));
@@ -209,12 +218,12 @@ private:
 
        void file_open ()
        {
-               wxDirDialog* c = new wxDirDialog (
-                       this,
-                       _("Select DCP to open"),
-                       wxStandardPaths::Get().GetDocumentsDir(),
-                       wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST
-                       );
+               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) {
@@ -227,7 +236,9 @@ private:
                }
 
                if (r == wxID_OK) {
-                       load_dcp (wx_to_std (c->GetPath ()));
+                       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 ();
@@ -273,7 +284,7 @@ private:
                        try {
                                dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
                        } catch (exception& e) {
-                               error_dialog (this, wxString::Format (_("Could not load KDM (%s)"), e.what ()));
+                               error_dialog (this, wxString::Format (_("Could not load KDM (%s)"), std_to_wx(e.what())));
                                d->Destroy ();
                                return;
                        }
@@ -285,6 +296,12 @@ private:
                _info->triggered_update ();
        }
 
+       void file_close ()
+       {
+               _viewer->set_film (shared_ptr<Film>());
+               _info->triggered_update ();
+       }
+
        void file_exit ()
        {
                Close ();
@@ -475,7 +492,7 @@ private:
        }
        catch (exception& e)
        {
-               error_dialog (0, wxString::Format ("DCP-o-matic Player could not start: %s", e.what ()));
+               error_dialog (0, wxString::Format ("DCP-o-matic Player could not start: %s", std_to_wx(e.what())));
                return true;
        }