X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server_cli.cc;h=efcfdc40e340a251fdd22f9aa1cf6d2a236f797e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=56802d8aef07a43b357c8371767d5d83eea33826;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 56802d8ae..efcfdc40e 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -20,7 +20,6 @@
 #include "lib/server.h"
 #include <iostream>
 #include <stdexcept>
-#include <sstream>
 #include <cstring>
 #include <vector>
 #include <unistd.h>
@@ -33,11 +32,10 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include "lib/config.h"
-#include "lib/dcp_video_frame.h"
+#include "lib/dcp_video.h"
 #include "lib/exceptions.h"
 #include "lib/util.h"
 #include "lib/config.h"
-#include "lib/scaler.h"
 #include "lib/image.h"
 #include "lib/log.h"
 #include "lib/version.h"
@@ -66,7 +64,7 @@ main (int argc, char* argv[])
 	bool write_log = false;
 
 	int option_index = 0;
-	while (1) {
+	while (true) {
 		static struct option long_options[] = {
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
@@ -101,19 +99,18 @@ main (int argc, char* argv[])
 		}
 	}
 
-	Scaler::setup_scalers ();
 	shared_ptr<Log> log;
 	if (write_log) {
 		log.reset (new FileLog ("dcpomatic_server_cli.log"));
 	} else {
 		log.reset (new NullLog);
 	}
-	
+
 	Server server (log, verbose);
-	
+
 	try {
 		server.run (num_threads);
-	} catch (boost::system::system_error e) {
+	} 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);