X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=acd1335e62d5e5ef57c469232e429db29c22e6c6;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=7695e1e948b0cfde4a8703ef2371cffbd68e7a50;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 7695e1e94..acd1335e6 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
-#include <libdcp/version.h>
+#include <dcp/version.h>
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/transcode_job.h"
@@ -31,6 +31,9 @@
 #include "lib/cross.h"
 #include "lib/config.h"
 #include "lib/log.h"
+#include "lib/ui_signaller.h"
+#include "lib/server_finder.h"
+#include "lib/json_server.h"
 
 using std::string;
 using std::cerr;
@@ -45,11 +48,13 @@ help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
 	     << "  -v, --version      show DCP-o-matic version\n"
-	     << "  -h, --help	      show this help\n"
-	     << "  -d, --deps	      list DCP-o-matic dependency details and quit\n"
-	     << "  -f, --flags	      show flags passed to C++ compiler on build\n"
+	     << "  -h, --help         show this help\n"
+	     << "  -d, --deps         list DCP-o-matic dependency details and quit\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"
+	     << "  -j, --json <port>  run a JSON server on the specified port\n"
+	     << "  -k, --keep-going   keep running even when the job is complete\n"
 	     << "\n"
 	     << "<FILM> is the film directory.\n";
 }
@@ -60,7 +65,8 @@ main (int argc, char* argv[])
 	string film_dir;
 	bool progress = true;
 	bool no_remote = false;
-	int log_level = 0;
+	int json_port = 0;
+	bool keep_going = false;
 
 	int option_index = 0;
 	while (1) {
@@ -71,11 +77,12 @@ main (int argc, char* argv[])
 			{ "flags", no_argument, 0, 'f'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
-			{ "log-level", required_argument, 0, 'l' },
+			{ "json", required_argument, 0, 'j' },
+			{ "keep-going", no_argument, 0, 'k' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdfnrj:k", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -100,8 +107,11 @@ main (int argc, char* argv[])
 		case 'r':
 			no_remote = true;
 			break;
-		case 'l':
-			log_level = atoi (optarg);
+		case 'j':
+			json_port = atoi (optarg);
+			break;
+		case 'k':
+			keep_going = true;
 			break;
 		}
 	}
@@ -114,9 +124,14 @@ main (int argc, char* argv[])
 	film_dir = argv[optind];
 			
 	dcpomatic_setup ();
+	ui_signaller = new UISignaller ();
 
 	if (no_remote) {
-		Config::instance()->set_servers (vector<ServerDescription> ());
+		ServerFinder::instance()->disable ();
+	}
+
+	if (json_port) {
+		new JSONServer (json_port);
 	}
 
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -135,8 +150,6 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	film->log()->set_level ((Log::Level) log_level);
-
 	cout << "\nMaking DCP for " << film->name() << "\n";
 //	cout << "Content: " << film->content() << "\n";
 //	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
@@ -167,7 +180,7 @@ main (int argc, char* argv[])
 			if (progress) {
 				cout << (*i)->name() << ": ";
 				
-				float const p = (*i)->overall_progress ();
+				float const p = (*i)->progress ();
 				
 				if (p >= 0) {
 					cout << (*i)->status() << "			    \n";
@@ -198,6 +211,17 @@ main (int argc, char* argv[])
 		}
 	}
 
+	if (keep_going) {
+		while (1) {
+			dcpomatic_sleep (3600);
+		}
+	}
+
+	/* This is just to stop valgrind reporting leaks due to JobManager
+	   indirectly holding onto codecs.
+	*/
+	JobManager::drop ();
+	
 	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }