Do EncodeServerFinder 'disable' in a more sensible way.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index b9d322a66ff3b114c05b29f22a63d223be3bdf44..096a3b11895ac20784fc226d78b87c984237bab8 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -256,7 +256,7 @@ main (int argc, char* argv[])
        signal_manager = new SignalManager ();
 
        if (no_remote) {
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
        }
 
        if (json_port) {
@@ -315,31 +315,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";
                        }
                }