Do audio/video pts sync in a hopefully much more sensible way.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 5856ba0aae1e1463a9317c770f6c7e3a0625ce13..03e85e995871c1663741acab18f6b7d8f8ca2292 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -32,6 +32,9 @@
 #include "util.h"
 #include "scaler.h"
 #include "version.h"
+#include "cross.h"
+#include "config.h"
+#include "log.h"
 
 using namespace std;
 using namespace boost;
@@ -40,10 +43,13 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\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 and timestamps)\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"
+            << "  -r, --no-remote    do not use any remote servers\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
@@ -54,24 +60,33 @@ main (int argc, char* argv[])
        string film_dir;
        bool test_mode = false;
        bool progress = true;
+       bool no_remote = false;
+       int log_level = 1;
 
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
+                       { "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'},
+                       { "no-remote", no_argument, 0, 'r'},
+                       { "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, "vhdctnrl:", long_options, &option_index);
 
                if (c == -1) {
                        break;
                }
 
                switch (c) {
+               case 'v':
+                       cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+                       exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
                        exit (EXIT_SUCCESS);
@@ -84,6 +99,21 @@ main (int argc, char* argv[])
                case 'n':
                        progress = false;
                        break;
+               case 'r':
+                       no_remote = true;
+                       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;
                }
        }
 
@@ -96,6 +126,10 @@ main (int argc, char* argv[])
                        
        dvdomatic_setup ();
 
+       if (no_remote) {
+               Config::instance()->set_servers (vector<ServerDescription*> ());
+       }
+
        cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
        char buf[256];
        if (gethostname (buf, 256) == 0) {
@@ -116,8 +150,10 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       film->log()->set_level ((Log::Level) log_level);
+
        cout << "\nMaking ";
-       if (film->dcp_ab ()) {
+       if (film->dcp_ab()) {
                cout << "A/B ";
        }
        cout << "DCP for " << film->name() << "\n";
@@ -128,13 +164,13 @@ main (int argc, char* argv[])
 
        film->make_dcp (true);
 
-       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
-       bool all_done = false;
+       bool should_stop = false;
        bool first = true;
-       while (!all_done) {
-               
-               sleep (5);
+       while (!should_stop) {
+
+               dvdomatic_sleep (5);
+
+               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
 
                if (!first && progress) {
                        cout << "\033[" << jobs.size() << "A";
@@ -142,8 +178,10 @@ main (int argc, char* argv[])
                }
 
                first = false;
-               
-               all_done = true;
+
+               int unfinished = 0;
+               int finished_in_error = 0;
+
                for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
                        if (progress) {
                                cout << (*i)->name() << ": ";
@@ -156,11 +194,26 @@ main (int argc, char* argv[])
                                        cout << ": Running           \n";
                                }
                        }
-                       
+
                        if (!(*i)->finished ()) {
-                               all_done = false;
+                               ++unfinished;
+                       }
+
+                       if ((*i)->finished_in_error ()) {
+                               ++finished_in_error;
+                       }
+
+                       if (!progress && (*i)->finished_in_error ()) {
+                               /* We won't see this error if we haven't been showing progress,
+                                  so show it now.
+                               */
+                               cout << (*i)->status() << "\n";
                        }
                }
+
+               if (unfinished == 0 || finished_in_error != 0) {
+                       should_stop = true;
+               }
        }
 
        return 0;