Merge master and multifarious hackery.

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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index d4a4210dee560549db7868319b9fb28e8c6d8442..c295a011d76110f6396989e112220d53e7d54f40 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -125,7 +125,8 @@ main (int argc, char* argv[])
 
        shared_ptr<Film> film;
        try {
-               film.reset (new Film (film_dir, true));
+               film.reset (new Film (film_dir));
+               film->read_metadata ();
        } catch (std::exception& e) {
                cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
                exit (EXIT_FAILURE);
@@ -139,8 +140,8 @@ main (int argc, char* argv[])
        }
        cout << "DCP for " << film->name() << "\n";
 //     cout << "Content: " << film->content() << "\n";
-       pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
-       cout << "Filters: " << f.first << " " << f.second << "\n";
+//     pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
+//     cout << "Filters: " << f.first << " " << f.second << "\n";
 
        film->make_dcp ();