X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_decoder_fill_test.cc;h=da23b277558ba284d0a086f78d39a4105286610b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=53939271833460d256d54a6ff82779ab1221f229;hpb=504c63b3d62038bc486ca8a09e77fbb403907edd;p=dcpomatic.git

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index 539392718..da23b2775 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2016 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/>.
 
 */
 
@@ -37,18 +38,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 +63,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 +72,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);