summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic_server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-06 19:59:47 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-11 11:56:22 +0000
commit17df947ac256397311a11894062070f8069c7e75 (patch)
treebb84d231ae31cab2e7e4d6546c62fcd88150b4d8 /src/tools/dcpomatic_server.cc
parentd499ec381ea5fbbae954531be9d66c9cc723c230 (diff)
Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription -> EncodeServerDescription.
Diffstat (limited to 'src/tools/dcpomatic_server.cc')
-rw-r--r--src/tools/dcpomatic_server.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index cc783ede7..e339b1966 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -21,7 +21,7 @@
#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"
@@ -291,7 +291,7 @@ private:
void main_thread ()
try {
- Server server (server_log, false);
+ EncodeServer server (server_log, false);
server.run (Config::instance()->num_local_encoding_threads ());
} catch (...) {
store_current ();