X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=1554c02f4541ff11374b06ceddc41afffc5c43f3;hb=257fce15e8b4dfa112d039e7888e3ec04e523198;hp=9214d8385336dc1a6b9a0cf415495c096fc73437;hpb=d81704ba871e048eca2f6a5428d22570ac9c24da;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 9214d8385..1554c02f4 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,7 +28,9 @@
 #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>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -57,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;
@@ -139,13 +145,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);
@@ -207,13 +217,7 @@ public:
 #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
@@ -266,7 +270,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 ();
@@ -276,13 +289,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;
+#endif
 		_thread = new 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;
 	}
 
@@ -294,7 +325,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 ();
@@ -318,6 +349,16 @@ private:
 		signal_manager->ui_idle ();
 	}
 
+	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;