X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=0329364d97ed6a555f8c10859bbe6fcff1bcaf14;hb=11ac33e140f3aa9d6e992880a1e1b3a4ca649355;hp=5f870ba41f7605ceae92d2e28acb3cc1dcd2e37d;hpb=a0d1dd5d91c81ec9907cbc7b890905c463c18f62;p=dcpomatic.git

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 5f870ba41..0329364d9 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -30,7 +31,11 @@
 #include "lib/ffmpeg_decoder.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/content_video.h"
+#include "lib/video_content_scale.h"
+#include "lib/video_content.h"
+#include "lib/video_decoder.h"
 #include "test.h"
+#include <iostream>
 
 using std::cout;
 using std::list;
@@ -43,11 +48,11 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	shared_ptr<Film> film = new_test_film ("seek_zero_test");
 	film->set_name ("seek_zero_test");
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
-	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	content->video->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.
@@ -57,10 +62,10 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 		video_delay = ContentTime ();
 	}
 
-	Frame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames_round (content->video_frame_rate ());
+	Frame const first_frame = video_delay.ceil (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
 
 	FFmpegDecoder decoder (content, film->log());
-	list<ContentVideo> a = decoder.get_video (first_frame, true);
+	list<ContentVideo> a = decoder.video->get (first_frame, true);
 	BOOST_CHECK (a.size() == 1);
-	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
+	BOOST_CHECK_EQUAL (a.front().frame.index(), first_frame);
 }