Merge master.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 71a07fe7188aa4ea0b2c2242af965f9759be5e20..85134b3c543ba8238baa49371038eadb2ff59ed3 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -26,7 +26,6 @@
 #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"
@@ -36,8 +35,13 @@
 #include "config.h"
 #include "log.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cerr;
+using std::cout;
+using std::vector;
+using std::pair;
+using std::list;
+using boost::shared_ptr;
 
 static void
 help (string n)
@@ -46,7 +50,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"
-            << "  -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"
@@ -69,7 +72,6 @@ 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'},
                        { "no-remote", no_argument, 0, 'r'},
@@ -77,7 +79,7 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhdctnrl:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -102,15 +104,6 @@ main (int argc, char* argv[])
                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;
@@ -142,9 +135,9 @@ main (int argc, char* argv[])
                cout << dependency_version_summary() << "\n";
        }
 
-       Film* film = 0;
+       shared_ptr<Film> film;
        try {
-               film = new Film (film_dir, true);
+               film.reset (new Film (film_dir, true));
        } catch (std::exception& e) {
                cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
                exit (EXIT_FAILURE);
@@ -153,20 +146,21 @@ main (int argc, char* argv[])
        film->log()->set_level ((Log::Level) log_level);
 
        cout << "\nMaking ";
-       if (film->dcp_ab()) {
+       if (film->ab()) {
                cout << "A/B ";
        }
        cout << "DCP for " << film->name() << "\n";
        cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
-       cout << "Content: " << film->content() << "\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 all_done = false;
+       bool should_stop = false;
        bool first = true;
-       while (!all_done) {
+       bool error = false;
+       while (!should_stop) {
 
                dvdomatic_sleep (5);
 
@@ -178,8 +172,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() << ": ";
@@ -192,9 +188,14 @@ main (int argc, char* argv[])
                                        cout << ": Running           \n";
                                }
                        }
-                       
+
                        if (!(*i)->finished ()) {
-                               all_done = false;
+                               ++unfinished;
+                       }
+
+                       if ((*i)->finished_in_error ()) {
+                               ++finished_in_error;
+                               error = true;
                        }
 
                        if (!progress && (*i)->finished_in_error ()) {
@@ -204,9 +205,13 @@ main (int argc, char* argv[])
                                cout << (*i)->status() << "\n";
                        }
                }
+
+               if (unfinished == 0 || finished_in_error != 0) {
+                       should_stop = true;
+               }
        }
 
-       return 0;
+       return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }