Distinguish master DoM encode threads count from the server count.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 00087d6a0..cfd8b3eae 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -270,7 +270,7 @@ main (int argc, char* argv[])
 	}
 
 	if (threads) {
-		Config::instance()->set_num_local_encoding_threads (threads.get ());
+		Config::instance()->set_master_encoding_threads (threads.get ());
 	}
 
 	shared_ptr<Film> film;
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index aff98912f..8e9ce7537 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -289,7 +289,7 @@ private:
 
 	void main_thread ()
 	try {
-		EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads());
+		EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
 		server.run ();
 	} catch (...) {
 		store_current ();
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index fa13ebb5f..6dca8064c 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -64,7 +64,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;