Merge master.

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

diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index d3222faa3d64ecfb2fdafa4099792da49e518bf0..88974eed731e6be7334a6dd0ab57d473dbb15583 100644 (file)
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -46,7 +46,7 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame = 0;
 
 void
-process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub)
+process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
 {
        shared_ptr<DCPVideoFrame> local (
                new DCPVideoFrame (
@@ -145,10 +145,11 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       dvdomatic_setup ();
+       dcpomatic_setup ();
 
        server = new ServerDescription (server_host, 1);
-       shared_ptr<Film> film (new Film (film_dir, true));
+       shared_ptr<Film> film (new Film (film_dir));
+       film->read_metadata ();
 
        shared_ptr<Player> player = film->player ();
        player->disable_audio ();