Distinguish master DoM encode threads count from the server count.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index b9d322a66ff3b114c05b29f22a63d223be3bdf44..cfd8b3eaeeca57686c9a4f69ded64b28e5e618ab 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -59,6 +59,7 @@ help (string n)
             << "  -f, --flags        show flags passed to C++ compiler on build\n"
             << "  -n, --no-progress  do not print progress to stdout\n"
             << "  -r, --no-remote    do not use any remote servers\n"
+            << "  -t, --threads      specify number of local encoding threads (overriding configuration)\n"
             << "  -j, --json <port>  run a JSON server on the specified port\n"
             << "  -k, --keep-going   keep running even when the job is complete\n"
             << "  -s, --servers      just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n"
@@ -172,9 +173,10 @@ show_servers ()
 int
 main (int argc, char* argv[])
 {
-       string film_dir;
+       boost::filesystem::path film_dir;
        bool progress = true;
        bool no_remote = false;
+       optional<int> threads;
        optional<int> json_port;
        bool keep_going = false;
        bool dump = false;
@@ -189,6 +191,7 @@ main (int argc, char* argv[])
                        { "flags", no_argument, 0, 'f'},
                        { "no-progress", no_argument, 0, 'n'},
                        { "no-remote", no_argument, 0, 'r'},
+                       { "threads", required_argument, 0, 't'},
                        { "json", required_argument, 0, 'j'},
                        { "keep-going", no_argument, 0, 'k' },
                        { "servers", no_argument, 0, 's' },
@@ -198,7 +201,7 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhfnrj:kAsd", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhfnrt:j:kAsd", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -220,6 +223,9 @@ main (int argc, char* argv[])
                case 'r':
                        no_remote = true;
                        break;
+               case 't':
+                       threads = atoi (optarg);
+                       break;
                case 'j':
                        json_port = atoi (optarg);
                        break;
@@ -256,19 +262,23 @@ main (int argc, char* argv[])
        signal_manager = new SignalManager ();
 
        if (no_remote) {
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
        }
 
        if (json_port) {
                new JSONServer (json_port.get ());
        }
 
+       if (threads) {
+               Config::instance()->set_master_encoding_threads (threads.get ());
+       }
+
        shared_ptr<Film> film;
        try {
                film.reset (new Film (film_dir));
                film->read_metadata ();
        } catch (std::exception& e) {
-               cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
+               cerr << argv[0] << ": error reading film `" << film_dir.string() << "' (" << e.what() << ")\n";
                exit (EXIT_FAILURE);
        }
 
@@ -315,31 +325,35 @@ main (int argc, char* argv[])
                int unfinished = 0;
                int finished_in_error = 0;
 
-               for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
+               BOOST_FOREACH (shared_ptr<Job> i, jobs) {
                        if (progress) {
-                               cout << (*i)->name() << ": ";
+                               cout << i->name();
+                               if (!i->sub_name().empty()) {
+                                       cout << "; " << i->sub_name();
+                               }
+                               cout << ": ";
 
-                               if ((*i)->progress ()) {
-                                       cout << (*i)->status() << "                         \n";
+                               if (i->progress ()) {
+                                       cout << i->status() << "                            \n";
                                } else {
                                        cout << ": Running           \n";
                                }
                        }
 
-                       if (!(*i)->finished ()) {
+                       if (!i->finished ()) {
                                ++unfinished;
                        }
 
-                       if ((*i)->finished_in_error ()) {
+                       if (i->finished_in_error ()) {
                                ++finished_in_error;
                                error = true;
                        }
 
-                       if (!progress && (*i)->finished_in_error ()) {
+                       if (!progress && i->finished_in_error ()) {
                                /* We won't see this error if we haven't been showing progress,
                                   so show it now.
                                */
-                               cout << (*i)->status() << "\n";
+                               cout << i->status() << "\n";
                        }
                }