Merge master.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 900c31bfc9fca7630bc8002ba833128be88563ff..e2e1874c4eb21461b8af9153b1dc84bddadbd33a 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"
@@ -48,9 +47,9 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
-            << "  -v, --version      show DVD-o-matic version\n"
+            << "  -v, --version      show DCP-o-matic version\n"
             << "  -h, --help         show this help\n"
-            << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
+            << "  -d, --deps         list DCP-o-matic dependency details 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"
@@ -88,7 +87,7 @@ main (int argc, char* argv[])
 
                switch (c) {
                case 'v':
-                       cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+                       cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
                        exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
@@ -118,13 +117,13 @@ main (int argc, char* argv[])
 
        film_dir = argv[optind];
                        
-       dvdomatic_setup ();
+       dcpomatic_setup ();
 
        if (no_remote) {
                Config::instance()->set_servers (vector<ServerDescription*> ());
        }
 
-       cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+       cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
        char buf[256];
        if (gethostname (buf, 256) == 0) {
                cout << " on " << buf;
@@ -147,22 +146,23 @@ 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 should_stop = false;
        bool first = true;
+       bool error = false;
        while (!should_stop) {
 
-               dvdomatic_sleep (5);
+               dcpomatic_sleep (5);
 
                list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
 
@@ -195,6 +195,7 @@ main (int argc, char* argv[])
 
                        if ((*i)->finished_in_error ()) {
                                ++finished_in_error;
+                               error = true;
                        }
 
                        if (!progress && (*i)->finished_in_error ()) {
@@ -210,7 +211,7 @@ main (int argc, char* argv[])
                }
        }
 
-       return 0;
+       return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }