summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-05 16:05:07 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-05 16:05:07 +0100
commit661a11a443570d9d04cb6a8d7d435e6fd41b0bef (patch)
tree3bda41caf76daefd8475c85b2338e94ebaa55fd8 /src
parent734a654a07ba97cb6d55309e00f8525d196c88ce (diff)
Display sub-job name in the CLI client.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic_cli.cc16
1 files 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<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() << "; " << 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";
}
}