X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=3aef113734fbebfd7092d2aa121a28808bf40819;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=03968ae5cb1c54ea11284b8c2d3bcaa8217cd2b9;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 03968ae5c..3aef11373 100644
--- 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,10 +28,12 @@
 #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"
 
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -43,22 +45,22 @@ 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());
-	optional<ContentVideo> a = decoder.get_video (first_frame, true);
-	BOOST_CHECK (a);
-	BOOST_CHECK_EQUAL (a->frame, first_frame);
+	list<ContentVideo> a = decoder.get_video (first_frame, true);
+	BOOST_CHECK (a.size() == 1);
+	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
 }