diff options
Diffstat (limited to 'src/tools/dcpomatic_server_cli.cc')
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index 8997bb92c..25fe59fc7 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -19,25 +19,26 @@ */ #include "lib/config.h" +#include "lib/config.h" #include "lib/dcp_video.h" +#include "lib/dcpomatic_log.h" +#include "lib/encode_server.h" #include "lib/exceptions.h" -#include "lib/util.h" -#include "lib/config.h" -#include "lib/image.h" #include "lib/file_log.h" #ifdef DCPOMATIC_GROK #include "lib/grok/context.h" #endif +#include "lib/image.h" #include "lib/null_log.h" +#include "lib/util.h" +#include "lib/variant.h" #include "lib/version.h" -#include "lib/encode_server.h" -#include "lib/dcpomatic_log.h" +#include <boost/algorithm/string.hpp> #include <boost/array.hpp> #include <boost/asio.hpp> -#include <boost/algorithm/string.hpp> #include <boost/thread.hpp> -#include <boost/thread/mutex.hpp> #include <boost/thread/condition.hpp> +#include <boost/thread/mutex.hpp> #include <unistd.h> #include <errno.h> #include <getopt.h> @@ -47,15 +48,15 @@ #include <vector> using std::cerr; -using std::string; using std::cout; using std::shared_ptr; +using std::string; static void help (string n) { cerr << "Syntax: " << n << " [OPTION]\n" - << " -v, --version show DCP-o-matic version\n" + << variant::insert_dcpomatic(" -v, --version show %1 version\n") << " -h, --help show this help\n" << " -t, --threads number of parallel encoding threads to use\n" << " --verbose be verbose to stdout\n" @@ -123,7 +124,7 @@ main (int argc, char* argv[]) 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"; + cerr << argv[0] << variant::insert_dcpomatic(": address already in use. Is another %1 server instance already running?\n"); exit (EXIT_FAILURE); } cerr << argv[0] << ": " << e.what() << "\n"; |