zynaddsubfx

commit 6b9d9d6aaf8d33c6bb6353da82ad9bb66af1b2e0
parent 14d2751bed1e6bb11805bb17e4a73e622c85a4ac
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Thu, 29 Oct 2009 18:24:37 -0400

Merge branch 'master' of ssh://zynaddsubfx.git.sourceforge.net/gitroot/zynaddsubfx/zynaddsubfx

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/Tests/MicrotonalTest.h
 | 
1
-
M
src/UI/EffUI.fl
 | 
12
+++++++-----

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -957,3 +957,6 @@
 
 09 Oct 2009 (Mark McCurry)
 	    - Restylized codebase with uncrustify
+
+28 Oct 2009 (Paul Nasca)
+	    - Disable "bw" control on Reverb when Bandwidth mode is not enabled
diff --git a/src/Tests/MicrotonalTest.h b/src/Tests/MicrotonalTest.h
@@ -111,7 +111,6 @@ class MicrotonalTest:public CxxTest::TestSuite
         }
 
         /**\todo Test Saving/loading from file*/
-        //void testSaveLoad() {}
 
         //Test texttomapping TODO finish
         void testTextToMapping() {
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -260,7 +260,9 @@ refresh(eff);}
       }
       Fl_Choice revp10 {
         label Type
-        callback {eff->seteffectpar(10,(int) o->value());} open
+        callback {eff->seteffectpar(10,(int) o->value());
+if (eff->geteffectpar(10)==2) revp12->activate();
+	else revp12->deactivate();}
         xywh {110 15 85 15} down_box BORDER_BOX color 14 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
       } {
         MenuItem {} {
@@ -309,7 +311,8 @@ refresh(eff);}
       Fl_Dial revp12 {
         label bw
         callback {eff->seteffectpar(12,(int) o->value());}
-        xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
+        xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127 deactivate
+        code0 {if (eff->geteffectpar(10)==2) o->activate();}
         class WidgetPDial
       }
       Fl_Dial revp6 {
@@ -341,7 +344,7 @@ refresh(eff);}
         callback {int x=64;
 if (Fl::event_button1()) x=(int)o->value();
    else o->value(x);
-eff->seteffectpar(11,x);}
+eff->seteffectpar(11,x);} selected
         tooltip RoomSize xywh {200 10 25 25} box ROUND_UP_BOX labelfont 1 labelsize 8 align 8 minimum 1 maximum 127 step 1
         class WidgetPDial
       }
@@ -1417,8 +1420,7 @@ switch(eff->geteffect()){
             break; 
 };
 
-this->show();} {selected
-    }
+this->show();} {}
   }
   Function {refresh()} {} {
     code {refresh(eff);} {}