X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_server_cli.cc;h=6dca8064c77163a730c8aa6b4846f6fe140a2e7b;hb=bd12168f1381e8e5fb197e5f25cf716fcf012010;hp=81c553ef7c3094aa57761f3f289ee27132bdd749;hpb=e7e9347cdd1f43e0dd3d1ca35632e9493a010fc6;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 81c553ef7..6dca8064c 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -26,7 +27,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>
@@ -63,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;
 
@@ -110,16 +111,18 @@ main (int argc, char* argv[])
 		log.reset (new NullLog);
 	}
 
-	Server server (log, verbose);
+	EncodeServer server (log, verbose, num_threads);
 
 	try {
-		server.run (num_threads);
+		server.run ();
 	} catch (boost::system::system_error& e) {
 		if (e.code() == boost::system::errc::address_in_use) {
 			cerr << argv[0] << ": address already in use.  Is another DCP-o-matic server instance already running?\n";
 			exit (EXIT_FAILURE);
 		}
 		cerr << argv[0] << ": " << e.what() << "\n";
+	} catch (std::exception& e) {
+		cerr << argv[0] << ": failed to start server; " << e.what() << "\n";
 	}
 	return 0;
 }