Extract common code out into kdm_for_screen()

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 4e9d5592dcdd875882c61f9aa6b0f886372ced1c..cb4779ee3722c949278a7bdb1f4b4501f0a83164 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -20,15 +20,17 @@
 
 #include "wx/wx_util.h"
 #include "wx/wx_signal_manager.h"
+#include "wx/static_text.h"
 #include "lib/util.h"
 #include "lib/encoded_log_entry.h"
 #include "lib/encode_server.h"
 #include "lib/config.h"
 #include "lib/log.h"
-#include "lib/raw_convert.h"
 #include "lib/signaller.h"
 #include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
 #include <wx/taskbar.h>
+#include <wx/splash.h>
 #include <wx/icon.h>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -58,6 +60,9 @@ static unsigned int const log_lines = 32;
 class ServerLog : public Log, public Signaller
 {
 public:
+       ServerLog ()
+               : _fps (0)
+       {}
 
        string get () const {
                string a;
@@ -67,11 +72,6 @@ public:
                return a;
        }
 
-       string head_and_tail (int) const {
-               /* Not necessary */
-               return "";
-       }
-
        float fps () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _fps;
@@ -140,13 +140,17 @@ public:
                : wxDialog (
                        0, wxID_ANY, _("DCP-o-matic Encode Server"),
                        wxDefaultPosition, wxDefaultSize,
+#ifdef DCPOMATIC_OSX
+                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
+#else
                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+#endif
                        )
        {
                wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 
                add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
-               _fps = new wxStaticText (this, wxID_ANY, wxT(""));
+               _fps = new StaticText (this, wxT(""));
                state_sizer->Add (_fps);
 
                wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@ -206,18 +210,17 @@ public:
                : _status (0)
        {
 #ifdef DCPOMATIC_WINDOWS
-               wxIcon icon (std_to_wx ("taskbar_icon"));
+               wxIcon icon (std_to_wx ("id"));
 #else
-               wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif
 
                SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit);
+               Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::status, this), ID_status);
+               Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
        }
 
        wxMenu* CreatePopupMenu ()
@@ -250,7 +253,6 @@ class App : public wxApp, public ExceptionStore
 public:
        App ()
                : wxApp ()
-               , _thread (0)
                , _icon (0)
        {}
 
@@ -262,7 +264,16 @@ private:
                        return false;
                }
 
+               wxInitAllImageHandlers ();
+
                server_log.reset (new ServerLog);
+               server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
+               dcpomatic_log = server_log;
+
+               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 ();
 
                dcpomatic_setup_path_encoding ();
                dcpomatic_setup_i18n ();
@@ -272,13 +283,31 @@ private:
                signal_manager = new wxSignalManager (this);
                Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
+               /* Bad things happen (on Linux at least) if the config is reloaded by main_thread;
+                  it seems like there's a race which results in the locked_sstream mutex being
+                  locked before it is initialised.  Calling Config::instance() here loads the config
+                  again in this thread, which seems to work around the problem.
+               */
+               Config::instance();
+
+#ifdef DCPOMATIC_LINUX
+               StatusDialog* d = new StatusDialog ();
+               d->Show ();
+#else
                _icon = new TaskBarIcon;
-               _thread = new thread (bind (&App::main_thread, this));
+#endif
+               _thread = thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));
                _timer.reset (new wxTimer (this));
                _timer->Start (1000);
 
+               if (splash) {
+                       splash->Destroy ();
+               }
+
+               SetExitOnFrameDelete (false);
+
                return true;
        }
 
@@ -290,7 +319,7 @@ private:
 
        void main_thread ()
        try {
-               EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads());
+               EncodeServer server (false, Config::instance()->server_encoding_threads());
                server.run ();
        } catch (...) {
                store_current ();
@@ -314,7 +343,17 @@ private:
                signal_manager->ui_idle ();
        }
 
-       boost::thread* _thread;
+       void config_failed_to_load ()
+       {
+               message_dialog (0, _("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 (0, std_to_wx (m));
+       }
+
+       boost::thread _thread;
        TaskBarIcon* _icon;
        shared_ptr<wxTimer> _timer;
 };