X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;h=800bbd049c0c64cc1401378b39d4fca963d40a36;hb=fa61fc99549264810e17fcd35abffe9e8ddab5b2;hp=1cd7e4a4270f60144ebd706cc15468c9193710e6;hpb=85c65bd422742813992686c17a5e1b718cc3c449;p=dcpomatic.git

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 1cd7e4a42..800bbd049 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,10 +17,15 @@
 
 */
 
+/** @test  test/stream_test.cc
+ *  @brief Some simple tests of FFmpegAudioStream.
+ */
+
 #include <boost/test/unit_test.hpp>
 #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;
@@ -65,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().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);
 }