X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_mapping_test.cc;h=22412b26050bae8b9de001e458a26a49b4e595e7;hb=f4fda1d705adfca0b7c8d3748c0c9df8e9da51bc;hp=8599c6af561911ad67756d015e5bd4b8f4edb219;hpb=1a3bf8411529e2d6c21244b970c3e5d962396cce;p=dcpomatic.git

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index 8599c6af5..22412b260 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -27,7 +27,8 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_mapping.h"
-#include "lib/util.h"
+#include "lib/constants.h"
+#include "lib/compose.hpp"
 
 
 using std::list;
@@ -94,8 +95,56 @@ BOOST_AUTO_TEST_CASE (audio_mapping_guess_test)
 	guess_check ("more_Lss_s.wav", 4);
 	guess_check ("other_Rss.aiff", 5);
 
-	/* Only the filename should be taken into acccount */
+	/* Only the filename should be taken into account */
 	guess_check ("-Lfe-/foo_L.wav", 0);
+
+	/* Dolby-style */
+	guess_check ("jake-Lrs-good.wav", 6);
+	guess_check ("elwood-Rrs-good.wav", 7);
 }
 
 
+BOOST_AUTO_TEST_CASE(audio_mapping_take_from_larger)
+{
+	AudioMapping A(4, 9);
+	AudioMapping B(2, 3);
+
+	A.set(0, 0, 4);
+	A.set(1, 0, 8);
+	A.set(0, 1, 3);
+	A.set(1, 1, 6);
+	A.set(0, 2, 1);
+	A.set(1, 2, 9);
+
+	B.take_from(A);
+
+	BOOST_CHECK_CLOSE(B.get(0, 0), 4, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 0), 8, 0.01);
+	BOOST_CHECK_CLOSE(B.get(0, 1), 3, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 1), 6, 0.01);
+	BOOST_CHECK_CLOSE(B.get(0, 2), 1, 0.01);
+	BOOST_CHECK_CLOSE(B.get(1, 2), 9, 0.01);
+}
+
+
+BOOST_AUTO_TEST_CASE(audio_mapping_take_from_smaller)
+{
+	AudioMapping A(4, 9);
+	AudioMapping B(2, 3);
+
+	B.set(0, 0, 4);
+	B.set(1, 0, 8);
+	B.set(0, 1, 3);
+	B.set(1, 1, 6);
+	B.set(0, 2, 1);
+	B.set(1, 2, 9);
+
+	A.take_from(B);
+
+	BOOST_CHECK_CLOSE(A.get(0, 0), 4, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 0), 8, 0.01);
+	BOOST_CHECK_CLOSE(A.get(0, 1), 3, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 1), 6, 0.01);
+	BOOST_CHECK_CLOSE(A.get(0, 2), 1, 0.01);
+	BOOST_CHECK_CLOSE(A.get(1, 2), 9, 0.01);
+}