zynaddsubfx

commit a69b0b6287b02d5d8ea44bfaef77a4f0220ab8b1
parent cea16e4f3433d2ab4d00d5f875a1d86e0a31232d
Author: paulnasca <paulnasca>
Date:   Sun, 13 Jun 2004 21:01:53 +0000

*** empty log message ***

Diffstat:
M
src/Misc/Config.C
 | 
2
+-
M
src/Synth/OscilGen.C
 | 
2
+-
M
src/UI/BankUI.fl
 | 
17
+++++++++--------

3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/Misc/Config.C b/src/Misc/Config.C
@@ -79,7 +79,7 @@ Config::Config(){
 
     cfg.bankRootDirList=new char[MAX_STRING_SIZE];
 #if defined(OS_LINUX)
-    sprintf(cfg.bankRootDirList,"./\n/usr/share/zynaddsubfx/banks\n/usr/local/share/zynaddsubfx/banks\n;~/banks");
+    sprintf(cfg.bankRootDirList,"./\n/usr/share/zynaddsubfx/banks\n/usr/local/share/zynaddsubfx/banks\n~/banks");
 #else
     sprintf(cfg.bankRootDirList,"./");
 #endif
diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.C
@@ -49,7 +49,7 @@ OscilGen::~OscilGen(){
 
 void OscilGen::defaults(){
     oldbasefunc=0;oldbasepar=64;oldhmagtype=0;oldwaveshapingfunction=0;oldwaveshaping=64,oldnormalizemethod=0;
-    oldbasefuncmodulation=0;oldharmonicshift=0;
+    oldbasefuncmodulation=0;oldharmonicshift=0;oldbasefuncmodulationpar1=0;oldbasefuncmodulationpar2=0;
     for (int i=0;i<MAX_AD_HARMONICS;i++){
 	hmag[i]=0.0;
 	hphase[i]=0.0;
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -69,15 +69,15 @@ align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
 highlight=0;
 refresh();} {}
   }
-  Function {refresh()} {open
-  } {
+  Function {refresh()} {} {
     code {if (bank->emptyslot(nslot)) color(46);
     else color(51);
 
-if (*nselected==nslot) color(80);
+if (*nselected==nslot) color(6);
 
 
-label(bank->getnamenumbered(nslot));} {}
+label(bank->getnamenumbered(nslot));} {selected
+    }
   }
   decl {int *what,*whatslot,nslot,highlight, *nselected;} {}
   decl {void (BankProcess_:: *fnc)(void);} {}
@@ -86,12 +86,13 @@ label(bank->getnamenumbered(nslot));} {}
 
 class BankUI {: {public BankProcess_}
 } {
-  Function {make_window()} {} {
+  Function {make_window()} {open
+  } {
     Fl_Window bankuiwindow {
-      label Bank selected
-      xywh {4 64 785 575} type Double hide
+      label Bank
+      xywh {4 64 785 575} type Double
       code0 {o->label(bank->bankfiletitle);}
-      code1 {if (bank->bankfiletitle==NULL) o->label ("Choose a bank to use by pressing the 'Load/Use Bank from file...' button or choose 'New Bank...' to make a new bank.");}
+      code1 {if (bank->bankfiletitle==NULL) o->label ("Choose a bank to use by pressing the 'Load/Use Bank from file...' button or choose 'New Bank...' to make a new bank.");} visible
     } {
       Fl_Button {} {
         label Close