Changeset bd1fa89 for src

Timestamp:

Mar 23, 2013, 1:11:49 AM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

c19f9e5, f174a22

Parents:

19f222d (diff), eaaba62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'synth' into develop

File:

• src/synth/sampler.c (modified) (1 diff)

src/synth/sampler.c

@@ -83 +83 @@
     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) {