commit 294940198b418bfa394db986cff733104fb57baf
parent db2c5b5a83839aa6837cf1dc0eb7b1fe8ae683cf
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Tue, 4 May 2010 12:50:50 -0400
Merge branch 'master' into nio
Diffstat:
3 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/src/Effects/APhaser.cpp b/src/Effects/APhaser.cpp
@@ -162,7 +162,6 @@ void Analog_Phaser::out(const Stereo<REALTYPE *> &input)
};
- //cout << lxn << " vs ";
//Left channel
for (j = 0; j < Pstages; j++)
{ //Phasing routine
@@ -180,7 +179,6 @@ void Analog_Phaser::out(const Stereo<REALTYPE *> &input)
lxn = lyn1[j];
if (j==1) lxn += fbl; //Insert feedback after first phase stage
};
- //cout << lxn << endl;
//Right channel
for (j = 0; j < Pstages; j++)
@@ -200,8 +198,6 @@ void Analog_Phaser::out(const Stereo<REALTYPE *> &input)
if (j==1) rxn += fbr; //Insert feedback after first phase stage
}
- //cout << fb << ' ' << input.l()[i] - lxn << endl;
- //cout << "input" << input.l()[i] << "output:" << lxn << endl;
fbl = lxn * fb;
fbr = rxn * fb;
@@ -258,7 +254,6 @@ void Analog_Phaser::setfb(unsigned char Pfb)
void Analog_Phaser::setvolume(unsigned char Pvolume)
{
- cout << "setting volume" << (int) Pvolume << endl;
this->Pvolume = Pvolume;
// outvolume is needed in calling program
if(insertion == 0) {
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -705,9 +705,8 @@ refresh(eff);}
}
}
Function {make_analog_phaser_window()} {} {
- Fl_Window effaphaserwindow {
+ Fl_Window effaphaserwindow {selected
xywh {292 251 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
- code0 {putchar('a'); putchar('b'); putchar('c');}
class Fl_Group
} {
Fl_Choice aphaserp {
@@ -1560,15 +1559,13 @@ switch(eff->geteffect()){
aphaser10->value(eff->geteffectpar(10));
aphaser11->value(eff->geteffectpar(11));
aphaser12->value(eff->geteffectpar(12));
- putchar('?');
effaphaserwindow->show();
break;
default:effnullwindow->show();
break;
};
-this->show();} {selected
- }
+this->show();} {}
}
Function {refresh()} {} {
code {refresh(eff);} {}
@@ -1943,6 +1940,79 @@ refresh(eff);}
}
}
}
+ Function {make_analog_phaser_window()} {} {
+ Fl_Window effaphaserwindow {
+ xywh {367 295 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ code0 {putchar('a'); putchar('b'); putchar('c');}
+ class Fl_Group
+ } {
+ Fl_Choice aphaserp {
+ label Preset
+ callback {eff->changepreset((int)o->value());
+refresh(eff);}
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
+ } {
+ MenuItem {} {
+ label {Phaser 1}
+ xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ MenuItem {} {
+ label {Phaser 2}
+ xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ MenuItem {} {
+ label {Phaser 3}
+ xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ MenuItem {} {
+ label {Phaser 4}
+ xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ MenuItem {} {
+ label {Phaser 5}
+ xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ MenuItem {} {
+ label {Phaser 6}
+ xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
+ }
+ }
+ Fl_Text_Display {} {
+ label APhaser
+ xywh {105 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
+ }
+ Fl_Dial aphaser0 {
+ label Vol
+ callback {eff->seteffectpar(0,(int) o->value());}
+ tooltip {Effect Volume} xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
+ class WidgetPDial
+ }
+ Fl_Dial aphaser2 {
+ label Freq
+ callback {eff->seteffectpar(2,(int) o->value());}
+ tooltip {LFO frequency} xywh {50 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
+ class WidgetPDial
+ }
+ Fl_Dial aphaser6 {
+ label Dpth
+ callback {eff->seteffectpar(6,(int) o->value());}
+ tooltip {LFO Depth} xywh {90 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
+ class WidgetPDial
+ }
+ Fl_Dial aphaser7 {
+ label Fb
+ callback {eff->seteffectpar(7,(int) o->value());}
+ tooltip Feedback xywh {135 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
+ class WidgetPDial
+ }
+ Fl_Counter aphaser8 {
+ label Stages
+ callback {eff->seteffectpar(8,(int) o->value());}
+ xywh {175 55 35 15} type Simple labelfont 1 labelsize 11 minimum 0 maximum 127 step 1
+ code0 {o->range(1,MAX_PHASER_STAGES);}
+ }
+ }
+ }
Function {make_alienwah_window()} {} {
Fl_Window effalienwahwindow {
xywh {367 170 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
@@ -2339,6 +2409,7 @@ make_reverb_window();
make_echo_window();
make_chorus_window();
make_phaser_window();
+make_analog_phaser_window();
make_alienwah_window();
make_distorsion_window();
make_eq_window();
@@ -2352,6 +2423,7 @@ effreverbwindow->position(px,py);
effechowindow->position(px,py);
effchoruswindow->position(px,py);
effphaserwindow->position(px,py);
+effaphaserwindow->position(px,py);
effalienwahwindow->position(px,py);
effdistorsionwindow->position(px,py);
effeqwindow->position(px,py);
@@ -2368,6 +2440,7 @@ effreverbwindow->hide();
effechowindow->hide();
effchoruswindow->hide();
effphaserwindow->hide();
+effaphaserwindow->hide();
effalienwahwindow->hide();
effdistorsionwindow->hide();
effeqwindow->hide();
@@ -2452,6 +2525,17 @@ switch(eff->geteffect()){
effdynamicfilterwindow->show();
break;
+ case 9:
+ aphaserp->value(eff->getpreset());
+ aphaser0->value(eff->geteffectpar(0));if (eff->insertion!=0) dfp0->label("D/W");
+ aphaser2->value(eff->geteffectpar(2));
+ aphaser6->value(eff->geteffectpar(6));
+ aphaser7->value(eff->geteffectpar(7));
+ aphaser8->value(eff->geteffectpar(8));
+
+
+ effaphaserwindow->show();
+ break;
default:effnullwindow->show();
break;
};
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -757,7 +757,7 @@ syseffectui->refresh(master->sysefx[nsyseff]);}
xywh {90 90 100 20} labelfont 1 labelsize 10
}
MenuItem {} {
- label APhaser selected
+ label APhaser
xywh {0 0 36 21} labelfont 1 labelsize 10
}
}
@@ -1323,7 +1323,7 @@ o->redraw();}
} {
Fl_Group {} {
label {System Effects}
- xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18
+ xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18 hide
} {
Fl_Counter simplesyseffnocounter {
label {Sys.Effect No.}
@@ -1380,6 +1380,10 @@ simplesyseffectui->refresh(master->sysefx[nsyseff]);}
label DynFilter
xywh {100 100 100 20} labelfont 1 labelsize 10
}
+ MenuItem {} {
+ label Aphaser
+ xywh {0 0 40 25} labelfont 1 labelsize 10
+ }
}
Fl_Group simplesyseffectuigroup {
xywh {350 95 235 95} box FLAT_BOX color 48
@@ -1405,7 +1409,7 @@ pthread_mutex_unlock(&master->mutex);}
}
Fl_Group {} {
label {Insertion Effects}
- xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18 hide
+ xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18
} {
Fl_Counter simpleinseffnocounter {
label {Ins.Effect No.}
@@ -1474,6 +1478,10 @@ simpleinseffectui->show();}
label DynFilter
xywh {110 110 100 20} labelfont 1 labelsize 10
}
+ MenuItem {} {
+ label Aphaser
+ xywh {0 0 40 25} labelfont 1 labelsize 10
+ }
}
Fl_Group simpleinseffectuigroup {
xywh {350 95 234 95} box FLAT_BOX color 48
