zynaddsubfx

commit df2d25bc39c6405eae20d0217825ee896999b6d6
parent 6191b806cca170866cb08a6b2def2957359adb64
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sat, 29 May 2010 12:50:53 -0400

APhaser: fixing parameter ordering

Diffstat:
M
src/Effects/APhaser.cpp
 | 
20
++++++++++----------
M
src/UI/EffUI.fl
 | 
6
+++---

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/Effects/APhaser.cpp b/src/Effects/APhaser.cpp
@@ -268,17 +268,17 @@ void Analog_Phaser::setpreset(unsigned char npreset)
     const int NUM_PRESETS = 6;
     unsigned char presets[NUM_PRESETS][PRESET_SIZE] = {
         //Phaser1
-        {64, 64, 14, 0, 1, 64, 110, 40, 4, 10, 0, 64, 1, 20},
+        {64, 64,  14,  0, 1, 64, 64, 40,  4,  10, 0, 110, 1, 20},
         //Phaser2
-        {64, 64, 14, 5, 1, 64, 110, 40, 6, 10, 0, 70, 1, 20},
+        {64, 64,  14,  5, 1, 64, 70, 40,  6,  10, 0, 110, 1, 20},
         //Phaser3
-        {64, 64, 9, 0, 0, 64, 40, 40, 8, 10, 0, 60, 0, 20},
+        {64, 64,  9,   0, 0, 64, 60, 40,  8,  10, 0,  40, 0, 20},
         //Phaser4
-        {64, 64, 14, 10, 0, 64, 110, 80, 7, 10, 1, 45, 1, 20},
+        {64, 64,  14, 10, 0, 64, 45, 80,  7,  10, 1, 110, 1, 20},
         //Phaser5
-        {25, 64, 127, 10, 0, 64, 25, 16, 8, 100, 0, 25, 0, 20},
+        {25, 64, 127, 10, 0, 64, 25, 16,  8, 100, 0,  25, 0, 20},
         //Phaser6
-        {64, 64, 1, 10, 1, 64, 110, 40, 12, 10, 0, 70, 1, 20}
+        {64, 64,   1, 10, 1, 64, 70, 40, 12,  10, 0, 110, 1, 20}
     };
     if(npreset >= NUM_PRESETS)
         npreset = NUM_PRESETS - 1;
@@ -315,7 +315,7 @@ void Analog_Phaser::changepar(int npar, unsigned char value)
             lfo.updateparams();
             break;
         case 6:
-            setwidth(value);
+            setdepth(value);
             break;
         case 7:
             setfb(value);
@@ -330,7 +330,7 @@ void Analog_Phaser::changepar(int npar, unsigned char value)
             Poutsub = min((int)value,1);
             break;
         case 11:
-            setdepth(value);
+            setwidth(value);
             break;
         case 12:
             Phyper = min((int)value, 1);
@@ -357,7 +357,7 @@ unsigned char Analog_Phaser::getpar(int npar) const
         case 5:
             return lfo.Pstereo;
         case 6:
-            return Pwidth;
+            return Pdepth;
         case 7:
             return Pfb;
         case 8:
@@ -367,7 +367,7 @@ unsigned char Analog_Phaser::getpar(int npar) const
         case 10:
             return Poutsub;
         case 11:
-            return Pdepth;
+            return Pwidth;
         case 12:
             return Phyper;
         case 13:
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -820,8 +820,8 @@ refresh(eff);}
         tooltip {inverts output} xywh {190 10 74 20} box THIN_UP_BOX down_box DOWN_BOX color 230 labelfont 1 labelsize 10
       }
       Fl_Dial aphaser11 {
-        label Depth
-        callback {eff->seteffectpar(11,(int) o->value());}
+        label Width
+        callback {eff->seteffectpar(11,(int) o->value());} selected
         xywh {215 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 maximum 127
         class WidgetPDial
       }
@@ -832,7 +832,7 @@ refresh(eff);}
       }
       Fl_Dial aphaser13 {
         label dist
-        callback {eff->seteffectpar(13,(int) o->value());} selected
+        callback {eff->seteffectpar(13,(int) o->value());}
         tooltip Distortion xywh {85 5 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
         class WidgetPDial
       }