zynaddsubfx

commit ad87fcef7deb737eb3eb2a05c300c31b267a4a0c
parent c87573c05afb422d1c7f0f060ab9cf959b266a69
Author: fundamental <[email protected]>
Date:   Fri,  8 Jan 2021 19:24:07 -0500

Watchpoints: Fix missing env/LFO watch points

With the newer watchpoint code for osciloscope views a bug was
introduced which would result in only the first envelope or lfo point
being captured. In the case of multiple notes the other values were
supplied to the watch point manager, but never recorded and set to the
frontend.

Diffstat:
M
src/Synth/WatchPoint.cpp
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/Synth/WatchPoint.cpp b/src/Synth/WatchPoint.cpp
@@ -183,23 +183,26 @@ void WatchManager::satisfy(const char *id, float f)
 }
 
 void WatchManager::satisfy(const char *id, float *f, int n)
-{   
+{
     int selected = -1;    
     for(int i=0; i<MAX_WATCH; ++i)
         if(!strcmp(active_list[i], id))
             selected = i;
-    
+
     if(selected == -1)
         return;
 
     int space = MAX_SAMPLE - sample_list[selected];
-    
+
     if(space >= n || !trigger[selected])
         space = n;
+
+    //special case to capture the time+level pairs that come from
+    //envelopes/LFOs
     if(n == 2)
         trigger[selected] = true;
 
-    if(space && call_count[selected]==0){
+    if(space && (call_count[selected]==0 || n == 2)){
         for(int i=0; i<space; i++){
             const float prev = prebuffer[selected][(prebuffer_sample[selected]+MAX_SAMPLE/2-1)%(MAX_SAMPLE/2)];
             if(!trigger[selected]){
@@ -222,7 +225,7 @@ void WatchManager::satisfy(const char *id, float *f, int n)
                         space = i+space;
                     else
                         space = n;
-                   trigger_other(selected);
+                    trigger_other(selected);
                 }
             }
 
@@ -235,11 +238,11 @@ void WatchManager::satisfy(const char *id, float *f, int n)
                 prebuffer_done[selected] = false;
         }
     }
-        call_count[selected]++;
+    call_count[selected]++;
 }
 
 void WatchManager::trigger_other(int selected){
-     for(int k=0; k<MAX_WATCH; ++k){
+    for(int k=0; k<MAX_WATCH; ++k){
         if(selected != k && !trigger[k] && prebuffer_sample[k]>(MAX_SAMPLE/2) ){
             char tmp[128];
             char tmp1[128];