X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server_cli.cc;h=d1bee2dcc8cd3d64bb9b431528a627e4e8a4a7b8;hb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;hp=fa13ebb5fb8770fae62d16ccb898cebfa00da282;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index fa13ebb5f..d1bee2dcc 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -28,6 +28,7 @@
 #include "lib/null_log.h"
 #include "lib/version.h"
 #include "lib/encode_server.h"
+#include "lib/dcpomatic_log.h"
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
@@ -64,7 +65,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup_path_encoding ();
 	dcpomatic_setup ();
 
-	int num_threads = Config::instance()->num_local_encoding_threads ();
+	int num_threads = Config::instance()->server_encoding_threads ();
 	bool verbose = false;
 	bool write_log = false;
 
@@ -104,14 +105,11 @@ main (int argc, char* argv[])
 		}
 	}
 
-	shared_ptr<Log> log;
 	if (write_log) {
-		log.reset (new FileLog ("dcpomatic_server_cli.log"));
-	} else {
-		log.reset (new NullLog);
+		dcpomatic_log.reset (new FileLog("dcpomatic_server_cli.log"));
 	}
 
-	EncodeServer server (log, verbose, num_threads);
+	EncodeServer server (verbose, num_threads);
 
 	try {
 		server.run ();