Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / tools / dcpomatic_server_cli.cc

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index f43dd10bc4e09a2c8689de4c11aa24f6e78c88ec..b816460a3376daadea18467caf49fb5e1a20ffd9 100644 (file)
--- 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,7 +32,7 @@
 #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"
@@ -52,7 +51,7 @@ help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION]\n"
             << "  -v, --version      show DCP-o-matic version\n"
-            << "  -h, --help         show this help\n"
+            << "  -h, --help         show this help\n"
             << "  -t, --threads      number of parallel encoding threads to use\n"
             << "  --verbose          be verbose to stdout\n"
             << "  --log              write a log file of activity\n";
@@ -66,7 +65,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'},