X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server_cli.cc;h=efcfdc40e340a251fdd22f9aa1cf6d2a236f797e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=b816460a3376daadea18467caf49fb5e1a20ffd9;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index b816460a3..efcfdc40e 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -36,7 +36,6 @@ #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" @@ -100,19 +99,18 @@ main (int argc, char* argv[]) } } - Scaler::setup_scalers (); shared_ptr 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);