diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
| commit | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (patch) | |
| tree | 9ea43b250723775329741e59d5bc2dd861bcb7be /test | |
| parent | 1dcfb3a26085ebb3703f40e2f51e43ce3d98be50 (diff) | |
| parent | 5575a950f13dbed1e60d733aee71b316c3429ae0 (diff) | |
Merge master.
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_mapping_test.cc | 2 | ||||
| -rw-r--r-- | test/silence_padding_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc index f8467f3de..fc597b91d 100644 --- a/test/audio_mapping_test.cc +++ b/test/audio_mapping_test.cc @@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (audio_mapping_test) four.make_default (); for (int i = 0; i < 4; ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { + 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); } } diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index ff3690626..82b9def0e 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -121,7 +121,7 @@ test_silence_padding (int channels) BOOST_AUTO_TEST_CASE (silence_padding_test) { - for (int i = 1; i < MAX_AUDIO_CHANNELS; ++i) { + for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) { test_silence_padding (i); } } |