diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
| commit | 978be856218cc15f059b7e267811e7302c37b24d (patch) | |
| tree | 41b97f950dbc5c30953abe4e98ca5053bdff73bc /test | |
| parent | ae0e45e03ab168de0d291cfa1520beedd6a0a899 (diff) | |
Remove template from TimedAudioBuffers; a couple of small fixes.
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_merger_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index c65c0defd..2fa0ccea5 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1) /* Push 64 samples, 0 -> 63 at time 22 */ merger.push (buffers, DCPTime::from_frames (22, frame_rate)); - TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (22, frame_rate)); + TimedAudioBuffers 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, DCPTime ()); @@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2) } merger.push (buffers, DCPTime::from_frames (9, frame_rate)); - TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (9, frame_rate)); + TimedAudioBuffers tb = merger.pull (DCPTime::from_frames (9, frame_rate)); BOOST_CHECK_EQUAL (tb.audio->frames(), 9); BOOST_CHECK_EQUAL (tb.time, DCPTime ()); |