zynaddsubfx

commit c31e7eb6e0303043d945481b3d009b22845efe31
parent 60141a61d8d5d1d103145f660060b43e46c2ce70
Author: Daniel Sheeler <dsheeler@pobox.com>
Date:   Sun, 24 Mar 2019 19:55:32 -0500

Fix master volume zipper.

Diffstat:
M
src/Misc/Master.cpp
 | 
25
++++++++++++++++++++-----
M
src/Misc/Master.h
 | 
1
+

2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp
@@ -862,6 +862,7 @@ void Master::defaults()
     union {float f; uint32_t i;} convert;
     convert.i = 0xC0D55556;
     Volume = convert.f;
+    oldVolume = Volume;
     setPkeyshift(64);
 
     for(int npart = 0; npart < NUM_MIDI_PARTS; ++npart) {
@@ -1302,12 +1303,25 @@ bool Master::AudioOut(float *outr, float *outl)
 
 
     //Master Volume
-    float v = dB2rap(Volume);
-    for(int i = 0; i < synth.buffersize; ++i) {
-        outl[i] *= v;
-        outr[i] *= v;
+    float oldvol = dB2rap(oldVolume);
+    float newvol = dB2rap(Volume);
+    if(ABOVE_AMPLITUDE_THRESHOLD(oldvol, newvol)) {
+        for(int i = 0; i < synth.buffersize; ++i) {
+            float vol = INTERPOLATE_AMPLITUDE(oldvol, newvol,
+                                              i, synth.buffersize);
+            outl[i] *= vol;
+            outr[i] *= vol;
+        }
+        oldVolume = Volume;
+    }
+    else {
+        // No interpolation
+        float vol = dB2rap(Volume);
+        for(int i = 0; i < synth.buffersize; ++i) {
+            outl[i] *= vol;
+            outr[i] *= vol;
+        }
     }
-
     vuUpdate(outl, outr);
 
     //Shutup if it is asked (with fade-out)
@@ -1598,6 +1612,7 @@ void Master::getfromXML(XMLwrapper& xml)
         xml.getparreal("volume", Volume);
     } else {
         Volume  = volume127ToFloat(xml.getpar127("volume", 0));
+        oldVolume = Volume;
     }
     setPkeyshift(xml.getpar127("key_shift", Pkeyshift));
     ctl.NRPN.receive = xml.getparbool("nrpn_receive", ctl.NRPN.receive);
diff --git a/src/Misc/Master.h b/src/Misc/Master.h
@@ -187,6 +187,7 @@ class Master
         class FFTwrapper * fft;
 
         static const rtosc::Ports &ports;
+        float oldVolume;
         float  Volume;
 
         //Statistics on output levels