OSX playlist editor build fix.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 64bbb3049504139195485572cd6f46b78ec11bf6..9c483213830affc100d8b2356505bdee7ccb27f0 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -20,6 +20,7 @@
 
 #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"
@@ -59,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;
@@ -147,7 +151,7 @@ public:
                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,19 +210,7 @@ public:
        TaskBarIcon ()
                : _status (0)
        {
-#ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
-#else
-               wxInitAllImageHandlers();
-#ifdef DCPOMATIC_LINUX
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
-#ifdef DCPOMATIC_OSX
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
-               wxIcon icon;
-               icon.CopyFromBitmap (bitmap);
-#endif
 
                SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
@@ -268,7 +260,10 @@ 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));
@@ -284,7 +279,19 @@ 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();
+
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+               StatusDialog* d = new StatusDialog ();
+               d->Show ();
+#else
                _icon = new TaskBarIcon;
+#endif
                _thread = new thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));