X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=2b22aca7d8d8d077fa03dce8956712d5a4dd5c1b;hb=e0932b9de21dcac6d88117437ff19b79d25ac64e;hp=cc783ede79033e14f9676b49446ec287bfed2cf6;hpb=e55c3a8bdc86e64818ef26224c472dde54a16740;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index cc783ede7..2b22aca7d 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,13 +22,13 @@
 #include "wx/wx_signal_manager.h"
 #include "lib/util.h"
 #include "lib/encoded_log_entry.h"
-#include "lib/server.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 <wx/taskbar.h>
+#include <wx/splash.h>
 #include <wx/icon.h>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -52,7 +53,7 @@ enum {
 	ID_timer
 };
 
-static int const log_lines = 32;
+static unsigned int const log_lines = 32;
 
 class ServerLog : public Log, public Signaller
 {
@@ -137,7 +138,7 @@ class StatusDialog : public wxDialog
 public:
 	StatusDialog ()
 		: wxDialog (
-			0, wxID_ANY, _("DCP-o-matic encode server"),
+			0, wxID_ANY, _("DCP-o-matic Encode Server"),
 			wxDefaultPosition, wxDefaultSize,
 			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
 			)
@@ -190,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;
@@ -207,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"));
+		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 ()
@@ -265,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 ();
@@ -280,6 +289,10 @@ private:
 		_timer.reset (new wxTimer (this));
 		_timer->Start (1000);
 
+		if (splash) {
+			splash->Destroy ();
+		}
+
 		return true;
 	}
 
@@ -291,8 +304,8 @@ private:
 
 	void main_thread ()
 	try {
-		Server server (server_log, false);
-		server.run (Config::instance()->num_local_encoding_threads ());
+		EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
+		server.run ();
 	} catch (...) {
 		store_current ();
 	}
@@ -315,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;