commit 5339191a6e54192e25283cfad942d28ad394dcde
parent 7042d08f3c6ea694dcdce8cd309688766377cb81
Author: paulnasca <paulnasca>
Date: Thu, 30 Sep 2004 20:07:18 +0000
*** empty log message ***
Diffstat:
4 files changed, 172 insertions(+), 24 deletions(-)
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -230,8 +230,11 @@ delete(bankuiwindow);} {}
}
Function {show()} {} {
code {bankuiwindow->show();
-simplesetmode(config.cfg.UserInterfaceMode==2);} {selected
- }
+simplesetmode(config.cfg.UserInterfaceMode==2);} {}
+ }
+ Function {hide()} {selected
+ } {
+ code {bankuiwindow->hide();} {}
}
Function {init(Fl_Valuator *cbwig_)} {} {
code {cbwig=cbwig_;
@@ -334,7 +337,7 @@ for (int i=1;i<MAX_NUM_BANKS;i++) {
}
Function {simplesetmode(bool beginnerui)} {} {
code {readbutton->value(1);
-mode=0;
+mode=1;
removeselection();
if (beginnerui) modeselect->hide();
else modeselect->show();} {}
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -1436,7 +1436,7 @@ effeqwindow->hide();//delete (effeqwindow);
effdynamicfilterwindow->hide();//delete (effdynamicfilterwindow);} {}
}
Function {make_null_window()} {} {
- Fl_Window effnullwindow {selected
+ Fl_Window effnullwindow {
xywh {539 150 233 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
@@ -1845,7 +1845,7 @@ refresh(eff);}
}
Function {make_distorsion_window()} {} {
Fl_Window effdistorsionwindow {
- xywh {258 305 232 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {257 432 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Choice distp {
@@ -1973,12 +1973,131 @@ refresh(eff);}
}
Function {make_eq_window()} {} {
Fl_Window effeqwindow {
- xywh {258 307 231 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {258 307 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Text_Display {} {
label EQ
- xywh {165 10 15 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {170 5 15 25} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ }
+ Fl_Counter bandcounter {
+ label Band
+ callback {eqband=(int) o->value();
+int npb=eqband*5+10;
+
+int type=eff->geteffectpar(npb);
+typechoice->value(type);
+
+if (type>6) gaindial->activate();
+ else gaindial->deactivate();
+
+if (type==0) bandgroup->deactivate();
+else bandgroup->activate();
+
+int freq=eff->geteffectpar(npb+1);
+freqdial->value(freq);
+
+int gain=eff->geteffectpar(npb+2);
+gaindial->value(gain);
+
+int q=eff->geteffectpar(npb+3);
+qdial->value(q);
+
+int dbl=eff->geteffectpar(npb+4);
+stagescounter->value(dbl);}
+ tooltip {Band no.} xywh {85 15 45 15} type Simple labelfont 1 labelsize 12 align 1 minimum 0 maximum 1 step 1 textfont 1 textsize 12
+ code0 {o->bounds(0,MAX_EQ_BANDS-1);}
+ }
+ Fl_Group bandgroup {
+ xywh {5 5 75 85} box ENGRAVED_FRAME
+ code0 {if (eff->geteffectpar(10)==0) o->deactivate();}
+ } {
+ Fl_Dial freqdial {
+ label Freq
+ callback {int np=eqband*5+11;
+eff->seteffectpar(np,(int) o->value());
+eqgraph->redraw();}
+ xywh {10 10 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 when 3 maximum 127
+ class WidgetPDial
+ }
+ Fl_Dial gaindial {
+ label Gain
+ callback {int np=eqband*5+12;
+eff->seteffectpar(np,(int) o->value());
+eqgraph->redraw();}
+ xywh {45 10 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 when 3 maximum 127 step 1
+ class WidgetPDial
+ }
+ Fl_Dial qdial {
+ label Q
+ callback {int np=eqband*5+13;
+eff->seteffectpar(np,(int) o->value());
+eqgraph->redraw();}
+ xywh {10 50 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 when 3 maximum 127
+ class WidgetPDial
+ }
+ Fl_Counter stagescounter {
+ label Stages
+ callback {int np=eqband*5+14;
+eff->seteffectpar(np,(int) o->value());
+eqgraph->redraw();}
+ tooltip {Additional filter stages} xywh {40 55 30 15} type Simple labelfont 1 labelsize 10 minimum 1 maximum 127 step 1 textfont 1 textsize 12
+ code0 {o->bounds(0,MAX_FILTER_STAGES-1);}
+ }
+ }
+ Fl_Choice typechoice {
+ label Type
+ callback {int np=eqband*5+10;
+eff->seteffectpar(np,(int) o->value());
+bandcounter->do_callback();
+eqgraph->redraw();}
+ tooltip Type xywh {135 15 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 when 6 textsize 10
+ } {
+ menuitem {} {
+ label OFF
+ xywh {10 10 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Lp1
+ xywh {20 20 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Hp1
+ xywh {30 30 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Lp2
+ xywh {40 40 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Hp2
+ xywh {50 50 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Bp2
+ xywh {60 60 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label N2
+ xywh {70 70 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label Pk
+ xywh {90 90 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label LSh
+ xywh {80 80 100 20} labelfont 1 labelsize 10
+ }
+ menuitem {} {
+ label HSh
+ xywh {90 90 100 20} labelfont 1 labelsize 10
+ }
+ }
+ Fl_Box eqgraph {
+ xywh {85 35 140 55} box BORDER_BOX color 178
+ code0 {o->init(eff);}
+ class EQGraph
}
}
}
@@ -2082,7 +2201,8 @@ effdynamicfilterwindow->position(px,py);
refresh(eff);} {}
}
- Function {refresh(EffectMgr *eff_)} {} {
+ Function {refresh(EffectMgr *eff_)} {open
+ } {
code {eff=eff_;
this->hide();
@@ -2152,6 +2272,16 @@ switch(eff->geteffect()){
effdistorsionwindow->show();
break;
case 7:
+ bandcounter->value(eqband);
+ bandcounter->do_callback();
+ typechoice->value(eff->geteffectpar(10));
+ eqgraph->redraw();
+ freqdial->value(eff->geteffectpar(11));
+ gaindial->value(eff->geteffectpar(12));
+ if (eff->geteffectpar(10)<6) gaindial->deactivate();
+ qdial->value(eff->geteffectpar(13));
+ stagescounter->value(eff->geteffectpar(14));
+ eqgraph->init(eff);
effeqwindow->show();
break;
case 8:
@@ -2169,7 +2299,8 @@ switch(eff->geteffect()){
break;
};
-this->show();} {}
+this->show();} {selected
+ }
}
Function {refresh()} {} {
code {refresh(eff);} {}
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -368,8 +368,7 @@ panellistitemgroup->redraw();} {}
}
class MasterUI {} {
- Function {make_window()} {selected
- } {
+ Function {make_window()} {} {
Fl_Window masterwindow {
label zynaddsubfx
callback {\#ifdef VSTAUDIOOUT
@@ -1069,7 +1068,7 @@ config.cfg.UserInterfaceMode=2;}
\#else
if (fl_ask("Exit and leave the unsaved data?")) *exitprogram=1;
\#endif}
- xywh {20 184 600 335} type Double hide
+ xywh {135 383 600 335} type Double hide
} {
Fl_Menu_Bar {} {
xywh {0 0 690 25}
@@ -1183,7 +1182,7 @@ bankui->show();}
callback {virkeys->relaseallkeys(0);
master->part[npart]->Prcvchn=(int) o->value();
virkeys->midich=(int) o->value();} open
- tooltip {receive from Midi channel} xywh {140 157 75 18} down_box BORDER_BOX labelsize 13 align 130 textfont 1
+ tooltip {receive from Midi channel} xywh {140 157 65 18} down_box BORDER_BOX labelsize 11 align 130 textfont 1
code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"Ch%d",i+1);if (i!=9) o->add(nrstr); else o->add("Dr10");};}
code1 {o->value(master->part[npart]->Prcvchn);}
} {}
@@ -1208,7 +1207,7 @@ virkeys->midich=(int) o->value();} open
callback {master->part[npart]->Pminkey=(int) o->value();
if (master->part[npart]->Pminkey>master->part[npart]->Pmaxkey) o->textcolor(FL_RED);
else o->textcolor(FL_BLACK);}
- tooltip {Minimum key (that the part receives NoteOn messages)} xywh {245 158 40 15} type Simple labelfont 1 labelsize 10 minimum 0 maximum 127 step 1 textsize 10
+ tooltip {Minimum key (that the part receives NoteOn messages)} xywh {210 158 40 15} type Simple labelfont 1 labelsize 10 minimum 0 maximum 127 step 1 textsize 10
code0 {o->value(master->part[npart]->Pminkey);}
}
Fl_Counter simplemaxkcounter {
@@ -1217,7 +1216,7 @@ if (master->part[npart]->Pminkey>master->part[npart]->Pmaxkey) o->textcolor(FL_R
if (master->part[npart]->Pminkey>master->part[npart]->Pmaxkey) o->textcolor(FL_RED);
else o->textcolor(FL_BLACK);}
- tooltip {Maximum key (that the part receives NoteOn messages)} xywh {290 158 40 15} type Simple labelfont 1 labelsize 10 minimum 0 maximum 127 step 1 textsize 10
+ tooltip {Maximum key (that the part receives NoteOn messages)} xywh {255 158 40 15} type Simple labelfont 1 labelsize 10 minimum 0 maximum 127 step 1 textsize 10
code0 {o->value(master->part[npart]->Pmaxkey);}
}
Fl_Button {} {
@@ -1225,14 +1224,14 @@ if (master->part[npart]->Pminkey>master->part[npart]->Pmaxkey) o->textcolor(FL_R
callback {if (master->part[npart]->lastnote>=0) simpleminkcounter->value(master->part[npart]->lastnote);
simpleminkcounter->do_callback();
simplemaxkcounter->do_callback();}
- tooltip {set the minimum key to the last pressed key} xywh {265 188 15 12} box THIN_UP_BOX labelsize 10
+ tooltip {set the minimum key to the last pressed key} xywh {230 188 15 12} box THIN_UP_BOX labelsize 10
}
Fl_Button {} {
label M
callback {if (master->part[npart]->lastnote>=0) simplemaxkcounter->value(master->part[npart]->lastnote);
simplemaxkcounter->do_callback();
simpleminkcounter->do_callback();}
- tooltip {set the maximum key to the last pressed key} xywh {295 188 15 12} box THIN_UP_BOX labelsize 10
+ tooltip {set the maximum key to the last pressed key} xywh {260 188 15 12} box THIN_UP_BOX labelsize 10
}
Fl_Button {} {
label R
@@ -1240,7 +1239,7 @@ simpleminkcounter->do_callback();}
simpleminkcounter->do_callback();
simplemaxkcounter->value(127);
simplemaxkcounter->do_callback();}
- tooltip {reset the minimum key to 0 and maximum key to 127} xywh {280 188 15 12} box THIN_UP_BOX labelfont 1 labelsize 10
+ tooltip {reset the minimum key to 0 and maximum key to 127} xywh {245 188 15 12} box THIN_UP_BOX labelfont 1 labelsize 10
}
Fl_Counter simplepartkeyshiftcounter {
label KeyShift
@@ -1249,6 +1248,15 @@ simplemaxkcounter->do_callback();}
code0 {o->lstep(12);}
code1 {o->value(master->part[npart]->Pkeyshift-64);}
}
+ Fl_Dial simplesyseffsend {
+ callback {master->setPsysefxvol(npart,nsyseff,(int) o->value());}
+ xywh {300 160 30 30} maximum 127 step 1
+ class WidgetPDial
+ }
+ Fl_Box {} {
+ label Effect
+ xywh {295 190 40 15}
+ }
}
Fl_Check_Button partenabled {
label Enabled
@@ -1290,7 +1298,8 @@ o->redraw();}
label {Sys.Effect No.}
callback {nsyseff=(int) o->value()-1;
simplesysefftype->value(master->sysefx[nsyseff]->geteffect());
-simplesyseffectui->refresh(master->sysefx[nsyseff]);}
+simplesyseffectui->refresh(master->sysefx[nsyseff]);
+simplerefresh();}
xywh {350 75 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
code0 {o->bounds(1,NUM_SYS_EFX);}
code1 {o->value(nsyseff+1);}
@@ -1509,12 +1518,12 @@ pthread_mutex_unlock(&master->mutex);}
label Reset
callback {simpleglobalfinedetuneslider->value(64.0);
simpleglobalfinedetuneslider->do_callback();}
- tooltip {Master fine detune reset} xywh {70 95 50 10} box THIN_UP_BOX labelfont 1 labelsize 12 align 128
+ tooltip {Master fine detune reset} xywh {70 32 50 10} box THIN_UP_BOX labelfont 1 labelsize 12 align 128
}
Fl_Dial simpleglobalfinedetuneslider {
label {Fine Detune}
callback {master->microtonal.Pglobalfinedetune=(int) o->value();}
- tooltip {global fine detune} xywh {80 35 30 30} box ROUND_UP_BOX labelsize 12 align 130 maximum 127 step 1 value 64
+ tooltip {global fine detune} xywh {80 45 30 30} box ROUND_UP_BOX labelsize 12 align 130 maximum 127 step 1 value 64
code0 {o->value(master->microtonal.Pglobalfinedetune);}
class WidgetPDial
}
@@ -1623,7 +1632,8 @@ simplepartportamento->value(master->part[npart]->ctl.portamento.portamento);
simpleminkcounter->value(master->part[npart]->Pminkey);
simplemaxkcounter->value(master->part[npart]->Pmaxkey);
-simplepartkeyshiftcounter->value(master->part[npart]->Pkeyshift-64);} {}
+simplepartkeyshiftcounter->value(master->part[npart]->Pkeyshift-64);
+simplesyseffsend->value(master->Psysefxvol[nsyseff][npart]);} {}
}
Function {do_new_master()} {} {
code {if (fl_ask("Clear *ALL* the parameters ?")){
@@ -1712,7 +1722,11 @@ simpleinseffnocounter->do_callback();
simplemasterkeyshiftcounter->value(master->Pkeyshift-64);
simplemastervolumedial->value(master->Pvolume);
simpleglobalfinedetuneslider->value(master->microtonal.Pglobalfinedetune);
-virkeys->midich=master->part[npart]->Prcvchn;} {}
+virkeys->midich=master->part[npart]->Prcvchn;
+
+simplerefresh();
+bankui->hide();} {selected
+ }
}
decl {Master *master;} {}
decl {MicrotonalUI *microtonalui;} {}
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -319,7 +319,7 @@ if (event==FL_RIGHT_MOUSE){
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 PLASTIC_THIN_DOWN_BOX down_box FLAT_BOX color 247 labelfont 1 labelsize 12 align 84
+ 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);}
}
Fl_Box {} {
