summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic_server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 23:17:00 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 23:17:00 +0000
commitad1ef39eda58b3a919ea3b7084401a0439409ec6 (patch)
tree2bf2888a1a964f07b7dc318c7bf7dd73e1d61eb0 /src/tools/dcpomatic_server.cc
parentfe8251bb73765b459042b0fa841dae2d440487fd (diff)
Tidy and fix logging.
Diffstat (limited to 'src/tools/dcpomatic_server.cc')
-rw-r--r--src/tools/dcpomatic_server.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 2b22aca7d..64bbb3049 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -27,6 +27,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>
@@ -268,6 +269,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 +306,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 ();