X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_decoder_fill_test.cc;h=67e84b7137863c5803a2f6d9f171ef8c677f77ae;hb=10a0dd6c5153019e0b17793c812f1653f26e0960;hp=25f7548535e8b793869e3b4a1687310d02c3bd58;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index 25f754853..67e84b713 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -21,6 +21,7 @@
 #include "lib/image_decoder.h"
 #include "lib/image_content.h"
 #include "test.h"
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -32,7 +33,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 	shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 	ImageDecoder decoder (c);
 
-	decoder.fill_2d (0, 4);
+	decoder.fill_one_eye (0, 4, EYES_BOTH);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4U);
 	list<ContentVideo>::iterator i = decoder._decoded_video.begin();
 	for (int j = 0; j < 4; ++j) {
@@ -42,7 +43,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 
 	decoder._decoded_video.clear ();
 
-	decoder.fill_2d (0, 7);
+	decoder.fill_one_eye (0, 7, EYES_BOTH);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 7);
 	i = decoder._decoded_video.begin();
 	for (int j = 0; j < 7; ++j) {
@@ -57,7 +58,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
 	shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 	ImageDecoder decoder (c);
 
-	decoder.fill_3d (0, 4, EYES_LEFT);
+	decoder.fill_both_eyes (0, 4, EYES_LEFT);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 8);
 	list<ContentVideo>::iterator i = decoder._decoded_video.begin();
 	for (int j = 0; j < 8; ++j) {
@@ -66,7 +67,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
 		++i;
 	}
 
-	decoder.fill_3d (0, 7, EYES_RIGHT);
+	decoder.fill_both_eyes (0, 7, EYES_RIGHT);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 15);
 	i = decoder._decoded_video.begin();
 	for (int j = 0; j < 15; ++j) {