Add a load of explicit keywords.

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

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 3088743547b0ed1f7f3e3b6b0b2df574dea94ed1..f6197b1e22f7bc473cfb9fc2622c1f7e11383d66 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,7 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/job_manager_view.h"
-#include "wx/config_dialog.h"
+#include "wx/full_config_dialog.h"
 #include "wx/servers_list_dialog.h"
 #include "lib/version.h"
 #include "lib/compose.hpp"
@@ -34,6 +34,7 @@
 #include <wx/aboutdlg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
+#include <wx/splash.h>
 #include <wx/preferences.h>
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
@@ -90,7 +91,7 @@ setup_menu (wxMenuBar* m)
 class DOMFrame : public wxFrame
 {
 public:
-       DOMFrame (wxString const & title)
+       explicit DOMFrame (wxString const & title)
                : wxFrame (NULL, -1, title)
                , _sizer (new wxBoxSizer (wxVERTICAL))
                , _config_dialog (0)
@@ -136,7 +137,7 @@ public:
                } catch (std::exception& e) {
                        wxString p = std_to_wx (path.string ());
                        wxCharBuffer b = p.ToUTF8 ();
-                       error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
+                       error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
                }
        }
 
@@ -190,7 +191,7 @@ private:
        void edit_preferences ()
        {
                if (!_config_dialog) {
-                       _config_dialog = create_config_dialog ();
+                       _config_dialog = create_full_config_dialog ();
                }
                _config_dialog->Show (this);
        }
@@ -251,8 +252,8 @@ static const wxCmdLineEntryDesc command_line_description[] = {
 class JobServer : public Server
 {
 public:
-       JobServer (DOMFrame* frame)
-               : Server (Config::instance()->server_port_base() + 2)
+       explicit JobServer (DOMFrame* frame)
+               : Server (BATCH_JOB_PORT)
                , _frame (frame)
        {}
 
@@ -279,6 +280,12 @@ class App : public wxApp
        bool OnInit ()
        {
                SetAppName (_("DCP-o-matic Batch Converter"));
+               is_batch_converter = true;
+
+               Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+               Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+               wxSplashScreen* splash = maybe_show_splash ();
 
                if (!wxApp::OnInit()) {
                        return false;
@@ -308,12 +315,15 @@ class App : public wxApp
                */
                Config::drop ();
 
-               DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
-               SetTopWindow (f);
-               f->Maximize ();
-               f->Show ();
+               _frame = new DOMFrame (_("DCP-o-matic Batch Converter"));
+               SetTopWindow (_frame);
+               _frame->Maximize ();
+               if (splash) {
+                       splash->Destroy ();
+               }
+               _frame->Show ();
 
-               JobServer* server = new JobServer (f);
+               JobServer* server = new JobServer (_frame);
                new thread (boost::bind (&JobServer::run, server));
 
                signal_manager = new wxSignalManager (this);
@@ -328,12 +338,9 @@ class App : public wxApp
                                        film->make_dcp ();
                                } catch (exception& e) {
                                        error_dialog (
-                                               0, std_to_wx (
-                                                       String::compose (
-                                                               wx_to_std (_("Could not load film %1 (%2)")), i.string(),
-                                                               e.what()
-                                                               )
-                                                       )
+                                               0,
+                                               std_to_wx (String::compose (wx_to_std (_("Could not load film %1")), i.string())),
+                                               std_to_wx(e.what())
                                                );
                                }
                        }
@@ -361,6 +368,18 @@ class App : public wxApp
 
                return true;
        }
+
+       void config_failed_to_load ()
+       {
+               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;
 };
 
 IMPLEMENT_APP (App)