test/data updates.

[dcpomatic.git] / test / seek_zero_test.cc

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 77e95c28c11b5d11d42977ec2dfc02b6d26eca27..3aef113734fbebfd7092d2aa121a28808bf40819 100644 (file)
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_decoder.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/content_video.h"
 #include "test.h"
 
@@ -44,19 +45,19 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-       content->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (content);
        wait_for_jobs ();
-
+       content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+       
        /* Work out the first video frame index that we will be given, taking into account
         * the difference between first video and first audio.
         */
-       ContentTime video_delay = content->first_video().get() - content->audio_stream()->first_audio.get();
+       ContentTime video_delay = content->first_video().get() - content->ffmpeg_audio_streams().front()->first_audio.get();
        if (video_delay < ContentTime ()) {
                video_delay = ContentTime ();
        }
 
-       VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
+       Frame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
 
        FFmpegDecoder decoder (content, film->log());
        list<ContentVideo> a = decoder.get_video (first_frame, true);