diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-07 10:57:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-07 10:57:33 +0000 |
| commit | 08d62727f7f1c813cbc7041027fe4a52518623da (patch) | |
| tree | 756e38e4ad5ee2bdb51690e8a6fb149909c53712 /test/audio_merger_test.cc | |
| parent | 09806bc8d6a48fc79d923ec1cdf6f90176bf8b6a (diff) | |
operator bool on Time is a really bad idea; removed it and fixed lots of bugs.
Diffstat (limited to 'test/audio_merger_test.cc')
| -rw-r--r-- | test/audio_merger_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index e8af22d2a..c65c0defd 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1) TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (22, frame_rate)); BOOST_CHECK (tb.audio != shared_ptr<const AudioBuffers> ()); BOOST_CHECK_EQUAL (tb.audio->frames(), 22); - BOOST_CHECK_EQUAL (tb.time, 0); + BOOST_CHECK_EQUAL (tb.time, DCPTime ()); /* And they should be a staircase */ for (int i = 0; i < 22; ++i) { @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2) TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (9, frame_rate)); BOOST_CHECK_EQUAL (tb.audio->frames(), 9); - BOOST_CHECK_EQUAL (tb.time, 0); + BOOST_CHECK_EQUAL (tb.time, DCPTime ()); for (int i = 0; i < 9; ++i) { BOOST_CHECK_EQUAL (tb.audio->data()[0][i], 0); @@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2) /* That flush should give us 64 samples at 9 */ BOOST_CHECK_EQUAL (tb.audio->frames(), 64); - BOOST_CHECK_EQUAL (tb.time, 9); + BOOST_CHECK_EQUAL (tb.time, DCPTime::from_frames (9, frame_rate)); /* Check the sample values */ for (int i = 0; i < 64; ++i) { |