zynaddsubfx

commit cc982c4d028ea38b6e1cf1f760c3890e142eb836
parent edcc06da9f71f921139a926618e691656d60069b
Author: paulnasca <paulnasca>
Date:   Mon,  6 Sep 2004 19:02:22 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
++
M
src/Misc/Part.C
 | 
2
+-
M
src/Misc/Part.h
 | 
2
+-
M
src/UI/BankUI.fl
 | 
13
++++---------
M
src/UI/PartUI.fl
 | 
15
++-------------

5 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -710,4 +710,6 @@
             - LANSAT PE INTERNET - VERSIUNEA (2.0.0)
 --------------------------------------------------------------------------------------------------
 05 Sep 2004 - Corectata o mica eroare de la SUBnote (legat de pitch wheel)	    
+06 Sep 2004 - Eliminata variabila "disablekitloading" din Part si din UI
+
 	    
 \ No newline at end of file
diff --git a/src/Misc/Part.C b/src/Misc/Part.C
@@ -76,7 +76,7 @@ Part::Part(Microtonal *microtonal_,FFTwrapper *fft_, pthread_mutex_t *mutex_){
     Pname=new unsigned char [PART_MAX_NAME_LEN];
     
     oldvolumel=oldvolumer=0.5;
-    lastnote=-1;disablekitloading=0;
+    lastnote=-1;
     
     
     defaults();
diff --git a/src/Misc/Part.h b/src/Misc/Part.h
@@ -140,7 +140,7 @@ class Part{
 
       pthread_mutex_t *mutex;
       
-      int lastnote,disablekitloading;      
+      int lastnote;      
       
     private:
       void KillNotePos(int pos); 
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -27,7 +27,7 @@ decl {\#include "../Misc/Master.h"} {public
 decl {\#include "../Misc/Bank.h"} {public
 } 
 
-decl {\#include "../Misc/Config.h"} {selected public
+decl {\#include "../Misc/Config.h"} {public
 } 
 
 class BankProcess_ {} {
@@ -250,13 +250,7 @@ if ((what==1)&&(mode==1)&&(!bank->emptyslot(slot))){//Reads from slot
      bank->loadfromslot(slot,master->part[*npart]);
     pthread_mutex_unlock(&master->mutex);
     master->part[*npart]->applyparameters();
-     if (master->part[*npart]->disablekitloading==0){
-       snprintf((char *)master->part[*npart]->Pname,PART_MAX_NAME_LEN
-        ,"%s",bank->getname(slot));
-     } else {
-       snprintf((char *)master->part[*npart]->kit[0].Pname,PART_MAX_NAME_LEN
-        ,"%s",bank->getname(slot));
-     };
+    snprintf((char *)master->part[*npart]->Pname,PART_MAX_NAME_LEN,"%s",bank->getname(slot));
      cbwig->do_callback();
      
      if (config.cfg.BankUIAutoClose!=0)
@@ -303,7 +297,8 @@ if (mode==4){//swap
         bs[slot]->refresh();
     };
 };
-if (mode!=4) refreshmainwindow();} {}
+if (mode!=4) refreshmainwindow();} {selected
+    }
   }
   Function {refreshmainwindow()} {} {
     code {bankuiwindow->label(bank->bankfiletitle);
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -276,7 +276,7 @@ end();} {}
 
 class PartUI {: {public Fl_Group,PartUI_}
 } {
-  Function {make_window()} {private
+  Function {make_window()} {selected private
   } {
     Fl_Window partgroup {
       private xywh {107 533 385 180} type Double hide
@@ -318,7 +318,7 @@ if (event==FL_RIGHT_MOUSE){
 } else {
   if (event==FL_LEFT_MOUSE) bankui->show();
        else instrumenteditwindow->show();
-};} selected
+};}
           tooltip {left mousebutton - to choose/save/.. from/to bank or right mousebutton to change the name or middle button to change the instrument information} xywh {195 5 185 20} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 12 align 84
           code0 {o->label((char *)part->Pname);}
         }
@@ -762,24 +762,13 @@ pthread_mutex_unlock(&master->mutex);}
         label SUBsynth
         xywh {470 0 60 15} labelfont 1 labelsize 12 align 18
       }
-      Fl_Check_Button protectthekitcheck {
-        label {Protect the kit}
-        callback {part->disablekitloading=(int) o->value();}
-        tooltip {Load only in the 0 item, and preserve other items intact when loading a instrument} xywh {110 350 90 10} down_box DOWN_BOX labelfont 1 labelsize 10
-        code0 {o->value(part->disablekitloading);}
-        code1 {if (part->Pkitmode==0) o->deactivate();}
-      }
       Fl_Choice {} {
         label Mode
         callback {part->Pkitmode=(int) o->value();
 if (part->Pkitmode==0) {
      kitlist->deactivate();
-     protectthekitcheck->value(0);
-     protectthekitcheck->do_callback();
-     protectthekitcheck->deactivate();
  } else {
  kitlist->activate();
- protectthekitcheck->activate();
 };}
         xywh {35 350 70 15} down_box BORDER_BOX labelsize 12 textfont 1 textsize 12
         code0 {o->value(part->Pkitmode);}