Changeset 8247249 for src/synth

Timestamp:

Oct 27, 2013, 11:36:06 PM (11 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:

650cae3

Parents:

dc467b5d

Message:

src/synth/wavetable.c: fix frequency interpolation, add amp to do_multi

File:

• src/synth/wavetable.c (modified) (3 diffs)

src/synth/wavetable.c

@@ -86 +86 @@
     smpl_t pos = s->last_pos;
     for (i = 0; i < output->length; i++) {
-      if (s->freq != s->target_freq)
+      if ( ABS(s->freq - s->target_freq) > ABS(s->inc_freq) )
         s->freq += s->inc_freq;
+      else
+        s->freq = s->target_freq;
       smpl_t inc = s->freq * (smpl_t)(s->wavetable_length) / (smpl_t) (s->samplerate);
       pos += inc;
@@ -117 +119 @@
     smpl_t pos = s->last_pos;
     for (j = 0; j < output->length; j++) {
-      if (s->freq != s->target_freq)
+      if ( ABS(s->freq - s->target_freq) > ABS(s->inc_freq) )
         s->freq += s->inc_freq;
+      else
+        s->freq = s->target_freq;
       smpl_t inc = s->freq * (smpl_t)(s->wavetable_length) / (smpl_t) (s->samplerate);
       pos += inc;
@@ -124 +128 @@
         pos -= s->wavetable_length;
       }
+      if ( ABS(s->amp - s->target_amp) > ABS(s->inc_amp) )
+        s->amp += s->inc_amp;
+      else
+        s->amp = s->target_amp;
       for (i = 0; i < output->height; i++) {
-        output->data[i][j] = interp_2(s->wavetable, pos);
+        output->data[i][j] = s->amp * interp_2(s->wavetable, pos);
       }
     }