X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_server.cc;h=9c483213830affc100d8b2356505bdee7ccb27f0;hb=3bfeb92017daec917e7fbfc9da34adfd9be2d652;hp=ad990740eb792718ad6e78388693e86b44c42bac;hpb=66469adf1bd6e5c288542dda601a66b22d955794;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index ad990740e..9c4832138 100644
--- 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"
@@ -27,6 +28,7 @@
 #include "lib/log.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>
@@ -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;
@@ -146,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);
@@ -205,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.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"));
 
@@ -267,7 +260,11 @@ 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));
@@ -282,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));
@@ -304,7 +313,7 @@ private:
 
 	void main_thread ()
 	try {
-		EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
+		EncodeServer server (false, Config::instance()->server_encoding_threads());
 		server.run ();
 	} catch (...) {
 		store_current ();