X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_mapping_test.cc;h=adf715fc432212e3c9359f5d442803322e22446b;hp=fc597b91df10e4ca9dadaf8303a4b7cb844de983;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index fc597b91d..adf715fc4 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -25,21 +26,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);
+		}
+	}
 }