Merge master.

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

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 892bed3b81d0368582bec7ecf6aedc22c14d39bf..85134b3c543ba8238baa49371038eadb2ff59ed3 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -146,16 +146,16 @@ 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;