ref: bd1fa89b806943e5e99d6bef368af2c163ca8589
parent: 19f222d84d42721aa650f5dc006088e83a9ba2c3
parent: eaaba627e15400faa1b83b05a184ea885710d5c3
author: Paul Brossier <piem@piem.org>
date: Fri Mar 22 15:11:49 EDT 2013
Merge branch 'synth' into develop
--- a/src/synth/sampler.c
+++ b/src/synth/sampler.c
@@ -82,10 +82,10 @@
aubio_source_do_multi (o->source, o->source_output_multi, &read);
for (i = 0; i < output->height; i++) {
for (j = 0; j < output->length; j++) {
- output->data[i][j] = o->source_output_multi->data[i][j];
+ output->data[i][j] += o->source_output_multi->data[i][j];
}
}
- if (read == 0) o->playing = 0;
+ if ( read < o->blocksize ) o->playing = 0;
}
if (input && input != output) {
for (i = 0; i < output->height; i++) {