X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=bd1a4e4aa60b8aceed165f708e631984d0de699c;hb=97c1bc360f912d66d3fc0430b331214e4da79644;hp=4bfd5f50f352738568ea8e3913cd9b7b0fa86259;hpb=19f94521139aac13ef8fb4eaa55855b2ada307b4;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 4bfd5f50f..bd1a4e4aa 100644
--- 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/>.
 
 */
 
@@ -58,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"
@@ -174,6 +176,7 @@ main (int argc, char* argv[])
 	string film_dir;
 	bool progress = true;
 	bool no_remote = false;
+	optional<int> threads;
 	optional<int> json_port;
 	bool keep_going = false;
 	bool dump = false;
@@ -188,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' },
@@ -197,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;
@@ -219,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;
@@ -255,13 +262,17 @@ 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_num_local_encoding_threads (threads.get ());
+	}
+
 	shared_ptr<Film> film;
 	try {
 		film.reset (new Film (film_dir));
@@ -314,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";
 			}
 		}