commit d7b55c0f8874f3d8f2ffd3d8659683e4a068cdd8
parent f346d5cc73544f46447d8f727a82e31a4b7e584a
Author: paulnasca <paulnasca>
Date: Thu, 24 Jun 2004 19:28:41 +0000
*** empty log message ***
Diffstat:
5 files changed, 61 insertions(+), 42 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -595,6 +595,6 @@
- Corectata o mica eroare care facea imposibila modificarea amplitudinii armonicelor cu tastatura
- Adaugat randomness de grup (adica se aplica acelasi randomness la toate vocile care folosesc acelasi oscilator)
24 Iun 2004 - Inlaturat setara de normalize la OscilGen. Intotdeauna normalize este Full RMS
-
+ - Facute cateva imbunatatiri la interfata unde sunt inlocuite comuter-urile cu setari mai usor de inteles de catre utilizator (ex. la efectele de insertie se arata "insert to Master Out" in loc de "-2")
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0200
+version 1.0105
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0200
+version 1.0105
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
@@ -372,10 +372,10 @@ fl_alert("ZynAddSubFX could not be closed this way, because it's a VST plugin. P
\#else
if (fl_ask("Exit and leave the unsaved data?")) *exitprogram=1;
\#endif}
- xywh {448 226 390 465} type Double hide
+ xywh {337 199 390 465} type Double hide
code0 {setfilelabel(NULL);} non_modal
} {
- Fl_Menu_Bar mastermenu {selected
+ Fl_Menu_Bar mastermenu {
xywh {0 0 690 25}
} {
submenu {} {
@@ -769,7 +769,7 @@ pthread_mutex_unlock(&master->mutex);}
xywh {0 80 390 160}
} {
Fl_Group {} {
- label {System Effects}
+ label {System Effects} selected
xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25
} {
Fl_Counter syseffnocounter {
@@ -864,29 +864,14 @@ swapeffwindow->show();}
Fl_Counter inseffnocounter {
label {Ins.Effect No.}
callback {ninseff=(int) o->value();
-insefftype->value(master->insefx[ninseff]->geteffect());
+insefftype->value(master->insefx[ninseff]->geteffect()-2);
insefftype->do_callback();
-inseffpart->value(master->Pinsparts[ninseff]);
+inseffpart->value(master->Pinsparts[ninseff]-2);
inseffpart->do_callback();}
xywh {5 120 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 textfont 1
code0 {o->bounds(0,NUM_INS_EFX-1);}
code1 {o->value(ninseff);}
}
- Fl_Counter inseffpart {
- label {Eff.Part}
- callback {master->Pinsparts[ninseff]=(int) o->value();
-if ((int) o->value()==-1){
- inseffectuigroup->deactivate();
- insefftype->deactivate();
- master->insefx[ninseff]->cleanup();
-} else {
- inseffectuigroup->activate();
- insefftype->activate();
-};}
- tooltip {Part where the effect is applied, -1 for disable, -2 to apply the effect to master} xywh {90 125 65 15} type Simple labelsize 11 align 5 minimum 0 maximum 127 step 1
- code0 {o->bounds(-2,NUM_MIDI_PARTS-1);}
- code1 {o->value(master->Pinsparts[ninseff]);}
- }
Fl_Choice insefftype {
label EffType
callback {inseffectuigroup->remove(inseffectui);
@@ -945,6 +930,22 @@ inseffectui->redraw();}
class EffUI
} {}
}
+ Fl_Choice inseffpart {
+ label {Insert To.}
+ callback {master->Pinsparts[ninseff]=(int) o->value()-2;
+if ((int) o->value()==1){
+ inseffectuigroup->deactivate();
+ insefftype->deactivate();
+ master->insefx[ninseff]->cleanup();
+} else {
+ inseffectuigroup->activate();
+ insefftype->activate();
+};} open
+ xywh {95 120 80 20} down_box BORDER_BOX labelfont 1 labelsize 10 align 5 textsize 10
+ code0 {o->add("Master Out");o->add("Off");}
+ code1 {char tmp[50]; for (int i=0;i<NUM_MIDI_PARTS;i++) {sprintf(tmp,"Part %2d",i);o->add(tmp);};}
+ code3 {o->value(master->Pinsparts[ninseff]+2);}
+ } {}
}
}
Fl_Button {} {
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -328,8 +328,7 @@ delete(harmonic);} {}
decl {Master *master;} {}
}
-class OscilEditor {open
-} {
+class OscilEditor {} {
Function {make_window()} {} {
Fl_Window osceditUI {
label {ADsynth Oscillator Editor}
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0200
+version 1.0105
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
@@ -260,7 +260,7 @@ class PartUI {: {public Fl_Group,PartUI_}
Function {make_window()} {private
} {
Fl_Window partgroup {
- private xywh {149 400 385 180} type Double hide
+ private xywh {44 244 385 180} type Double hide
class Fl_Group
} {
Fl_Group partgroupui {
@@ -277,17 +277,10 @@ class PartUI {: {public Fl_Group,PartUI_}
Fl_Counter {} {
label KeyShift
callback {part->Pkeyshift=(int) o->value()+64;}
- xywh {195 40 90 20} labelsize 12 minimum -64 maximum 64 step 1
+ xywh {195 45 90 20} labelsize 12 align 1 minimum -64 maximum 64 step 1
code0 {o->lstep(12);}
code1 {o->value(part->Pkeyshift-64);}
}
- Fl_Counter {} {
- label {Chn.Rcv.}
- callback {part->Prcvchn=(int) o->value();}
- tooltip {receive from Midi channel} xywh {295 40 85 20} type Simple labelfont 1 labelsize 12 minimum 0 maximum 127 step 1
- code0 {o->bounds(0,NUM_MIDI_CHANNELS-1);}
- code1 {o->value(part->Prcvchn);}
- }
Fl_Scroll {} {open
xywh {166 91 125 60} box ENGRAVED_FRAME labelfont 1 labelsize 10 align 21
} {
@@ -375,12 +368,6 @@ if (part->Pminkey>part->Pmaxkey) o->textcolor(FL_RED);
tooltip {Enable/Disable the portamento} xywh {115 155 85 20} down_box DOWN_BOX labelfont 1 labelsize 12
code0 {o->value(part->ctl.portamento.portamento);}
}
- Fl_Counter keylimitcounter {
- label {K.lmt.}
- callback {part->setkeylimit((int) o->value());}
- tooltip {Key Limit (max notes that are alowed to play in this part)} xywh {205 155 70 20} type Simple labelfont 1 labelsize 10 align 8 minimum 0 maximum 127 step 1
- code0 {o->value(part->Pkeylimit);}
- }
Fl_Button {} {
label {Edit instrument}
callback {instrumenteditwindow->show();}
@@ -408,6 +395,20 @@ maxkcounter->value(127);
maxkcounter->do_callback();}
tooltip {reset the minimum key to 0 and maximum key to 127} xywh {330 155 15 12} box THIN_UP_BOX labelfont 1 labelsize 10
}
+ Fl_Choice {} {
+ label {MIDI Chn.Rcv.}
+ callback {part->Prcvchn=(int) o->value();} open
+ tooltip {receive from Midi channel} xywh {310 45 70 20} down_box BORDER_BOX labelsize 10 align 5 textfont 1 textsize 10
+ code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"%d",i+1);if (i!=9) o->add(nrstr); else o->add("10Drums");};}
+ code1 {o->value(part->Prcvchn);}
+ } {}
+ Fl_Choice keylimitlist {
+ label KLmt
+ callback {int val=0;
+val=atoi(o->text());
+part->setkeylimit(val);} open
+ tooltip {Key Limit} xywh {210 155 60 20} down_box BORDER_BOX labelsize 10 align 8 textfont 1 textsize 10
+ } {}
}
Fl_Check_Button {} {
label Enabled
@@ -1014,7 +1015,25 @@ partgroup->show();
end();
-//if (config.ui.showinstrumentinfo!=0) instrumenteditwindow->show();} {selected
+//if (config.ui.showinstrumentinfo!=0) instrumenteditwindow->show();
+
+int klimits[]={1,2,3,4,5,6,7,8,9,10,15,20,30,50,100,0};
+
+keylimitlist->add("OFF");
+int k=0;
+int val=-1;
+char tmp[10];
+while (klimits[k]!=0){
+ sprintf(tmp,"%d",klimits[k]);
+ keylimitlist->add(tmp);
+ if ((val==-1)){
+ if (klimits[k]>part->Pkeylimit) val=k;
+ };
+ k++;
+};
+
+if (val==-1) val=k;
+keylimitlist->value(val);} {selected
}
}
Function {showparameters(int kititem,int engine)} {} {
