zynaddsubfx

commit 78eede1a5356d42b8b555d1746fbbdc02552cc8c
parent 838157d3a1fa50c6be195b426ee4a9332259c07b
Author: paulnasca <paulnasca>
Date:   Wed, 18 Aug 2004 15:56:14 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
1
+
M
src/UI/BankUI.fl
 | 
36
+++++++++++++++++++-----------------

2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -692,6 +692,7 @@
 	    - Adaugat refresh si la Filtru si paste la ADnote, SUBnote si PADsynth sunt complete
 17 Aug 2004 - Adaugat clipboard la LFO, Envelope, ADnoteVoice si Filter Vowel
 18 Aug 2004 - In clipboard se salveaza toti parametrii (chiar si cei dezactivati)
+	    - Corectata o eroare care facea ca instrumentul sa fie incarcat la fiecare salvare in banca
 	    
 	    
 	    
 \ No newline at end of file
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -28,7 +28,7 @@ decl {\#include "../Misc/Bank.h"} {public
 } 
 
 class BankProcess_ {} {
-  Function {process()} {return_type {virtual void}
+  Function {process()} {open return_type {virtual void}
   } {}
   decl {Bank *bank;} {public
   }
@@ -85,8 +85,7 @@ label(bank->getnamenumbered(nslot));} {}
 
 class BankUI {: {public BankProcess_}
 } {
-  Function {make_window()} {selected
-  } {
+  Function {make_window()} {} {
     Fl_Window bankuiwindow {
       label Bank
       xywh {4 64 785 575} type Double hide
@@ -243,19 +242,6 @@ if ((what==2)&&(bank->emptyslot(slot)==0)&&(mode!=4)) {//Rename slot
     bs[slot]->refresh();
 };
 
-if ((what==1)&&(mode==2)){//save(write) to slot
-  if (!bank->emptyslot(slot))
-      if (!fl_ask("Overwrite the slot no. %d ?",slot+1)) goto nooverwriteslot;
-       pthread_mutex_lock(&master->mutex);
-        bank->savetoslot(slot,master->part[*npart]);
-       pthread_mutex_unlock(&master->mutex);
-
-       bs[slot]->refresh();
-       mode=1;readbutton->value(1);writebutton->value(0);
-       nooverwriteslot:;
-};
-
-
 if ((what==1)&&(mode==1)&&(!bank->emptyslot(slot))){//Reads from slot
     pthread_mutex_lock(&master->mutex);
      bank->loadfromslot(slot,master->part[*npart]);
@@ -275,6 +261,21 @@ if ((what==1)&&(mode==1)&&(!bank->emptyslot(slot))){//Reads from slot
 
 };
 
+if ((what==1)&&(mode==2)){//save(write) to slot
+     if (!bank->emptyslot(slot)){
+       if (!fl_ask("Overwrite the slot no. %d ?",slot+1)) goto nooverwriteslot;
+      };
+       pthread_mutex_lock(&master->mutex);
+        bank->savetoslot(slot,master->part[*npart]);
+       pthread_mutex_unlock(&master->mutex);
+
+       bs[slot]->refresh();
+       mode=1;readbutton->value(1);writebutton->value(0);
+       nooverwriteslot:;
+};
+
+
+
 if ((what==1)&&(mode==3)&&(!bank->emptyslot(slot))){//Clears the slot
       if (fl_ask("Clear the slot no. %d ?",slot+1)){
           bank->clearslot(slot);
@@ -299,7 +300,8 @@ if (mode==4){//swap
         bs[slot]->refresh();
     };
 };
-if (mode!=4) refreshmainwindow();} {}
+if (mode!=4) refreshmainwindow();} {selected
+    }
   }
   Function {refreshmainwindow()} {} {
     code {bankuiwindow->label(bank->bankfiletitle);