Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index a4db5fc71959239e8ddc5d739f2655c552ead6c6..5ac01c348ea0a4be7a0ad4a8686687cf93a9cfae 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -162,6 +162,7 @@ public:
                }
 
                _viewer->set_film (_film);
+               _viewer->set_position (DCPTime ());
                _info->triggered_update ();
        }
 
@@ -284,7 +285,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;
                        }
@@ -413,20 +414,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"));
 
@@ -492,7 +482,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;
        }
 
@@ -560,6 +550,11 @@ private:
                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_warning (string m)
+       {
+               message_dialog (_frame, std_to_wx (m));
+       }
+
        DOMFrame* _frame;
        string _dcp_to_load;
 };