Adapt Butler to keep a buffer of main and sign language video types.

4 files changed, 10 insertions, 10 deletions

diff --git a/test/butler_test.cc b/test/butler_test.cc
index f7c307e3c..f983a442e 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -66,9 +66,9 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 		Butler::Audio::ENABLED
 		);
 
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime());
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
-	BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24));
+	BOOST_CHECK (butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0).second == DCPTime());
+	BOOST_CHECK (butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
+	BOOST_CHECK (butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24));
 	/* XXX: check the frame contents */
 
 	float buffer[256 * 6];
@@ -116,14 +116,14 @@ BOOST_AUTO_TEST_CASE (butler_test2)
 	int const audio_frames_per_video_frame = 48000 / 25;
 	float audio_buffer[audio_frames_per_video_frame * 6];
 	for (int i = 0; i < 16; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
+		butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		butler.get_audio(Butler::Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
 	}
 
 	butler.seek (DCPTime::from_seconds(60), false);
 
 	for (int i = 0; i < 240; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
+		butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		butler.get_audio(Butler::Behaviour::BLOCKING, audio_buffer, audio_frames_per_video_frame);
 	}
 
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 3b08f998c..f0a8b5611 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 
 	std::vector<float> audio_buffer(2000 * 6);
 	while (true) {
-		auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0);
+		auto p = butler->get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		if (!p.first) {
 			break;
 		}
diff --git a/test/player_test.cc b/test/player_test.cc
index bb1f0df71..e209cd748 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	for (int i = 0; i < 10; ++i) {
 		auto t = DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
-		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
+		auto video = butler->get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		BOOST_CHECK_EQUAL(video.second.get(), t.get());
 		write_image(video.first->image(bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test_%1.png", i));
 		/* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	for (int i = 0; i < 10; ++i) {
 		auto t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
-		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
+		auto video = butler->get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		BOOST_CHECK_EQUAL(video.second.get(), t.get());
 		write_image(
 			video.first->image(bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test2_%1.png", i)
@@ -477,7 +477,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 
 	float buffer[2000 * 6];
 	for (int i = 0; i < length; ++i) {
-		butler.get_video(Butler::Behaviour::BLOCKING, 0);
+		butler.get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, 0);
 		butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 2000);
 	}
 
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 13bdf3fa0..5fb320a53 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 	butler->seek(dcpomatic::DCPTime(), true);
 	Butler::Error error;
 	for (auto i = 0; i < 960; ++i) {
-		butler->get_video(Butler::Behaviour::BLOCKING, &error);
+		butler->get_video(VideoType::MAIN, Butler::Behaviour::BLOCKING, &error);
 		butler->get_audio(Butler::Behaviour::BLOCKING, audio.data(), audio_frames);
 	}
 	BOOST_REQUIRE (error.code == Butler::Error::Code::NONE);