X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;h=de2108066bbc5c3147903bacdb17cbe759dafc61;hb=5f2a57d1c21c3e8067dfd1f68505b1bf96e1d7c7;hp=f30bc64d8329964912e04307cb90ab5f96b3a3bc;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/test/stream_test.cc b/test/stream_test.cc
index f30bc64d8..de2108066 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -25,6 +25,7 @@
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/film.h"
 
 using std::pair;
@@ -69,19 +70,19 @@ BOOST_AUTO_TEST_CASE (stream_test)
 		map->add_child("DCP")->add_child_text ("2");
 	}
 		
-	FFmpegAudioStream a (shared_ptr<cxml::Node> (new cxml::Node (root)), 5);
+	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().content_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, 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);
 }