Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription -> EncodeServerDescription.

5 files changed, 16 insertions, 16 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 9a350f814..0cd0bac33 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -49,7 +49,7 @@
 #include "lib/cinema.h"
 #include "lib/screen_kdm.h"
 #include "lib/send_kdm_email_job.h"
-#include "lib/server_finder.h"
+#include "lib/encode_server_finder.h"
 #include "lib/update_checker.h"
 #include "lib/cross.h"
 #include "lib/content_factory.h"
@@ -1044,7 +1044,7 @@ private:
 	void check ()
 	{
 		try {
-			ServerFinder::instance()->rethrow ();
+			EncodeServerFinder::instance()->rethrow ();
 		} catch (exception& e) {
 			error_dialog (0, std_to_wx (e.what ()));
 		}
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 14b08d299..80e10daaf 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -27,7 +27,7 @@
 #include "lib/config.h"
 #include "lib/log.h"
 #include "lib/signal_manager.h"
-#include "lib/server_finder.h"
+#include "lib/encode_server_finder.h"
 #include "lib/json_server.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
@@ -119,7 +119,7 @@ show_servers ()
 {
 	while (true) {
 		int N = 0;
-		list<ServerDescription> servers = ServerFinder::instance()->servers ();
+		list<EncodeServerDescription> servers = EncodeServerFinder::instance()->servers ();
 
 		if (Config::instance()->use_any_servers ()) {
 			if (servers.empty ()) {
@@ -128,7 +128,7 @@ show_servers ()
 			} else {
 				cout << std::left << setw(24) << "Host" << " Threads\n";
 				++N;
-				BOOST_FOREACH (ServerDescription const & i, servers) {
+				BOOST_FOREACH (EncodeServerDescription const & i, servers) {
 					cout << std::left << setw(24) << i.host_name() << " " << i.threads() << "\n";
 					++N;
 				}
@@ -144,7 +144,7 @@ show_servers ()
 				BOOST_FOREACH (string const & i, Config::instance()->servers()) {
 					cout << std::left << setw(24) << i << " ";
 					optional<int> threads;
-					BOOST_FOREACH (ServerDescription const & j, servers) {
+					BOOST_FOREACH (EncodeServerDescription const & j, servers) {
 						if (i == j.host_name()) {
 							threads = j.threads();
 						}
@@ -250,7 +250,7 @@ main (int argc, char* argv[])
 	signal_manager = new SignalManager ();
 
 	if (no_remote) {
-		ServerFinder::instance()->disable ();
+		EncodeServerFinder::instance()->disable ();
 	}
 
 	if (json_port) {
@@ -353,7 +353,7 @@ main (int argc, char* argv[])
 	*/
 	JobManager::drop ();
 
-	ServerFinder::drop ();
+	EncodeServerFinder::drop ();
 
 	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }
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 ();
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 81c553ef7..8f343b344 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -26,7 +26,7 @@
 #include "lib/file_log.h"
 #include "lib/null_log.h"
 #include "lib/version.h"
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
@@ -110,7 +110,7 @@ main (int argc, char* argv[])
 		log.reset (new NullLog);
 	}
 
-	Server server (log, verbose);
+	EncodeServer server (log, verbose);
 
 	try {
 		server.run (num_threads);
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index fdfceb567..3307d8f5c 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -21,7 +21,7 @@
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
 #include "lib/exceptions.h"
@@ -29,7 +29,7 @@
 #include "lib/video_decoder.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
-#include "lib/server_description.h"
+#include "lib/encode_server_description.h"
 #include <getopt.h>
 #include <iostream>
 #include <iomanip>
@@ -43,7 +43,7 @@ using boost::shared_ptr;
 using dcp::Data;
 
 static shared_ptr<Film> film;
-static ServerDescription* server;
+static EncodeServerDescription* server;
 static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
@@ -139,7 +139,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	try {
-		server = new ServerDescription (server_host, 1);
+		server = new EncodeServerDescription (server_host, 1);
 		film.reset (new Film (film_dir));
 		film->read_metadata ();