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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index d4a4210de..7695e1e94 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -21,18 +21,16 @@
 #include <iomanip>
 #include <getopt.h>
 #include <libdcp/version.h>
-#include "format.h"
-#include "film.h"
-#include "filter.h"
-#include "transcode_job.h"
-#include "job_manager.h"
-#include "ab_transcode_job.h"
-#include "util.h"
-#include "scaler.h"
-#include "version.h"
-#include "cross.h"
-#include "config.h"
-#include "log.h"
+#include "lib/film.h"
+#include "lib/filter.h"
+#include "lib/transcode_job.h"
+#include "lib/job_manager.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+#include "lib/version.h"
+#include "lib/cross.h"
+#include "lib/config.h"
+#include "lib/log.h"
 
 using std::string;
 using std::cerr;
@@ -47,8 +45,9 @@ 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"
+	     << "  -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"
 	     << "\n"
@@ -69,13 +68,14 @@ main (int argc, char* argv[])
 			{ "version", no_argument, 0, 'v'},
 			{ "help", no_argument, 0, 'h'},
 			{ "deps", no_argument, 0, 'd'},
+			{ "flags", no_argument, 0, 'f'},
 			{ "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, "vhdnrl:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -91,6 +91,9 @@ main (int argc, char* argv[])
 		case 'd':
 			cout << dependency_version_summary () << "\n";
 			exit (EXIT_SUCCESS);
+		case 'f':
+			cout << dcpomatic_cxx_flags << "\n";
+			exit (EXIT_SUCCESS);
 		case 'n':
 			progress = false;
 			break;
@@ -113,7 +116,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	if (no_remote) {
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		Config::instance()->set_servers (vector<ServerDescription> ());
 	}
 
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
@@ -125,7 +128,8 @@ main (int argc, char* argv[])
 
 	shared_ptr<Film> film;
 	try {
-		film.reset (new Film (film_dir, true));
+		film.reset (new Film (film_dir));
+		film->read_metadata ();
 	} catch (std::exception& e) {
 		cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
 		exit (EXIT_FAILURE);
@@ -133,14 +137,10 @@ main (int argc, char* argv[])
 
 	film->log()->set_level ((Log::Level) log_level);
 
-	cout << "\nMaking ";
-	if (film->ab()) {
-		cout << "A/B ";
-	}
-	cout << "DCP for " << film->name() << "\n";
+	cout << "\nMaking DCP for " << film->name() << "\n";
 //	cout << "Content: " << film->content() << "\n";
-	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
-	cout << "Filters: " << f.first << " " << f.second << "\n";
+//	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
+//	cout << "Filters: " << f.first << " " << f.second << "\n";
 
 	film->make_dcp ();
 
@@ -170,9 +170,9 @@ main (int argc, char* argv[])
 				float const p = (*i)->overall_progress ();
 				
 				if (p >= 0) {
-					cout << (*i)->status() << "                         \n";
+					cout << (*i)->status() << "			    \n";
 				} else {
-					cout << ": Running           \n";
+					cout << ": Running	     \n";
 				}
 			}