From 661a11a443570d9d04cb6a8d7d435e6fd41b0bef Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 5 Jul 2016 16:05:07 +0100 Subject: [PATCH] Display sub-job name in the CLI client. --- src/tools/dcpomatic_cli.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index b9d322a66..eaf868fca 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -315,31 +315,31 @@ main (int argc, char* argv[]) int unfinished = 0; int finished_in_error = 0; - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { + BOOST_FOREACH (shared_ptr i, jobs) { if (progress) { - cout << (*i)->name() << ": "; + cout << i->name() << "; " << i->sub_name() << ": "; - 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"; } } -- 2.30.2