X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;h=ec211a929772a15a89d6307a4ea2f4c4f33df1f6;hb=a513606c2129d9485e6f3cf25d9128602cc93999;hp=16ab83baf7747ea933ac1c59d7d115e04e22c591;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 16ab83baf..ec211a929 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (stream_test)
 	root->add_child("Channels")->add_child_text ("2");
 
 	/* This is the state file version 5 description of the mapping */
-	
+
 	xmlpp::Element* mapping = root->add_child("Mapping");
 	mapping->add_child("ContentChannels")->add_child_text ("2");
 	{
@@ -69,20 +69,20 @@ BOOST_AUTO_TEST_CASE (stream_test)
 		map->add_child("ContentIndex")->add_child_text ("1");
 		map->add_child("DCP")->add_child_text ("2");
 	}
-		
+
 	FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
 
 	BOOST_CHECK_EQUAL (a.identifier(), "4");
-	BOOST_CHECK_EQUAL (a.frame_rate, 44100);
-	BOOST_CHECK_EQUAL (a.channels, 2);
+	BOOST_CHECK_EQUAL (a.frame_rate(), 44100);
+	BOOST_CHECK_EQUAL (a.channels(), 2);
 	BOOST_CHECK_EQUAL (a.name, "hello there world");
-	BOOST_CHECK_EQUAL (a.mapping.content_channels(), 2);
+	BOOST_CHECK_EQUAL (a.mapping().input_channels(), 2);
 
-	BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::LEFT), 1);
-	BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::RIGHT), 0);
-	BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::CENTRE), 1);
-	BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::LEFT), 0);
-	BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::RIGHT), 1);
-	BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::CENTRE), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::LEFT)), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::RIGHT)), 0);
+	BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::CENTRE)), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::LEFT)), 0);
+	BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::RIGHT)), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::CENTRE)), 1);
 }