Changeset bd1fa89 for src


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/synth/sampler.c

    r19f222d rbd1fa89  
    8383    for (i = 0; i < output->height; i++) {
    8484      for (j = 0; j < output->length; j++) {
    85         output->data[i][j] = o->source_output_multi->data[i][j];
     85        output->data[i][j] += o->source_output_multi->data[i][j];
    8686      }
    8787    }
    88     if (read == 0) o->playing = 0;
     88    if ( read < o->blocksize ) o->playing = 0;
    8989  }
    9090  if (input && input != output) {
Note: See TracChangeset for help on using the changeset viewer.