Rename some methods.

6 files changed, 17 insertions, 17 deletions

diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 5eabc4074..73d515492 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -82,7 +82,7 @@ public:
 			}
 		}
 
-		audio->audio (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000));
+		audio->give (_test_audio_content->audio->stream(), buffers, ContentTime::from_frames (_position, 48000));
 		_position += N;
 
 		return N < 2000;
@@ -106,7 +106,7 @@ static ContentAudio
 get (Frame from, Frame length)
 {
 	decoder->seek (ContentTime::from_frames (from, content->audio->resampled_frame_rate ()), true);
-	ContentAudio ca = decoder->audio->get_audio (content->audio->stream(), from, length, true);
+	ContentAudio ca = decoder->audio->get (content->audio->stream(), from, length, true);
 	BOOST_CHECK_EQUAL (ca.frame, from);
 	return ca;
 }
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 80e0a3dd1..5d77681e9 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
 	BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
 
-	list<ContentTextSubtitle> subs = decoder->subtitle->get_text_subtitles (
+	list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
 		ContentTimePeriod (
 			ContentTime::from_seconds (25),
 			ContentTime::from_seconds (26)
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 83efc4201..d70471bbd 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -46,7 +46,7 @@ static void
 check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
 	list<ContentVideo> v;
-	v = decoder->video->get_video (frame, true);
+	v = decoder->video->get (frame, true);
 	BOOST_CHECK (v.size() == 1);
 	BOOST_CHECK_EQUAL (v.front().frame, frame);
 }
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index e1e29ab17..3548d15f2 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -55,15 +55,15 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	shared_ptr<Log> log (new NullLog);
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-	BOOST_REQUIRE (decoder->video->_video_content->video_frame_rate());
-	BOOST_CHECK_CLOSE (decoder->video->_video_content->video_frame_rate().get(), fps, 0.01);
+	BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
+	BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);
 
 #ifdef DCPOMATIC_DEBUG
 	decoder->video->test_gaps = 0;
 #endif
 	for (Frame i = 0; i < video_length; ++i) {
 		list<ContentVideo> v;
-		v = decoder->video->get_video (i, true);
+		v = decoder->video->get (i, true);
 		BOOST_REQUIRE_EQUAL (v.size(), 1U);
 		BOOST_CHECK_EQUAL (v.front().frame, i);
 	}
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 0c65fa3b8..33561206c 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
 
 	FFmpegDecoder decoder (content, film->log(), false);
-	list<ContentVideo> a = decoder.video->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);
 }
diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index 539392718..974c50280 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -37,18 +37,18 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 	ImageDecoder decoder (c, film->log());
 
 	decoder.video->fill_one_eye (0, 4, EYES_BOTH);
-	BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 4U);
-	list<ContentVideo>::iterator i = decoder.video->_decoded_video.begin();
+	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 4U);
+	list<ContentVideo>::iterator i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 4; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j);
 		++i;
 	}
 
-	decoder.video->_decoded_video.clear ();
+	decoder.video->_decoded.clear ();
 
 	decoder.video->fill_one_eye (0, 7, EYES_BOTH);
-	BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 7);
-	i = decoder.video->_decoded_video.begin();
+	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 7);
+	i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 7; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j);
 		++i;
@@ -62,8 +62,8 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
 	ImageDecoder decoder (c, film->log());
 
 	decoder.video->fill_both_eyes (0, 4, EYES_LEFT);
-	BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 8);
-	list<ContentVideo>::iterator i = decoder.video->_decoded_video.begin();
+	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 8);
+	list<ContentVideo>::iterator i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 8; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j / 2);
 		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
@@ -71,8 +71,8 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
 	}
 
 	decoder.video->fill_both_eyes (0, 7, EYES_RIGHT);
-	BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 15);
-	i = decoder.video->_decoded_video.begin();
+	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 15);
+	i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 15; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j / 2);
 		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);