X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=1a3a8de1a1b06c95703ee65461c001349e4ce720;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=2b22aca7d8d8d077fa03dce8956712d5a4dd5c1b;hpb=b90793b0bd6d5f02b85cc8de0f87f713e9ffce61;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 2b22aca7d..1a3a8de1a 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>
@@ -146,7 +148,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);
@@ -268,6 +270,7 @@ private:
 		}
 
 		server_log.reset (new ServerLog);
+		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));
@@ -304,7 +307,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 ();