commit dd73810026312aba3b1294958f9f000563eeab94
parent 60c1aef04b7cdc9114f80044c55b8ddf97bb297f
Author: paulnasca <paulnasca>
Date: Fri, 2 Jul 2004 20:19:29 +0000
*** empty log message ***
Diffstat:
5 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -603,5 +603,6 @@
- Continuat de scris la DynamicFiter (mai este doar de salvat parametrii si de auto-update la filtru)
02 Iul 2004 - Continuat la DynamicFilter (adaugata auto-update, adaugat preset-uri)
- Terminat DynamicFilter
-
+ - Corectata o eroare la EQui care facea ca sa nu se actualizeze efectul curent si sa nu se obtina graficul egalizatorului
+
diff --git a/src/Effects/EQ.C b/src/Effects/EQ.C
@@ -204,6 +204,7 @@ unsigned char EQ::getpar(int npar){
REALTYPE EQ::getfreqresponse(REALTYPE freq){
REALTYPE resp=1.0;
+
for (int i=0;i<MAX_EQ_BANDS;i++){
if (filter[i].Ptype==0) continue;
resp*=filter[i].l->H(freq);
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -152,7 +152,7 @@ return(log(freq/20.0)/log(1000.0));} {}
decl {int maxdB;} {}
}
-class EffUI {open : {public Fl_Group}
+class EffUI {: {public Fl_Group}
} {
Function {EffUI(int x,int y, int w, int h, const char *label=0):Fl_Group(x,y,w,h,label)} {} {
code {eff=NULL;
@@ -802,7 +802,7 @@ refresh(eff);}
}
Function {make_distorsion_window()} {} {
Fl_Window effdistorsionwindow {
- xywh {68 584 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {259 186 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Choice distp {
@@ -963,7 +963,7 @@ refresh(eff);}
}
Function {make_eq_window()} {} {
Fl_Window effeqwindow {
- xywh {248 307 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {258 307 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Text_Display {} {
@@ -1098,8 +1098,7 @@ eqgraph->redraw();}
}
}
}
- Function {make_dynamicfilter_window()} {selected
- } {
+ Function {make_dynamicfilter_window()} {} {
Fl_Window effdynamicfilterwindow {
xywh {100 558 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
@@ -1256,7 +1255,8 @@ effdynamicfilterwindow->position(px,py);
refresh(eff);} {}
}
- Function {refresh(EffectMgr *eff_)} {} {
+ Function {refresh(EffectMgr *eff_)} {open
+ } {
code {eff=eff_;
this->hide();
@@ -1379,6 +1379,7 @@ switch(eff->geteffect()){
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:make_filter_window();
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -372,8 +372,8 @@ 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 {188 182 390 465} type Double hide
- code0 {setfilelabel(NULL);} non_modal
+ xywh {188 182 390 465} type Double
+ code0 {setfilelabel(NULL);} non_modal visible
} {
Fl_Menu_Bar mastermenu {
xywh {0 0 690 25}
@@ -769,7 +769,7 @@ pthread_mutex_unlock(&master->mutex);}
xywh {0 80 390 160}
} {
Fl_Group {} {
- label {System Effects} open selected
+ label {System Effects} open
xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25
} {
Fl_Counter syseffnocounter {
@@ -830,7 +830,7 @@ syseffectui->refresh(master->sysefx[nsyseff]);}
Fl_Group syseffectuigroup {
xywh {5 140 380 95} box FLAT_BOX color 48
} {
- Fl_Group syseffectui {
+ Fl_Group syseffectui {selected
xywh {5 140 380 95}
code0 {o->init(master->sysefx[nsyseff]);}
class EffUI
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -255,7 +255,7 @@ delete(partkititem);} {}
decl {PartUI_ *partui;} {}
}
-class PartUI {selected : {public Fl_Group,PartUI_}
+class PartUI {: {public Fl_Group,PartUI_}
} {
Function {make_window()} {private
} {
@@ -582,13 +582,13 @@ part->ctl.portamento.updowntimestretch=x;}
}
Fl_Window partfx {
label {Part's Insert Effects}
- private xywh {110 483 390 145} type Double hide
+ private xywh {112 331 390 145} type Double hide
} {
Fl_Counter inseffnocounter {
label {Ins.Effect No.}
callback {ninseff=(int) o->value();
insefftype->value(part->partefx[ninseff]->geteffect());
-insefftype->do_callback();
+//insefftype->do_callback();
inseffectui->refresh(part->partefx[ninseff]);
int x=part->Pefxroute[ninseff];
if (x==127) x=1;
@@ -602,7 +602,7 @@ sendtochoice->value(x);}
callback {pthread_mutex_lock(part->mutex);
part->partefx[ninseff]->changeeffect((int) o->value());
pthread_mutex_unlock(part->mutex);
-inseffectui->refresh(part->partefx[ninseff]);}
+inseffectui->refresh(part->partefx[ninseff]);} selected
xywh {95 110 70 15} down_box BORDER_BOX labelsize 11 align 6
code0 {o->value(part->partefx[ninseff]->geteffect());}
} {
