From 56d7e2e6ecb9eefeef34c29679d53a2620e6286c Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 15 Jun 2011 23:10:17 +0200
Subject: [PATCH] ZynAddSubFX: minor fixes from upstream

  * Fixing Envelopes not going to zero
  * FLTK1.3: Applying patch to force code generation
(cherry picked from commit a1006f7a3297f19d7e5052ce90f181cfd130f325)
---
 plugins/zynaddsubfx/src/Params/EnvelopeParams.h | 2 +-
 plugins/zynaddsubfx/src/Synth/Envelope.cpp      | 2 +-
 plugins/zynaddsubfx/src/UI/BankUI.fl            | 2 +-
 plugins/zynaddsubfx/src/UI/OscilGenUI.fl        | 2 +-
 plugins/zynaddsubfx/src/UI/PresetsUI.fl         | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/zynaddsubfx/src/Params/EnvelopeParams.h b/plugins/zynaddsubfx/src/Params/EnvelopeParams.h
index e2fcf3ec8..3a1c06aa0 100644
--- a/plugins/zynaddsubfx/src/Params/EnvelopeParams.h
+++ b/plugins/zynaddsubfx/src/Params/EnvelopeParams.h
@@ -28,7 +28,7 @@
 #include "Presets.h"
 
 #define MAX_ENVELOPE_POINTS 40
-#define MIN_ENVELOPE_DB -40
+#define MIN_ENVELOPE_DB -400
 
 class EnvelopeParams:public Presets
 {
diff --git a/plugins/zynaddsubfx/src/Synth/Envelope.cpp b/plugins/zynaddsubfx/src/Synth/Envelope.cpp
index a8f2ac662..1506d283f 100644
--- a/plugins/zynaddsubfx/src/Synth/Envelope.cpp
+++ b/plugins/zynaddsubfx/src/Synth/Envelope.cpp
@@ -183,7 +183,7 @@ REALTYPE Envelope::envout_dB()
         if(out > 0.001)
             envoutval = rap2dB(out);
         else
-            envoutval = -40.0;
+            envoutval = MIN_ENVELOPE_DB;
     }
     else
         out = dB2rap(envout());
diff --git a/plugins/zynaddsubfx/src/UI/BankUI.fl b/plugins/zynaddsubfx/src/UI/BankUI.fl
index 7aa8e7e10..624450212 100644
--- a/plugins/zynaddsubfx/src/UI/BankUI.fl
+++ b/plugins/zynaddsubfx/src/UI/BankUI.fl
@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {public
 
 class BankProcess_ {} {
   Function {process()} {open return_type {virtual void}
-  } {}
+  } {code{;}}
   decl {Bank *bank;} {public
   }
 } 
diff --git a/plugins/zynaddsubfx/src/UI/OscilGenUI.fl b/plugins/zynaddsubfx/src/UI/OscilGenUI.fl
index 4d15dc8a0..d686b2ecb 100644
--- a/plugins/zynaddsubfx/src/UI/OscilGenUI.fl
+++ b/plugins/zynaddsubfx/src/UI/OscilGenUI.fl
@@ -129,7 +129,7 @@ delete [] spc;} {selected
 
 class PSlider {: {public Fl_Slider}
 } {
-  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
+  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
   Function {handle(int event)} {return_type int
   } {
     code {int X=x(),Y=y(),W=w(),H=h();
diff --git a/plugins/zynaddsubfx/src/UI/PresetsUI.fl b/plugins/zynaddsubfx/src/UI/PresetsUI.fl
index dede2dd4d..adf8da050 100644
--- a/plugins/zynaddsubfx/src/UI/PresetsUI.fl
+++ b/plugins/zynaddsubfx/src/UI/PresetsUI.fl
@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {public
 
 class PresetsUI_ {} {
   Function {refresh()} {open return_type {virtual void}
-  } {}
+  } {code{;}}
   Function {~PresetsUI_()} {open return_type virtual
-  } {}
+  } {code{;}}
 } 
 
 class PresetsUI {} {