diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
| commit | fa61fc99549264810e17fcd35abffe9e8ddab5b2 (patch) | |
| tree | 855ce952ed8b416bbab33cd6debbd0f2b7379597 /test | |
| parent | 3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7 (diff) | |
Various work on audio mapping.
Fix everything up so that the audio mapping view in
the audio panel reflects the processor (or lack of).
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_mapping_test.cc | 17 | ||||
| -rw-r--r-- | test/stream_test.cc | 14 |
2 files changed, 12 insertions, 19 deletions
diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc index fc597b91d..14c6d031d 100644 --- a/test/audio_mapping_test.cc +++ b/test/audio_mapping_test.cc @@ -28,18 +28,11 @@ 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); - BOOST_CHECK_EQUAL (four.content_channels(), 4); - four.make_default (); + AudioMapping four (4, MAX_DCP_AUDIO_CHANNELS); + BOOST_CHECK_EQUAL (four.input_channels(), 4); - 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); - } - } - - four.set (0, dcp::RIGHT, 1); - BOOST_CHECK_EQUAL (four.get (0, dcp::RIGHT), 1); + four.set (0, 1, 1); + BOOST_CHECK_EQUAL (four.get (0, 1), 1); } diff --git a/test/stream_test.cc b/test/stream_test.cc index de2108066..800bbd049 100644 --- a/test/stream_test.cc +++ b/test/stream_test.cc @@ -76,13 +76,13 @@ BOOST_AUTO_TEST_CASE (stream_test) 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); } |