{Video,Audio}Frame -> Frame.

3 files changed, 12 insertions, 12 deletions

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index b1f672356..e31689d3f 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-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
@@ -42,8 +42,8 @@ public:
 
 	bool pass (PassReason)
 	{
-		AudioFrame const N = min (
-			AudioFrame (2000),
+		Frame const N = min (
+			Frame (2000),
 			_audio_content->audio_length().frames (_audio_content->resampled_audio_frame_rate ()) - _position
 			);
 
@@ -67,7 +67,7 @@ public:
 	}
 
 private:
-	AudioFrame _position;
+	Frame _position;
 };
 
 class TestAudioContent : public AudioContent
@@ -113,7 +113,7 @@ shared_ptr<TestAudioContent> content;
 shared_ptr<TestAudioDecoder> decoder;
 
 static shared_ptr<ContentAudio>
-get (AudioFrame from, AudioFrame length)
+get (Frame from, Frame length)
 {
 	decoder->seek (ContentTime::from_frames (from, content->resampled_audio_frame_rate ()), true);
 	shared_ptr<ContentAudio> ca = decoder->get_audio (from, length, true);
@@ -122,7 +122,7 @@ get (AudioFrame from, AudioFrame length)
 }
 
 static void
-check (AudioFrame from, AudioFrame length)
+check (Frame from, Frame length)
 {
 	shared_ptr<ContentAudio> ca = get (from, length);
 	for (int i = 0; i < content->audio_channels(); ++i) {
@@ -148,8 +148,8 @@ BOOST_AUTO_TEST_CASE (audio_decoder_get_audio_test)
 
 	/* Read off the end */
 
-	AudioFrame const from = content->resampled_audio_frame_rate() * 61;
-	AudioFrame const length = content->resampled_audio_frame_rate() * 4;
+	Frame const from = content->resampled_audio_frame_rate() * 61;
+	Frame const length = content->resampled_audio_frame_rate() * 4;
 	shared_ptr<ContentAudio> ca = get (from, length);
 	
 	for (int i = 0; i < content->audio_channels(); ++i) {
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index c5f43173e..551157652 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -54,11 +54,11 @@ test (boost::filesystem::path file, float fps, int gaps)
 
 	BOOST_CHECK_CLOSE (decoder.video_content()->video_frame_rate(), fps, 0.01);
 	
-	VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
+	Frame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
 #ifdef DCPOMATIC_DEBUG	
 	decoder.test_gaps = 0;
 #endif	
-	for (VideoFrame i = 0; i < N; ++i) {
+	for (Frame i = 0; i < N; ++i) {
 		list<ContentVideo> v;
 		v = decoder.get_video (i, true);
 		BOOST_CHECK_EQUAL (v.size(), 1);
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 2a1a06136..f00180c89 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
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 		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);