X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=8e9ce7537cc3ff5ef50c65e0435de4a6d77670fa;hb=1f7f758273eb3c98356438da897b7709f8cb87f0;hp=b45e579410845ced5fb438dc18c0be8062aaa498;hpb=b0ea8e6646488e5b3ce7de28f8560aadbd5aa8bb;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index b45e57941..8e9ce7537 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,10 +22,9 @@
 #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>
@@ -52,7 +52,7 @@ enum {
 	ID_timer
 };
 
-static int const log_lines = 32;
+static unsigned int const log_lines = 32;
 
 class ServerLog : public Log, public Signaller
 {
@@ -130,14 +130,14 @@ private:
 	float _fps;
 };
 
-static shared_ptr<ServerLog> server_log (new ServerLog);
+static shared_ptr<ServerLog> server_log;
 
 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 +190,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 +205,18 @@ public:
 		: _status (0)
 	{
 #ifdef DCPOMATIC_WINDOWS
-		wxIcon icon (std_to_wx ("taskbar_icon"));
+		wxIcon icon (std_to_wx ("id"));
 #else
 		wxInitAllImageHandlers();
-		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
 		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 ()
@@ -263,6 +261,8 @@ private:
 			return false;
 		}
 
+		server_log.reset (new ServerLog);
+
 		dcpomatic_setup_path_encoding ();
 		dcpomatic_setup_i18n ();
 		dcpomatic_setup ();
@@ -289,8 +289,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 ();
 	}