see ChangeLog

5 files changed, 19 insertions, 11 deletions

diff --git a/muse/ChangeLog b/muse/ChangeLog
index 16350ec4..5b0e7fde 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,5 @@
+19.01 (ng)
+      - fixed bug to prevent muse from halting when trying to load a non-ladpsa plugin (by Willy Foobar)
 06.01 (ng)
       - added panDelay plugin FX
       - added panDelay in DeicsOnze
diff --git a/muse/awl/midimslider.cpp b/muse/awl/midimslider.cpp
index c7d7efa8..d8c66f2d 100644
--- a/muse/awl/midimslider.cpp
+++ b/muse/awl/midimslider.cpp
@@ -107,7 +107,11 @@ void MidiMeterSlider::paint(const QRect& r)
             h = 0;
       else if (h > mh)
             h = mh;
+      //QColor qc;
+      //float v = 5.0/6.0 + 1.0/6.0 * meterval;
+      //qc.setHsvF(1.0/3.0, 1.0, (v<=1.0?v:1.0));
       p.fillRect(x, y3-h, mw, h,    QBrush(0x00ff00)); // green
+      //p.fillRect(x, y3-h, mw, h,    QBrush(qc)); // green get a bit darker
       p.fillRect(x, y1,   mw, mh-h, QBrush(0x007000)); // dark green
       x += mw;
 
diff --git a/muse/synti/deicsonze/deicsonze.cpp b/muse/synti/deicsonze/deicsonze.cpp
index cf45ace7..9cbf8ab0 100644
--- a/muse/synti/deicsonze/deicsonze.cpp
+++ b/muse/synti/deicsonze/deicsonze.cpp
@@ -1742,14 +1742,14 @@ inline double outLevel2Amp(int ol) {
 
 //---------------------------------------------------------
 // lowlevel2amp, 
-//  127->0dB->1.0, 0->-27dB->0
+//  127->0dB->1.0, 0->-25dB->0
 //---------------------------------------------------------
 inline double lowlevel2amp(int l) {
   double a, b, c, db;
   if(l==0) return 0.0;
   else {
-    a = 27.0/127.0;
-    b = -27.0;
+    a = DB_MIN/127.0;
+    b = -DB_MIN;
     db = a*l+b;
     c = -log(2)/3;
     return exp(-c*db);
@@ -1758,14 +1758,14 @@ inline double lowlevel2amp(int l) {
 
 //---------------------------------------------------------
 // level2amp, 
-//  255->0dB->1.0, 0->-27dB->0
+//  255->0dB->1.0, 0->-25dB->0
 //---------------------------------------------------------
 inline double level2amp(int l) {
   double a, b, c, db;
   if(l==0) return 0.0;
   else {
-    a = 27.0/255.0;
-    b = -27.0;
+    a = DB_MIN/255.0;
+    b = -DB_MIN;
     db = a*l+b;
     c = -log(2.0)/3.0;
     return exp(-c*db);
@@ -1774,11 +1774,11 @@ inline double level2amp(int l) {
 
 //---------------------------------------------------------
 // amp2level
-// 1.0->0dB->255, 0->-27dB->0
+// 1.0->0dB->255, 0->-25dB->0
 //---------------------------------------------------------
 inline int amp2level(double amp){
   double a, b, c;
-  a = 255.0/27.0;
+  a = 255.0/DB_MIN;
   b = 255.0;
   c = log(2.0)/3.0;
   return (int)(a*(log(amp)/c)+b);
@@ -1786,11 +1786,11 @@ inline int amp2level(double amp){
 
 //---------------------------------------------------------
 // amp2lowlevel
-// 1.0->0dB->127, 0->-27dB->0
+// 1.0->0dB->127, 0->-25dB->0
 //---------------------------------------------------------
 inline int amp2lowlevel(double amp){
   double a, b, c;
-  a = 127.0/27.0;
+  a = 127.0/DB_MIN;
   b = 127.0;
   c = log(2.0)/3.0;
   return (int)(a*(log(amp)/c)+b);
diff --git a/muse/synti/deicsonze/deicsonze.h b/muse/synti/deicsonze/deicsonze.h
index 4bc49b16..5e1f74b7 100644
--- a/muse/synti/deicsonze/deicsonze.h
+++ b/muse/synti/deicsonze/deicsonze.h
@@ -69,6 +69,8 @@
 #define MAXSTRLENGTHFXLIB 256
 #define MAXSTRLENGTHFXLABEL 256
 
+#define DB_MIN 25.0
+
 //coef determined by ear to sound like the YAMAHA DX11
 #define COEFFEEDBACK 0.3
 #define COEFPLFO(x) (x==0?0.0:(x==1?0.06:(x==2?0.12:(x==3?0.25:(x==4?0.5:(x==5?0.9:(x==6?3.9:7.9))))))) //return pitch amplitude with respect to sensitivity pitch
diff --git a/muse/synti/simpledrums/ssplugin.cpp b/muse/synti/simpledrums/ssplugin.cpp
index 8bf9a0e9..24ee9b21 100644
--- a/muse/synti/simpledrums/ssplugin.cpp
+++ b/muse/synti/simpledrums/ssplugin.cpp
@@ -49,7 +49,7 @@ static void loadPluginLib(QFileInfo* fi)
                         "Are you sure this is a LADSPA plugin file?\n",
                         fi->filePath().toAscii().data(),
                         txt);
-                  exit(1);
+                  return;//exit(1);
                   }
             }
       const LADSPA_Descriptor* descr;