fix fm

grz0zrg · Mar 31, 2021 · 7855e55 · 7855e55
1 parent 8511ccc
commit 7855e55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/constants.h b/src/constants.h
@@ -1,8 +1,6 @@
 #ifndef _FAS_CONSTANTS_H_
 #define _FAS_CONSTANTS_H_
 
-    #define linearInterpolate(y1, y2, mu) (y1 * (1-mu) + y2 * mu)
-
     #ifndef M_PI
         #define M_PI (3.141592653589)
     #endif

diff --git a/src/main.c b/src/main.c
@@ -1845,12 +1845,10 @@ static int audioCallback(float **inputBuffer, float **outputBuffer, unsigned lon
                             double dummy_int_part;
 
                             if ((n->previous_volume_l <= 0 && n->previous_volume_r <= 0) || trigger_note_on) {
-                                resetOscillator(osc, k);
-
                                 osc->pvalue[k] = 0;
 
-                                osc->fp3[k][0] = modf(fabs(n->blue), &dummy_int_part);
-                                osc->fp4[k][0] = floor(fabs(n->blue)) / 65536.0;
+                                osc->fp3[k][0] = modf(fabs(n->pblue), &dummy_int_part);
+                                osc->fp4[k][0] = floor(fabs(n->pblue)) / 65536.0;
                                 osc->fp4[k][3] = osc->fp4[k][2];
                             }
 
@@ -1888,6 +1886,10 @@ static int audioCallback(float **inputBuffer, float **outputBuffer, unsigned lon
                                 osc->fp2[k][1] = fas_wavetable_size;
                             }
 
+                            if ((n->previous_volume_l <= 0 && n->previous_volume_r <= 0) || trigger_note_on) {
+                                osc->fp4[k][3] = osc->fp4[k][2];
+                            }
+
                             osc->fp3[k][1] = osc->fp3[k][0];
                             osc->fp3[k][0] = modf(fabs(n->blue), &dummy_int_part);