X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=2b22aca7d8d8d077fa03dce8956712d5a4dd5c1b;hb=e8485a82f099e8c1cac35af6cabb4130fff40e50;hp=a23e56ccde8af84d72f75ed24298dca1917a7764;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index a23e56ccd..2b22aca7d 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -25,10 +25,10 @@
 #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 <wx/taskbar.h>
+#include <wx/splash.h>
 #include <wx/icon.h>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -191,9 +191,7 @@ private:
 
 	void update_state ()
 	{
-		SafeStringStream s;
-		s << fixed << setprecision(1) << server_log->fps ();
-		_fps->SetLabel (std_to_wx (s.str()));
+		_fps->SetLabel (wxString::Format ("%.1f", server_log->fps()));
 	}
 
 	wxTextCtrl* _text;
@@ -208,18 +206,23 @@ public:
 		: _status (0)
 	{
 #ifdef DCPOMATIC_WINDOWS
-		wxIcon icon (std_to_wx ("taskbar_icon"));
+		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"));
 
-		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 ()
@@ -266,6 +269,11 @@ private:
 
 		server_log.reset (new ServerLog);
 
+		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 ();
 		dcpomatic_setup ();
@@ -281,6 +289,10 @@ private:
 		_timer.reset (new wxTimer (this));
 		_timer->Start (1000);
 
+		if (splash) {
+			splash->Destroy ();
+		}
+
 		return true;
 	}
 
@@ -292,7 +304,7 @@ private:
 
 	void main_thread ()
 	try {
-		EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads());
+		EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
 		server.run ();
 	} catch (...) {
 		store_current ();
@@ -316,6 +328,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;