X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_mapping_test.cc;h=d24efedfdcd5ae5899811791290cbbb2a8389ec1;hb=e93b696a5ee3d39c723a79bb22fe6768916936eb;hp=fc597b91df10e4ca9dadaf8303a4b7cb844de983;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index fc597b91d..d24efedfd 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -25,21 +25,33 @@
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
 
+using std::list;
+
 BOOST_AUTO_TEST_CASE (audio_mapping_test)
 {
 	AudioMapping none;
-	BOOST_CHECK_EQUAL (none.content_channels(), 0);
+	BOOST_CHECK_EQUAL (none.input_channels(), 0);
+
+	AudioMapping four (4, MAX_DCP_AUDIO_CHANNELS);
+	BOOST_CHECK_EQUAL (four.input_channels(), 4);
 
-	AudioMapping four (4);
-	BOOST_CHECK_EQUAL (four.content_channels(), 4);
-	four.make_default ();
+	four.set (0, 1, 1);
 
 	for (int i = 0; i < 4; ++i) {
 		for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
-			BOOST_CHECK_EQUAL (four.get (i, static_cast<dcp::Channel> (j)), i == j ? 1 : 0);
+			BOOST_CHECK_EQUAL (four.get (i, j), (i == 0 && j == 1) ? 1 : 0);
 		}
 	}
 
-	four.set (0, dcp::RIGHT, 1);
-	BOOST_CHECK_EQUAL (four.get (0, dcp::RIGHT), 1);
+	list<int> mapped = four.mapped_output_channels ();
+	BOOST_CHECK_EQUAL (mapped.size(), 1);
+	BOOST_CHECK_EQUAL (mapped.front(), 1);
+
+	four.make_zero ();
+
+	for (int i = 0; i < 4; ++i) {
+		for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
+			BOOST_CHECK_EQUAL (four.get (i, j), 0);
+		}
+	}
 }