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 63dd7f45e02f3b0dff5a2eefd6b850fffb7319ad..096a3b11895ac20784fc226d78b87c984237bab8 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -85,8 +86,8 @@ print_dump (shared_ptr<Film> film)
                     << " end trim " << c->trim_end().seconds () << "\n";
 
                if (c->video) {
-                       cout << "\t" << c->video->video_size().width << "x" << c->video->video_size().height << "\n"
-                            << "\t" << c->video->video_frame_rate() << "fps\n"
+                       cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
+                            << "\t" << c->active_video_frame_rate() << "fps\n"
                             << "\tcrop left " << c->video->left_crop()
                             << " right " << c->video->right_crop()
                             << " top " << c->video->top_crop()
@@ -107,8 +108,8 @@ print_dump (shared_ptr<Film> film)
                }
 
                if (c->audio) {
-                       cout << "\t" << c->audio->audio_delay() << " delay\n"
-                            << "\t" << c->audio->audio_gain() << " gain\n";
+                       cout << "\t" << c->audio->delay() << " delay\n"
+                            << "\t" << c->audio->gain() << " gain\n";
                }
        }
 }
@@ -255,7 +256,7 @@ main (int argc, char* argv[])
        signal_manager = new SignalManager ();
 
        if (no_remote) {
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
        }
 
        if (json_port) {
@@ -314,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";
                        }
                }