Merge master.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 447b0ddc0061fe93f8e11ae9dfb66d7be650e719..85134b3c543ba8238baa49371038eadb2ff59ed3 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -146,19 +146,20 @@ 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);
@@ -194,6 +195,7 @@ main (int argc, char* argv[])
 
                        if ((*i)->finished_in_error ()) {
                                ++finished_in_error;
+                               error = true;
                        }
 
                        if (!progress && (*i)->finished_in_error ()) {
@@ -209,7 +211,7 @@ main (int argc, char* argv[])
                }
        }
 
-       return 0;
+       return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }