clip vzfilter freq on init; handling for 0 cfxlen in sampler

Matthew Wang committed 6 years ago

Commit d57d77b1 parent 24675fa2 files · +5 −5Browse files

Unified · Split

2 files

@@ -1241,7 +1241,7 @@ void tVZFilter_initToPool (tVZFilter* const vf, VZFilterType type, float · 1240 unmodified lines
1241		1241
1242	LEAF* leaf = f->mempool->leaf;	1242	LEAF* leaf = f->mempool->leaf;
1243		1243
1244	f->fc = freq;	1244	f->fc = LEAF_clip(0.0f, freq, 0.5f * leaf->sampleRate);
1245	f->type = type;	1245	f->type = type;
1246	f->G = ONE_OVER_SQRT2;	1246	f->G = ONE_OVER_SQRT2;
1247	f->invG = 1.0f/ONE_OVER_SQRT2;	1247	f->invG = 1.0f/ONE_OVER_SQRT2;

                                                     buff[c3],
                                                     buff[c4],
                                                     alpha);
-            crossfadeMix = (float) offset / (float) cfxlen;
+            if (cfxlen > 0.0f) crossfadeMix = (float) offset / (float) cfxlen;
+            else crossfadeMix = 0.0f;
         }
         float flipLength = fabsf(p->flipIdx - p->flipStart);
         }
     }
     p->last = sample;
                                                      buff[(f4 * p->channels) + 1],
                                                      falpha);
-            flipMix = (float) (cfxlen - flipLength) / (float) cfxlen;
+            if (cfxlen > 0) flipMix = (float) (cfxlen - flipLength) / (float) cfxlen;
+            else flipMix = 1.0f;
         }
     }

Keyboard shortcuts