projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few erroneous newlines.
[dcpomatic.git]
/
test
/
audio_merger_test.cc
diff --git
a/test/audio_merger_test.cc
b/test/audio_merger_test.cc
index f1d1dd634a6af8046f73608e4cd4a4fad9072ed6..31d055ab703b2961e5d447198e7758c5cc53075e 100644
(file)
--- a/
test/audio_merger_test.cc
+++ b/
test/audio_merger_test.cc
@@
-28,7
+28,6
@@
using boost::shared_ptr;
using boost::bind;
static shared_ptr<const AudioBuffers> last_audio;
using boost::bind;
static shared_ptr<const AudioBuffers> last_audio;
-static int last_time;
static int
pass_through (int x)
static int
pass_through (int x)
@@
-45,16
+44,12
@@
BOOST_AUTO_TEST_CASE (audio_merger_test1)
for (int i = 0; i < 64; ++i) {
buffers->data()[0][i] = i;
}
for (int i = 0; i < 64; ++i) {
buffers->data()[0][i] = i;
}
- TimedAudioBuffers<int> tb = merger.push (buffers, 0);
-
- /* That should not have caused an emission */
- BOOST_CHECK_EQUAL (tb.audio, shared_ptr<const AudioBuffers> ());
- BOOST_CHECK_EQUAL (tb.time, 0);
+ merger.push (buffers, 0);
/* Push 64 samples, 0 -> 63 at time 22 */
/* Push 64 samples, 0 -> 63 at time 22 */
-
tb =
merger.push (buffers, 22);
+ merger.push (buffers, 22);
- /* That should have caused an emission of 22 samples at 0 */
+ TimedAudioBuffers<int> tb = merger.pull (22);
BOOST_CHECK (tb.audio != shared_ptr<const AudioBuffers> ());
BOOST_CHECK_EQUAL (tb.audio->frames(), 22);
BOOST_CHECK_EQUAL (tb.time, 0);
BOOST_CHECK (tb.audio != shared_ptr<const AudioBuffers> ());
BOOST_CHECK_EQUAL (tb.audio->frames(), 22);
BOOST_CHECK_EQUAL (tb.time, 0);
@@
-89,9
+84,9
@@
BOOST_AUTO_TEST_CASE (audio_merger_test2)
for (int i = 0; i < 64; ++i) {
buffers->data()[0][i] = i;
}
for (int i = 0; i < 64; ++i) {
buffers->data()[0][i] = i;
}
-
TimedAudioBuffers<int> tb =
merger.push (buffers, 9);
+ merger.push (buffers, 9);
- /* That flush should give us 9 samples at 0 */
+ TimedAudioBuffers<int> tb = merger.pull (9);
BOOST_CHECK_EQUAL (tb.audio->frames(), 9);
BOOST_CHECK_EQUAL (tb.time, 0);
BOOST_CHECK_EQUAL (tb.audio->frames(), 9);
BOOST_CHECK_EQUAL (tb.time, 0);