Merge master.

[dcpomatic.git] / src / tools / dcpomatic_cli.cc

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 86c3cf4b14881a3268a96758d9716242af373362..ee9e2cdc08fddc0746bd08f5afbdef63745e4f7f 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,14 +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 "job_manager.h"
-#include "ab_transcode_job.h"
 #include "util.h"
 #include "scaler.h"
 #include "version.h"
@@ -50,7 +47,7 @@ help (string 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"
-            << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\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"
@@ -61,7 +58,6 @@ int
 main (int argc, char* argv[])
 {
        string film_dir;
-       bool test_mode = false;
        bool progress = true;
        bool no_remote = false;
        int log_level = 0;
@@ -72,14 +68,14 @@ 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'},
+                       { "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, "vhdtnrl:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -95,9 +91,9 @@ main (int argc, char* argv[])
                case 'd':
                        cout << dependency_version_summary () << "\n";
                        exit (EXIT_SUCCESS);
-               case 't':
-                       test_mode = true;
-                       break;
+               case 'f':
+                       cout << dcpomatic_cxx_flags << "\n";
+                       exit (EXIT_SUCCESS);
                case 'n':
                        progress = false;
                        break;
@@ -130,14 +126,10 @@ 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));
+               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);
@@ -145,15 +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 << "Test mode: " << (test_mode ? "yes" : "no") << "\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 ();