X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fmakedcp.cc;h=d3608059c3c0e47fde5c4a46d9f8d35fad1ca60c;hb=b03b2c447a8ed9f855d09a62609ca03cc705fdbf;hp=3d9db6a3115b0aa73e3e6b824b8ded8b9a1fb122;hpb=e86b864c0e8e1376b328f2a41c89d16d947947a1;p=dcpomatic.git

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 3d9db6a31..d3608059c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -33,6 +33,8 @@
 #include "scaler.h"
 #include "version.h"
 #include "cross.h"
+#include "config.h"
+#include "log.h"
 
 using namespace std;
 using namespace boost;
@@ -44,6 +46,7 @@ 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"
+	     << "  -c, --config       list configuration settings that affect output 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"
 	     << "\n"
@@ -56,6 +59,7 @@ main (int argc, char* argv[])
 	string film_dir;
 	bool test_mode = false;
 	bool progress = true;
+	int log_level = 1;
 
 	int option_index = 0;
 	while (1) {
@@ -63,12 +67,14 @@ main (int argc, char* argv[])
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
+			{ "config", no_argument, 0, 'c'},
 			{ "test", no_argument, 0, 't'},
 			{ "no-progress", no_argument, 0, 'n'},
+			{ "log-level", required_argument, 0, 'l' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "hdtn", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdctnl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -76,7 +82,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << DVDOMATIC_VERSION << "\n";
+			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
@@ -90,6 +96,18 @@ main (int argc, char* argv[])
 		case 'n':
 			progress = false;
 			break;
+		case 'c':
+			cout << "Colour LUT " << colour_lut_index_to_name (Config::instance()->colour_lut_index()) << "; "
+			     << "J2K bandwidth " << Config::instance()->j2k_bandwidth() << "; ";
+#ifdef DVDOMATIC_DEBUG
+			cout << "built in debug mode\n";
+#else
+			cout << "built in optimised mode\n";
+#endif			
+			exit (EXIT_SUCCESS);
+		case 'l':
+			log_level = atoi (optarg);
+			break;
 		}
 	}
 
@@ -122,6 +140,8 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
+	film->log()->set_level ((Log::Level) log_level);
+
 	cout << "\nMaking ";
 	if (film->dcp_ab ()) {
 		cout << "A/B ";