X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fmakedcp.cc;h=e73930d3cf0760c33a00b1aa2a939e7475e7aeee;hb=0efe8420071f0184d668bc363a1096b8ffc33b2d;hp=900c31bfc9fca7630bc8002ba833128be88563ff;hpb=039ac5848730d154e0b3f3dd841a55e45ba922d8;p=dcpomatic.git

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 900c31bfc..e73930d3c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -20,13 +20,11 @@
 #include <iostream>
 #include <iomanip>
 #include <getopt.h>
-#include <libdcp/test_mode.h>
 #include <libdcp/version.h>
 #include "format.h"
 #include "film.h"
 #include "filter.h"
 #include "transcode_job.h"
-#include "make_dcp_job.h"
 #include "job_manager.h"
 #include "ab_transcode_job.h"
 #include "util.h"
@@ -51,7 +49,6 @@ help (string n)
 	     << "  -v, --version      show DVD-o-matic version\n"
 	     << "  -h, --help         show this help\n"
 	     << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
-	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
 	     << "  -r, --no-remote    do not use any remote servers\n"
 	     << "\n"
@@ -62,10 +59,9 @@ int
 main (int argc, char* argv[])
 {
 	string film_dir;
-	bool test_mode = false;
 	bool progress = true;
 	bool no_remote = false;
-	int log_level = 1;
+	int log_level = 0;
 
 	int option_index = 0;
 	while (1) {
@@ -73,14 +69,13 @@ main (int argc, char* argv[])
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
-			{ "test", no_argument, 0, 't'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
 			{ "log-level", required_argument, 0, 'l' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -96,9 +91,6 @@ main (int argc, char* argv[])
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
-		case 't':
-			test_mode = true;
-			break;
 		case 'n':
 			progress = false;
 			break;
@@ -131,11 +123,6 @@ main (int argc, char* argv[])
 	}
 	cout << "\n";
 
-	if (test_mode) {
-		libdcp::enable_test_mode ();
-		cout << dependency_version_summary() << "\n";
-	}
-
 	shared_ptr<Film> film;
 	try {
 		film.reset (new Film (film_dir, true));
@@ -151,15 +138,15 @@ main (int argc, char* argv[])
 		cout << "A/B ";
 	}
 	cout << "DCP for " << film->name() << "\n";
-	cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
 	cout << "Content: " << film->content() << "\n";
 	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
 	cout << "Filters: " << f.first << " " << f.second << "\n";
 
-	film->make_dcp (true);
+	film->make_dcp ();
 
 	bool should_stop = false;
 	bool first = true;
+	bool error = false;
 	while (!should_stop) {
 
 		dvdomatic_sleep (5);
@@ -195,6 +182,7 @@ main (int argc, char* argv[])
 
 			if ((*i)->finished_in_error ()) {
 				++finished_in_error;
+				error = true;
 			}
 
 			if (!progress && (*i)->finished_in_error ()) {
@@ -210,7 +198,7 @@ main (int argc, char* argv[])
 		}
 	}
 
-	return 0;
+	return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }