From ca5ba2971b8d65a55129c63ce892095fab2f5c63 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 31 May 2009 18:38:40 +0200 Subject: [PATCH] ZynAddSubFX: processed UI files with Fluid from FLTK 1.3 branch Processed all Fluid UI files with Fluid from FLTK 1.3 branch so the generated code is up to date. Signed-off-by: Tobias Doerffel (cherry picked from commit 5b1900c4d0c3d46e1028960cd3a173d901d4895e) --- plugins/zynaddsubfx/src/UI/ADnoteUI.cc | 148 ++++----- plugins/zynaddsubfx/src/UI/ADnoteUI.h | 2 +- plugins/zynaddsubfx/src/UI/BankUI.cc | 6 +- plugins/zynaddsubfx/src/UI/BankUI.h | 2 +- plugins/zynaddsubfx/src/UI/ConfigUI.cc | 38 +-- plugins/zynaddsubfx/src/UI/ConfigUI.h | 2 +- plugins/zynaddsubfx/src/UI/EffUI.cc | 360 ++++++++++----------- plugins/zynaddsubfx/src/UI/EffUI.h | 2 +- plugins/zynaddsubfx/src/UI/EnvelopeUI.cc | 84 ++--- plugins/zynaddsubfx/src/UI/EnvelopeUI.h | 2 +- plugins/zynaddsubfx/src/UI/FilterUI.cc | 50 +-- plugins/zynaddsubfx/src/UI/FilterUI.h | 2 +- plugins/zynaddsubfx/src/UI/LFOUI.cc | 24 +- plugins/zynaddsubfx/src/UI/LFOUI.h | 2 +- plugins/zynaddsubfx/src/UI/MasterUI.cc | 100 +++--- plugins/zynaddsubfx/src/UI/MasterUI.h | 2 +- plugins/zynaddsubfx/src/UI/MicrotonalUI.cc | 32 +- plugins/zynaddsubfx/src/UI/MicrotonalUI.h | 2 +- plugins/zynaddsubfx/src/UI/OscilGenUI.cc | 52 +-- plugins/zynaddsubfx/src/UI/OscilGenUI.h | 2 +- plugins/zynaddsubfx/src/UI/PADnoteUI.cc | 98 +++--- plugins/zynaddsubfx/src/UI/PADnoteUI.h | 2 +- plugins/zynaddsubfx/src/UI/PartUI.cc | 108 +++---- plugins/zynaddsubfx/src/UI/PartUI.h | 2 +- plugins/zynaddsubfx/src/UI/PresetsUI.cc | 18 +- plugins/zynaddsubfx/src/UI/PresetsUI.h | 2 +- plugins/zynaddsubfx/src/UI/ResonanceUI.cc | 10 +- plugins/zynaddsubfx/src/UI/ResonanceUI.h | 2 +- plugins/zynaddsubfx/src/UI/SUBnoteUI.cc | 52 +-- plugins/zynaddsubfx/src/UI/SUBnoteUI.h | 2 +- plugins/zynaddsubfx/src/UI/SeqUI.cc | 10 +- plugins/zynaddsubfx/src/UI/SeqUI.h | 2 +- plugins/zynaddsubfx/src/UI/VirKeyboard.cc | 22 +- plugins/zynaddsubfx/src/UI/VirKeyboard.h | 2 +- plugins/zynaddsubfx/src/UI/WidgetPDial.cc | 2 +- plugins/zynaddsubfx/src/UI/WidgetPDial.h | 2 +- 36 files changed, 625 insertions(+), 625 deletions(-) diff --git a/plugins/zynaddsubfx/src/UI/ADnoteUI.cc b/plugins/zynaddsubfx/src/UI/ADnoteUI.cc index 478489068..831a8a533 100644 --- a/plugins/zynaddsubfx/src/UI/ADnoteUI.cc +++ b/plugins/zynaddsubfx/src/UI/ADnoteUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "ADnoteUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -92,7 +92,7 @@ Fl_Group* ADvoicelistitem::make_window() { ADnoteVoiceListItem->labelsize(14); ADnoteVoiceListItem->labelcolor(FL_FOREGROUND_COLOR); ADnoteVoiceListItem->user_data((void*)(this)); - ADnoteVoiceListItem->align(FL_ALIGN_TOP); + ADnoteVoiceListItem->align(Fl_Align(FL_ALIGN_TOP)); ADnoteVoiceListItem->when(FL_WHEN_RELEASE); { Fl_Group* o = voicelistitemgroup = new Fl_Group(50, 0, 570, 25); voicelistitemgroup->box(FL_FLAT_BOX); @@ -104,7 +104,7 @@ Fl_Group* ADvoicelistitem::make_window() { voicevolume->maximum(127); voicevolume->step(1); voicevolume->callback((Fl_Callback*)cb_voicevolume); - voicevolume->align(FL_ALIGN_TOP_LEFT); + voicevolume->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(pars->VoicePar[nvoice].PVolume); } // Fl_Value_Slider* voicevolume { Fl_Check_Button* o = voiceresonanceenabled = new Fl_Check_Button(245, 7, 15, 17); @@ -114,7 +114,7 @@ Fl_Group* ADvoicelistitem::make_window() { voiceresonanceenabled->labelfont(1); voiceresonanceenabled->labelsize(11); voiceresonanceenabled->callback((Fl_Callback*)cb_voiceresonanceenabled); - voiceresonanceenabled->align(FL_ALIGN_LEFT); + voiceresonanceenabled->align(Fl_Align(FL_ALIGN_LEFT)); o->value(pars->VoicePar[nvoice].Presonance); } // Fl_Check_Button* voiceresonanceenabled { Fl_Value_Slider* o = voicelfofreq = new Fl_Value_Slider(500, 5, 115, 20); @@ -125,7 +125,7 @@ Fl_Group* ADvoicelistitem::make_window() { voicelfofreq->maximum(127); voicelfofreq->step(1); voicelfofreq->callback((Fl_Callback*)cb_voicelfofreq); - voicelfofreq->align(FL_ALIGN_TOP_LEFT); + voicelfofreq->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(pars->VoicePar[nvoice].FreqLfo->Pintensity); } // Fl_Value_Slider* voicelfofreq { WidgetPDial* o = voicepanning = new WidgetPDial(215, 5, 20, 20); @@ -140,7 +140,7 @@ Fl_Group* ADvoicelistitem::make_window() { voicepanning->maximum(127); voicepanning->step(1); voicepanning->callback((Fl_Callback*)cb_voicepanning); - voicepanning->align(FL_ALIGN_LEFT); + voicepanning->align(Fl_Align(FL_ALIGN_LEFT)); voicepanning->when(FL_WHEN_CHANGED); o->value(pars->VoicePar[nvoice].PPanning); } // WidgetPDial* voicepanning @@ -162,7 +162,7 @@ Fl_Group* ADvoicelistitem::make_window() { detunevalueoutput->textfont(1); detunevalueoutput->textsize(10); detunevalueoutput->callback((Fl_Callback*)cb_detunevalueoutput); - detunevalueoutput->align(FL_ALIGN_TOP_LEFT); + detunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune(pars->VoicePar[nvoice].PDetuneType,0,pars->VoicePar[nvoice].PDetune)*pars->getBandwidthDetuneMultiplier()); } // Fl_Value_Output* detunevalueoutput { Fl_Slider* o = voicedetune = new Fl_Slider(315, 5, 185, 20); @@ -191,7 +191,7 @@ Fl_Group* ADvoicelistitem::make_window() { voiceenabled->labelfont(1); voiceenabled->labelsize(13); voiceenabled->callback((Fl_Callback*)cb_voiceenabled); - voiceenabled->align(FL_ALIGN_LEFT); + voiceenabled->align(Fl_Align(FL_ALIGN_LEFT)); char tmp[10];snprintf(tmp,10,"%d",nvoice+1);o->label(strdup(tmp)); o->value(pars->VoicePar[nvoice].Enabled); } // Fl_Check_Button* voiceenabled @@ -654,7 +654,7 @@ Fl_Group* ADvoiceUI::make_window() { ADnoteVoiceParameters->labelsize(14); ADnoteVoiceParameters->labelcolor(FL_FOREGROUND_COLOR); ADnoteVoiceParameters->user_data((void*)(this)); - ADnoteVoiceParameters->align(FL_ALIGN_TOP); + ADnoteVoiceParameters->align(Fl_Align(FL_ALIGN_TOP)); ADnoteVoiceParameters->when(FL_WHEN_RELEASE); { Fl_Group* o = voiceparametersgroup = new Fl_Group(0, 0, 765, 525); voiceparametersgroup->box(FL_THIN_UP_BOX); @@ -666,13 +666,13 @@ Fl_Group* ADvoiceUI::make_window() { voiceFMparametersgroup->labeltype(FL_EMBOSSED_LABEL); voiceFMparametersgroup->labelfont(1); voiceFMparametersgroup->labelsize(13); - voiceFMparametersgroup->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + voiceFMparametersgroup->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { modfrequency = new Fl_Group(535, 220, 220, 145, "Mod.FREQUENCY"); modfrequency->box(FL_THIN_UP_BOX); modfrequency->labeltype(FL_EMBOSSED_LABEL); modfrequency->labelfont(1); modfrequency->labelsize(13); - modfrequency->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + modfrequency->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = voiceFMfreqenvgroup = new EnvelopeUI(540, 290, 205, 70, "ADSynth Modulator - Frequency Envelope"); voiceFMfreqenvgroup->box(FL_FLAT_BOX); voiceFMfreqenvgroup->color((Fl_Color)51); @@ -681,7 +681,7 @@ Fl_Group* ADvoiceUI::make_window() { voiceFMfreqenvgroup->labelfont(0); voiceFMfreqenvgroup->labelsize(14); voiceFMfreqenvgroup->labelcolor(FL_FOREGROUND_COLOR); - voiceFMfreqenvgroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voiceFMfreqenvgroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voiceFMfreqenvgroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FMFreqEnvelope); if (pars->VoicePar[nvoice].PFMFreqEnvelopeEnabled==0) o->deactivate(); @@ -704,7 +704,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Coarse); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->VoicePar[nvoice].PFMCoarseDetune%1024; if (k>=512) k-=1024; o->value(k); @@ -720,7 +720,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Octave); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->VoicePar[nvoice].PFMCoarseDetune/1024; if (k>=8) k-=16; o->value(k); @@ -743,7 +743,7 @@ Fl_Group* ADvoiceUI::make_window() { fmdetunevalueoutput->textfont(1); fmdetunevalueoutput->textsize(8); fmdetunevalueoutput->callback((Fl_Callback*)cb_fmdetunevalueoutput); - fmdetunevalueoutput->align(FL_ALIGN_TOP_LEFT); + fmdetunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune((pars->VoicePar[nvoice].PFMDetuneType==0)?(pars->GlobalPar.PDetuneType) : (pars->VoicePar[nvoice].PFMDetuneType),0,pars->VoicePar[nvoice].PFMDetune)); //o->value(getdetune(pars->VoicePar[nvoice].PFMDetuneType,0,pars->VoicePar[nvoice].PFMDetune)); } // Fl_Value_Output* fmdetunevalueoutput @@ -753,7 +753,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_Detune); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("Default");o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents"); o->value(pars->VoicePar[nvoice].PFMDetuneType); } // Fl_Choice* o @@ -764,7 +764,7 @@ Fl_Group* ADvoiceUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Value_Slider* o = new Fl_Value_Slider(540, 80, 160, 15, "Vol"); o->tooltip("Volume"); o->type(5); @@ -773,7 +773,7 @@ Fl_Group* ADvoiceUI::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vol); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->VoicePar[nvoice].PFMVolume); } // Fl_Value_Slider* o { Fl_Value_Slider* o = new Fl_Value_Slider(540, 100, 160, 15, "V.Sns"); @@ -784,7 +784,7 @@ Fl_Group* ADvoiceUI::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_V); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->VoicePar[nvoice].PFMVelocityScaleFunction); } // Fl_Value_Slider* o { EnvelopeUI* o = voiceFMampenvgroup = new EnvelopeUI(540, 145, 205, 70, "ADSynth Modulator - Amplitude Envelope"); @@ -795,7 +795,7 @@ Fl_Group* ADvoiceUI::make_window() { voiceFMampenvgroup->labelfont(0); voiceFMampenvgroup->labelsize(14); voiceFMampenvgroup->labelcolor(FL_FOREGROUND_COLOR); - voiceFMampenvgroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voiceFMampenvgroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voiceFMampenvgroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FMAmpEnvelope); if (pars->VoicePar[nvoice].PFMAmpEnvelopeEnabled==0) o->deactivate(); @@ -818,7 +818,7 @@ Fl_Group* ADvoiceUI::make_window() { o->maximum(63); o->step(1); o->callback((Fl_Callback*)cb_F); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->VoicePar[nvoice].PFMVolumeDamp-64); } // Fl_Value_Slider* o o->end(); @@ -836,7 +836,7 @@ Fl_Group* ADvoiceUI::make_window() { } // Fl_Group* fmoscil { Fl_Box* o = new Fl_Box(535, 365, 155, 20, "Mod.Oscillator"); o->labelfont(1); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Button* o = changeFMoscilbutton = new Fl_Button(700, 370, 55, 15, "Change"); changeFMoscilbutton->box(FL_THIN_UP_BOX); @@ -853,7 +853,7 @@ Fl_Group* ADvoiceUI::make_window() { o->maximum(63); o->step(1); o->callback((Fl_Callback*)cb_Phase); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(64-pars->VoicePar[nvoice].PFMoscilphase); } // Fl_Slider* o { Fl_Choice* o = new Fl_Choice(560, 390, 75, 15, "Use"); @@ -874,7 +874,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_External); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("OFF"); char tmp[50]; for (int i=0;iadd(tmp);}; o->value(pars->VoicePar[nvoice].PFMVoice+1); @@ -886,7 +886,7 @@ Fl_Group* ADvoiceUI::make_window() { { Fl_Choice* o = new Fl_Choice(535, 40, 80, 20, "Type:"); o->down_box(FL_BORDER_BOX); o->callback((Fl_Callback*)cb_Type); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->menu(menu_Type); o->value(pars->VoicePar[nvoice].PFMEnabled); } // Fl_Choice* o @@ -895,7 +895,7 @@ Fl_Group* ADvoiceUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = voicefreqenvgroup = new EnvelopeUI(10, 290, 205, 70, "ADSynth Voice - Frequency Envelope"); voicefreqenvgroup->box(FL_FLAT_BOX); voicefreqenvgroup->color((Fl_Color)51); @@ -904,7 +904,7 @@ Fl_Group* ADvoiceUI::make_window() { voicefreqenvgroup->labelfont(0); voicefreqenvgroup->labelsize(14); voicefreqenvgroup->labelcolor(FL_FOREGROUND_COLOR); - voicefreqenvgroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voicefreqenvgroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voicefreqenvgroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FreqEnvelope); if (pars->VoicePar[nvoice].PFreqEnvelopeEnabled==0) o->deactivate(); @@ -926,7 +926,7 @@ Fl_Group* ADvoiceUI::make_window() { voicefreqlfogroup->labelfont(0); voicefreqlfogroup->labelsize(14); voicefreqlfogroup->labelcolor(FL_FOREGROUND_COLOR); - voicefreqlfogroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voicefreqlfogroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voicefreqlfogroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FreqLfo); if (pars->VoicePar[nvoice].PFreqLfoEnabled==0) o->deactivate(); @@ -950,7 +950,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Octave1); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->VoicePar[nvoice].PCoarseDetune/1024; if (k>=8) k-=16; o->value(k); @@ -964,7 +964,7 @@ Fl_Group* ADvoiceUI::make_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Coarse1); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->VoicePar[nvoice].PCoarseDetune%1024; if (k>=512) k-=1024; o->value(k); @@ -988,7 +988,7 @@ Fl_Group* ADvoiceUI::make_window() { detunevalueoutput->textfont(1); detunevalueoutput->textsize(10); detunevalueoutput->callback((Fl_Callback*)cb_detunevalueoutput1); - detunevalueoutput->align(FL_ALIGN_TOP_LEFT); + detunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune((pars->VoicePar[nvoice].PDetuneType==0)?(pars->GlobalPar.PDetuneType) : (pars->VoicePar[nvoice].PDetuneType),0,pars->VoicePar[nvoice].PDetune)*pars->getBandwidthDetuneMultiplier()); } // Fl_Value_Output* detunevalueoutput { Fl_Check_Button* o = new Fl_Check_Button(345, 253, 55, 15, "440Hz"); @@ -1012,7 +1012,7 @@ cy)"); fixedfreqetdial->maximum(127); fixedfreqetdial->step(1); fixedfreqetdial->callback((Fl_Callback*)cb_fixedfreqetdial); - fixedfreqetdial->align(FL_ALIGN_RIGHT); + fixedfreqetdial->align(Fl_Align(FL_ALIGN_RIGHT)); fixedfreqetdial->when(FL_WHEN_CHANGED); o->value(pars->VoicePar[nvoice].PfixedfreqET); if (pars->VoicePar[nvoice].Pfixedfreq==0) o->deactivate(); @@ -1023,7 +1023,7 @@ cy)"); o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_Detune1); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("Default");o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents"); o->value(pars->VoicePar[nvoice].PDetuneType); } // Fl_Choice* o @@ -1049,7 +1049,7 @@ cy)"); { Fl_Box* o = new Fl_Box(5, 375, 75, 35, "Voice Oscillator"); o->labelfont(1); o->labelsize(12); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Box* o { Fl_Slider* o = new Fl_Slider(10, 420, 65, 10, "Phase"); o->type(5); @@ -1059,7 +1059,7 @@ cy)"); o->maximum(63); o->step(1); o->callback((Fl_Callback*)cb_Phase1); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(64-pars->VoicePar[nvoice].Poscilphase); } // Fl_Slider* o { Fl_Check_Button* o = new Fl_Check_Button(210, 5, 35, 35, "R."); @@ -1077,7 +1077,7 @@ cy)"); o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_Use1); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("Internal"); char tmp[50]; for (int i=0;iadd(tmp);}; o->value(pars->VoicePar[nvoice].Pextoscil+1); @@ -1089,7 +1089,7 @@ cy)"); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Value_Slider* o = new Fl_Value_Slider(10, 60, 160, 15, "Vol"); o->tooltip("Volume"); o->type(5); @@ -1098,7 +1098,7 @@ cy)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vol1); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->VoicePar[nvoice].PVolume); } // Fl_Value_Slider* o { Fl_Value_Slider* o = new Fl_Value_Slider(10, 80, 160, 15, "V.Sns"); @@ -1109,7 +1109,7 @@ cy)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_V1); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->VoicePar[nvoice].PAmpVelocityScaleFunction); } // Fl_Value_Slider* o { EnvelopeUI* o = voiceampenvgroup = new EnvelopeUI(10, 105, 205, 70, "ADSynth Voice - Amplitude Envelope"); @@ -1120,7 +1120,7 @@ cy)"); voiceampenvgroup->labelfont(0); voiceampenvgroup->labelsize(14); voiceampenvgroup->labelcolor(FL_FOREGROUND_COLOR); - voiceampenvgroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voiceampenvgroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voiceampenvgroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].AmpEnvelope); if (pars->VoicePar[nvoice].PAmpEnvelopeEnabled==0) o->deactivate(); @@ -1138,7 +1138,7 @@ cy)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Pan); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(pars->VoicePar[nvoice].PPanning); } // WidgetPDial* o @@ -1158,7 +1158,7 @@ cy)"); voiceamplfogroup->labelfont(0); voiceamplfogroup->labelsize(14); voiceamplfogroup->labelcolor(FL_FOREGROUND_COLOR); - voiceamplfogroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voiceamplfogroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voiceamplfogroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].AmpLfo); if (pars->VoicePar[nvoice].PAmpLfoEnabled==0) o->deactivate(); @@ -1186,7 +1186,7 @@ cy)"); voicefiltergroup->labeltype(FL_EMBOSSED_LABEL); voicefiltergroup->labelfont(1); voicefiltergroup->labelsize(13); - voicefiltergroup->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + voicefiltergroup->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { FilterUI* o = new FilterUI(250, 30, 275, 75, "ADsynth Voice - Filter"); o->box(FL_FLAT_BOX); o->color(FL_LIGHT1); @@ -1195,7 +1195,7 @@ cy)"); o->labelfont(0); o->labelsize(14); o->labelcolor(FL_FOREGROUND_COLOR); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); o->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].VoiceFilter,NULL,NULL); o->end(); @@ -1208,7 +1208,7 @@ cy)"); voicefilterenvgroup->labelfont(0); voicefilterenvgroup->labelsize(14); voicefilterenvgroup->labelcolor(FL_FOREGROUND_COLOR); - voicefilterenvgroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voicefilterenvgroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voicefilterenvgroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FilterEnvelope); if (pars->VoicePar[nvoice].PFilterEnvelopeEnabled==0) o->deactivate(); @@ -1230,7 +1230,7 @@ cy)"); voicefilterlfogroup->labelfont(0); voicefilterlfogroup->labelsize(14); voicefilterlfogroup->labelcolor(FL_FOREGROUND_COLOR); - voicefilterlfogroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + voicefilterlfogroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); voicefilterlfogroup->when(FL_WHEN_RELEASE); o->init(pars->VoicePar[nvoice].FilterLfo); if (pars->VoicePar[nvoice].PFilterLfoEnabled==0) o->deactivate(); @@ -1252,7 +1252,7 @@ cy)"); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",nvoice+1);o->label(strdup(tmp)); o->end(); } // Fl_Group* o @@ -1272,7 +1272,7 @@ cy)"); bypassfiltercheckbutton->labelfont(1); bypassfiltercheckbutton->labelsize(10); bypassfiltercheckbutton->callback((Fl_Callback*)cb_bypassfiltercheckbutton); - bypassfiltercheckbutton->align(132|FL_ALIGN_INSIDE); + bypassfiltercheckbutton->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(pars->VoicePar[nvoice].Pfilterbypass); } // Fl_Check_Button* bypassfiltercheckbutton { Fl_Group* o = new Fl_Group(115, 5, 95, 35); @@ -1285,7 +1285,7 @@ cy)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Delay); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(pars->VoicePar[nvoice].PDelay); } // Fl_Value_Slider* o o->end(); @@ -1561,7 +1561,7 @@ Fl_Double_Window* ADnoteUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = freqenv = new EnvelopeUI(10, 295, 205, 70, "ADSynth Global - Frequency Envelope"); freqenv->box(FL_FLAT_BOX); freqenv->color((Fl_Color)51); @@ -1570,7 +1570,7 @@ Fl_Double_Window* ADnoteUI::make_window() { freqenv->labelfont(0); freqenv->labelsize(14); freqenv->labelcolor(FL_FOREGROUND_COLOR); - freqenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + freqenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); freqenv->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.FreqEnvelope); freqenv->end(); @@ -1585,7 +1585,7 @@ Fl_Double_Window* ADnoteUI::make_window() { octave->textfont(1); octave->textsize(11); octave->callback((Fl_Callback*)cb_octave); - octave->align(FL_ALIGN_TOP); + octave->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->GlobalPar.PCoarseDetune/1024;if (k>=8) k-=16; o->value(k); } // Fl_Counter* octave @@ -1598,7 +1598,7 @@ Fl_Double_Window* ADnoteUI::make_window() { coarsedet->textfont(1); coarsedet->textsize(11); coarsedet->callback((Fl_Callback*)cb_coarsedet); - coarsedet->align(FL_ALIGN_TOP_LEFT); + coarsedet->align(Fl_Align(FL_ALIGN_TOP_LEFT)); int k=pars->GlobalPar.PCoarseDetune%1024;if (k>=512) k-=1024; o->value(k); o->lstep(10); @@ -1611,7 +1611,7 @@ Fl_Double_Window* ADnoteUI::make_window() { freqlfo->labelfont(0); freqlfo->labelsize(14); freqlfo->labelcolor(FL_FOREGROUND_COLOR); - freqlfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + freqlfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); freqlfo->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.FreqLfo); freqlfo->end(); @@ -1634,7 +1634,7 @@ Fl_Double_Window* ADnoteUI::make_window() { detunevalueoutput->textfont(1); detunevalueoutput->textsize(10); detunevalueoutput->callback((Fl_Callback*)cb_detunevalueoutput2); - detunevalueoutput->align(FL_ALIGN_TOP_LEFT); + detunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune(pars->GlobalPar.PDetuneType,0,pars->GlobalPar.PDetune)); } // Fl_Value_Output* detunevalueoutput { Fl_Choice* o = detunetype = new Fl_Choice(450, 315, 75, 15, "Detune Type"); @@ -1643,7 +1643,7 @@ Fl_Double_Window* ADnoteUI::make_window() { detunetype->textfont(1); detunetype->textsize(10); detunetype->callback((Fl_Callback*)cb_detunetype); - detunetype->align(FL_ALIGN_TOP_LEFT); + detunetype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents"); o->value(pars->GlobalPar.PDetuneType-1); } // Fl_Choice* detunetype @@ -1659,7 +1659,7 @@ Fl_Double_Window* ADnoteUI::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_relBW); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); o->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PBandwidth); } // WidgetPDial* o @@ -1670,7 +1670,7 @@ Fl_Double_Window* ADnoteUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Value_Slider* o = volume = new Fl_Value_Slider(10, 30, 160, 15, "Vol"); volume->tooltip("Volume"); volume->type(5); @@ -1679,7 +1679,7 @@ Fl_Double_Window* ADnoteUI::make_window() { volume->maximum(127); volume->step(1); volume->callback((Fl_Callback*)cb_volume); - volume->align(FL_ALIGN_RIGHT); + volume->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->GlobalPar.PVolume); } // Fl_Value_Slider* volume { Fl_Value_Slider* o = vsns = new Fl_Value_Slider(10, 50, 160, 15, "V.Sns"); @@ -1690,7 +1690,7 @@ Fl_Double_Window* ADnoteUI::make_window() { vsns->maximum(127); vsns->step(1); vsns->callback((Fl_Callback*)cb_vsns); - vsns->align(FL_ALIGN_RIGHT); + vsns->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->GlobalPar.PAmpVelocityScaleFunction); } // Fl_Value_Slider* vsns { WidgetPDial* o = pan = new WidgetPDial(210, 25, 30, 30, "Pan"); @@ -1705,7 +1705,7 @@ Fl_Double_Window* ADnoteUI::make_window() { pan->maximum(127); pan->step(1); pan->callback((Fl_Callback*)cb_pan); - pan->align(FL_ALIGN_BOTTOM); + pan->align(Fl_Align(FL_ALIGN_BOTTOM)); pan->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PPanning); } // WidgetPDial* pan @@ -1721,7 +1721,7 @@ Fl_Double_Window* ADnoteUI::make_window() { pstr->maximum(127); pstr->step(1); pstr->callback((Fl_Callback*)cb_pstr); - pstr->align(FL_ALIGN_TOP); + pstr->align(Fl_Align(FL_ALIGN_TOP)); pstr->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PPunchStrength); } // WidgetPDial* pstr @@ -1737,7 +1737,7 @@ Fl_Double_Window* ADnoteUI::make_window() { pt->maximum(127); pt->step(1); pt->callback((Fl_Callback*)cb_pt); - pt->align(FL_ALIGN_TOP); + pt->align(Fl_Align(FL_ALIGN_TOP)); pt->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PPunchTime); } // WidgetPDial* pt @@ -1753,7 +1753,7 @@ Fl_Double_Window* ADnoteUI::make_window() { pstc->maximum(127); pstc->step(1); pstc->callback((Fl_Callback*)cb_pstc); - pstc->align(FL_ALIGN_TOP); + pstc->align(Fl_Align(FL_ALIGN_TOP)); pstc->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PPunchStretch); } // WidgetPDial* pstc @@ -1769,7 +1769,7 @@ Fl_Double_Window* ADnoteUI::make_window() { pvel->maximum(127); pvel->step(1); pvel->callback((Fl_Callback*)cb_pvel); - pvel->align(FL_ALIGN_TOP); + pvel->align(Fl_Align(FL_ALIGN_TOP)); pvel->when(FL_WHEN_CHANGED); o->value(pars->GlobalPar.PPunchVelocitySensing); } // WidgetPDial* pvel @@ -1781,7 +1781,7 @@ Fl_Double_Window* ADnoteUI::make_window() { ampenv->labelfont(0); ampenv->labelsize(14); ampenv->labelcolor(FL_FOREGROUND_COLOR); - ampenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + ampenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); ampenv->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.AmpEnvelope); ampenv->end(); @@ -1794,7 +1794,7 @@ Fl_Double_Window* ADnoteUI::make_window() { amplfo->labelfont(0); amplfo->labelsize(14); amplfo->labelcolor(FL_FOREGROUND_COLOR); - amplfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + amplfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); amplfo->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.AmpLfo); amplfo->end(); @@ -1804,7 +1804,7 @@ Fl_Double_Window* ADnoteUI::make_window() { rndgrp->down_box(FL_DOWN_BOX); rndgrp->labelsize(10); rndgrp->callback((Fl_Callback*)cb_rndgrp); - rndgrp->align(132|FL_ALIGN_INSIDE); + rndgrp->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(pars->GlobalPar.Hrandgrouping); } // Fl_Check_Button* rndgrp o->end(); @@ -1814,7 +1814,7 @@ Fl_Double_Window* ADnoteUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = filterenv = new EnvelopeUI(250, 110, 275, 70, "ADSynth Global - Filter Envelope"); filterenv->box(FL_FLAT_BOX); filterenv->color((Fl_Color)51); @@ -1823,7 +1823,7 @@ Fl_Double_Window* ADnoteUI::make_window() { filterenv->labelfont(0); filterenv->labelsize(14); filterenv->labelcolor(FL_FOREGROUND_COLOR); - filterenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterenv->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.FilterEnvelope); filterenv->end(); @@ -1836,7 +1836,7 @@ Fl_Double_Window* ADnoteUI::make_window() { filterlfo->labelfont(0); filterlfo->labelsize(14); filterlfo->labelcolor(FL_FOREGROUND_COLOR); - filterlfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterlfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterlfo->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.FilterLfo); filterlfo->end(); @@ -1849,7 +1849,7 @@ Fl_Double_Window* ADnoteUI::make_window() { filterui->labelfont(0); filterui->labelsize(14); filterui->labelcolor(FL_FOREGROUND_COLOR); - filterui->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterui->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterui->when(FL_WHEN_RELEASE); o->init(pars->GlobalPar.GlobalFilter,&pars->GlobalPar.PFilterVelocityScale,&pars->GlobalPar.PFilterVelocityScaleFunction); filterui->end(); @@ -1909,7 +1909,7 @@ Fl_Double_Window* ADnoteUI::make_window() { advoice->labelfont(0); advoice->labelsize(14); advoice->labelcolor(FL_FOREGROUND_COLOR); - advoice->align(FL_ALIGN_TOP); + advoice->align(Fl_Align(FL_ALIGN_TOP)); advoice->when(FL_WHEN_RELEASE); o->init(pars,nvoice,master); o->show(); @@ -1930,7 +1930,7 @@ Fl_Double_Window* ADnoteUI::make_window() { currentvoicecounter->textfont(1); currentvoicecounter->textsize(13); currentvoicecounter->callback((Fl_Callback*)cb_currentvoicecounter); - currentvoicecounter->align(FL_ALIGN_RIGHT); + currentvoicecounter->align(Fl_Align(FL_ALIGN_RIGHT)); o->bounds(1,NUM_VOICES); } // Fl_Counter* currentvoicecounter { Fl_Button* o = new Fl_Button(700, 535, 25, 15, "C"); diff --git a/plugins/zynaddsubfx/src/UI/ADnoteUI.h b/plugins/zynaddsubfx/src/UI/ADnoteUI.h index f41d8ad82..01817c196 100644 --- a/plugins/zynaddsubfx/src/UI/ADnoteUI.h +++ b/plugins/zynaddsubfx/src/UI/ADnoteUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef ADnoteUI_h #define ADnoteUI_h diff --git a/plugins/zynaddsubfx/src/UI/BankUI.cc b/plugins/zynaddsubfx/src/UI/BankUI.cc index 40306238a..ac976f873 100644 --- a/plugins/zynaddsubfx/src/UI/BankUI.cc +++ b/plugins/zynaddsubfx/src/UI/BankUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "BankUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -246,7 +246,7 @@ Fl_Double_Window* BankUI::make_window() { o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)cb_New); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { Fl_Check_Button* o = new Fl_Check_Button(705, 529, 60, 15, "auto close"); o->tooltip("automatically close the bank window if the instrument is loaded"); @@ -261,7 +261,7 @@ Fl_Double_Window* BankUI::make_window() { banklist->textfont(1); banklist->textsize(11); banklist->callback((Fl_Callback*)cb_banklist); - banklist->align(FL_ALIGN_CENTER); + banklist->align(Fl_Align(FL_ALIGN_CENTER)); } // Fl_Choice* banklist { Fl_Button* o = new Fl_Button(230, 8, 105, 20, "Refresh bank list"); o->tooltip("Refresh the bank list (rescan)"); diff --git a/plugins/zynaddsubfx/src/UI/BankUI.h b/plugins/zynaddsubfx/src/UI/BankUI.h index 6c36ea2d7..d498c79bb 100644 --- a/plugins/zynaddsubfx/src/UI/BankUI.h +++ b/plugins/zynaddsubfx/src/UI/BankUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef BankUI_h #define BankUI_h diff --git a/plugins/zynaddsubfx/src/UI/ConfigUI.cc b/plugins/zynaddsubfx/src/UI/ConfigUI.cc index be6d20eab..85ec3b445 100644 --- a/plugins/zynaddsubfx/src/UI/ConfigUI.cc +++ b/plugins/zynaddsubfx/src/UI/ConfigUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "ConfigUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -280,7 +280,7 @@ Fl_Double_Window* ConfigUI::make_window() { o->labelsize(11); o->textfont(1); o->callback((Fl_Callback*)cb_Buffer); - o->align(129); + o->align(Fl_Align(129)); char *tmpbuf=new char[100];o->cut(0,o->maximum_size()); snprintf(tmpbuf,100,"%d",config.cfg.SoundBufferSize);o->insert(tmpbuf); delete []tmpbuf; @@ -304,18 +304,18 @@ Fl_Double_Window* ConfigUI::make_window() { { Fl_Box* o = new Fl_Box(15, 275, 235, 30, "Most settings has effect only after ZynAddSubFX is restarted."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(10, 255, 240, 20, "Read the Readme.txt for other settings"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Box* o { Fl_Group* o = new Fl_Group(15, 125, 230, 85); o->box(FL_ENGRAVED_BOX); { Fl_File_Input* o = new Fl_File_Input(20, 170, 220, 35, "Dump File"); o->callback((Fl_Callback*)cb_Dump); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->insert(config.cfg.DumpFile); } // Fl_File_Input* o { Fl_Check_Button* o = new Fl_Check_Button(20, 130, 100, 20, "Dump notes"); @@ -336,21 +336,21 @@ Fl_Double_Window* ConfigUI::make_window() { system, etc..)"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Box* o { Fl_Group* o = new Fl_Group(260, 110, 235, 115, "Linux"); o->box(FL_ENGRAVED_BOX); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); { Fl_File_Input* o = new Fl_File_Input(265, 180, 225, 35, "OSS Sequencer Device (/dev/...)"); o->callback((Fl_Callback*)cb_OSS); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->insert(config.cfg.LinuxOSSSeqInDev); } // Fl_File_Input* o { Fl_File_Input* o = new Fl_File_Input(265, 130, 225, 35, "OSS Wave Out Device (/dev/...)"); o->callback((Fl_Callback*)cb_OSS1); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->insert(config.cfg.LinuxOSSWaveOutDev); } // Fl_File_Input* o o->end(); @@ -359,7 +359,7 @@ system, etc..)"); o->box(FL_ENGRAVED_BOX); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); { Fl_Counter* o = new Fl_Counter(270, 270, 65, 20, "Midi In Dev"); o->type(1); o->labelsize(11); @@ -367,14 +367,14 @@ system, etc..)"); o->maximum(100); o->step(1); o->callback((Fl_Callback*)cb_Midi); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); o->maximum(config.winmidimax-1); o->value(config.cfg.WindowsMidiInId); } // Fl_Counter* o { Fl_Box* o = midiinputnamebox = new Fl_Box(340, 260, 150, 35, "Midi input device name"); midiinputnamebox->labelfont(1); midiinputnamebox->labelsize(11); - midiinputnamebox->align(196|FL_ALIGN_INSIDE); + midiinputnamebox->align(Fl_Align(196|FL_ALIGN_INSIDE)); o->label(config.winmididevices[config.cfg.WindowsMidiInId].name); } // Fl_Box* midiinputnamebox o->end(); @@ -389,7 +389,7 @@ system, etc..)"); o->maximum(9); o->step(1); o->callback((Fl_Callback*)cb_XML); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(config.cfg.GzipCompression); } // Fl_Counter* o { Fl_Choice* o = new Fl_Choice(175, 105, 75, 15, "PADsynth Interpolation"); @@ -420,18 +420,18 @@ system, etc..)"); { Fl_Button* o = new Fl_Button(15, 265, 80, 35, "Add root directory..."); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)cb_Add); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { Fl_Button* o = removerootdirbutton = new Fl_Button(105, 265, 80, 35, "Remove root dir..."); removerootdirbutton->box(FL_THIN_UP_BOX); removerootdirbutton->callback((Fl_Callback*)cb_removerootdirbutton); - removerootdirbutton->align(FL_ALIGN_WRAP); + removerootdirbutton->align(Fl_Align(FL_ALIGN_WRAP)); o->deactivate(); } // Fl_Button* removerootdirbutton { Fl_Button* o = makedefaultrootdirbutton = new Fl_Button(190, 265, 80, 35, "Make default"); makedefaultrootdirbutton->box(FL_THIN_UP_BOX); makedefaultrootdirbutton->callback((Fl_Callback*)cb_makedefaultrootdirbutton); - makedefaultrootdirbutton->align(FL_ALIGN_WRAP); + makedefaultrootdirbutton->align(Fl_Align(FL_ALIGN_WRAP)); o->deactivate(); } // Fl_Button* makedefaultrootdirbutton o->end(); @@ -445,18 +445,18 @@ system, etc..)"); { Fl_Button* o = new Fl_Button(15, 265, 80, 35, "Add preset directory..."); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)cb_Add1); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { Fl_Button* o = removepresetbutton = new Fl_Button(105, 265, 80, 35, "Remove preset dir..."); removepresetbutton->box(FL_THIN_UP_BOX); removepresetbutton->callback((Fl_Callback*)cb_removepresetbutton); - removepresetbutton->align(FL_ALIGN_WRAP); + removepresetbutton->align(Fl_Align(FL_ALIGN_WRAP)); o->deactivate(); } // Fl_Button* removepresetbutton { Fl_Button* o = makedefaultpresetbutton = new Fl_Button(190, 265, 80, 35, "Make default"); makedefaultpresetbutton->box(FL_THIN_UP_BOX); makedefaultpresetbutton->callback((Fl_Callback*)cb_makedefaultpresetbutton); - makedefaultpresetbutton->align(FL_ALIGN_WRAP); + makedefaultpresetbutton->align(Fl_Align(FL_ALIGN_WRAP)); o->deactivate(); } // Fl_Button* makedefaultpresetbutton o->end(); diff --git a/plugins/zynaddsubfx/src/UI/ConfigUI.h b/plugins/zynaddsubfx/src/UI/ConfigUI.h index 6cc47b9ab..3b9fced56 100644 --- a/plugins/zynaddsubfx/src/UI/ConfigUI.h +++ b/plugins/zynaddsubfx/src/UI/ConfigUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef ConfigUI_h #define ConfigUI_h diff --git a/plugins/zynaddsubfx/src/UI/EffUI.cc b/plugins/zynaddsubfx/src/UI/EffUI.cc index ede3583e2..9da1534d9 100644 --- a/plugins/zynaddsubfx/src/UI/EffUI.cc +++ b/plugins/zynaddsubfx/src/UI/EffUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "EffUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -975,7 +975,7 @@ Fl_Group* EffUI::make_null_window() { effnullwindow->labelsize(14); effnullwindow->labelcolor(FL_FOREGROUND_COLOR); effnullwindow->user_data((void*)(this)); - effnullwindow->align(FL_ALIGN_TOP); + effnullwindow->align(Fl_Align(FL_ALIGN_TOP)); effnullwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(120, 35, 10, 20, "No Effect"); o->box(FL_NO_BOX); @@ -983,7 +983,7 @@ Fl_Group* EffUI::make_null_window() { o->labelfont(1); o->labelsize(22); o->labelcolor((Fl_Color)43); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o effnullwindow->end(); } // Fl_Group* effnullwindow @@ -1000,14 +1000,14 @@ Fl_Group* EffUI::make_reverb_window() { effreverbwindow->labelsize(14); effreverbwindow->labelcolor(FL_FOREGROUND_COLOR); effreverbwindow->user_data((void*)(this)); - effreverbwindow->align(FL_ALIGN_TOP); + effreverbwindow->align(Fl_Align(FL_ALIGN_TOP)); effreverbwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(275, 10, 10, 20, "Reverb "); o->box(FL_NO_BOX); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { revp = new Fl_Choice(10, 15, 90, 15, "Preset"); revp->down_box(FL_BORDER_BOX); @@ -1017,9 +1017,9 @@ Fl_Group* EffUI::make_reverb_window() { revp->labelsize(10); revp->textfont(1); revp->textsize(10); - revp->textcolor(7); + revp->textcolor(FL_BACKGROUND2_COLOR); revp->callback((Fl_Callback*)cb_revp); - revp->align(FL_ALIGN_TOP_LEFT); + revp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); revp->menu(menu_revp); } // Fl_Choice* revp { revp10 = new Fl_Choice(110, 15, 75, 15, "Type"); @@ -1029,9 +1029,9 @@ Fl_Group* EffUI::make_reverb_window() { revp10->labelsize(10); revp10->textfont(1); revp10->textsize(10); - revp10->textcolor(7); + revp10->textcolor(FL_BACKGROUND2_COLOR); revp10->callback((Fl_Callback*)cb_revp10); - revp10->align(FL_ALIGN_TOP_LEFT); + revp10->align(Fl_Align(FL_ALIGN_TOP_LEFT)); revp10->menu(menu_revp10); } // Fl_Choice* revp10 { revp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); @@ -1045,7 +1045,7 @@ Fl_Group* EffUI::make_reverb_window() { revp0->labelcolor(FL_FOREGROUND_COLOR); revp0->maximum(127); revp0->callback((Fl_Callback*)cb_revp0); - revp0->align(FL_ALIGN_BOTTOM); + revp0->align(Fl_Align(FL_ALIGN_BOTTOM)); revp0->when(FL_WHEN_CHANGED); } // WidgetPDial* revp0 { revp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1058,7 +1058,7 @@ Fl_Group* EffUI::make_reverb_window() { revp1->labelcolor(FL_FOREGROUND_COLOR); revp1->maximum(127); revp1->callback((Fl_Callback*)cb_revp1); - revp1->align(FL_ALIGN_BOTTOM); + revp1->align(Fl_Align(FL_ALIGN_BOTTOM)); revp1->when(FL_WHEN_CHANGED); } // WidgetPDial* revp1 { revp2 = new WidgetPDial(80, 40, 30, 30, "Time"); @@ -1072,7 +1072,7 @@ Fl_Group* EffUI::make_reverb_window() { revp2->labelcolor(FL_FOREGROUND_COLOR); revp2->maximum(127); revp2->callback((Fl_Callback*)cb_revp2); - revp2->align(FL_ALIGN_BOTTOM); + revp2->align(Fl_Align(FL_ALIGN_BOTTOM)); revp2->when(FL_WHEN_CHANGED); } // WidgetPDial* revp2 { revp3 = new WidgetPDial(120, 40, 30, 30, "I.del"); @@ -1086,7 +1086,7 @@ Fl_Group* EffUI::make_reverb_window() { revp3->labelcolor(FL_FOREGROUND_COLOR); revp3->maximum(127); revp3->callback((Fl_Callback*)cb_revp3); - revp3->align(FL_ALIGN_BOTTOM); + revp3->align(Fl_Align(FL_ALIGN_BOTTOM)); revp3->when(FL_WHEN_RELEASE); } // WidgetPDial* revp3 { revp4 = new WidgetPDial(155, 40, 30, 30, "I.delfb"); @@ -1100,7 +1100,7 @@ Fl_Group* EffUI::make_reverb_window() { revp4->labelcolor(FL_FOREGROUND_COLOR); revp4->maximum(127); revp4->callback((Fl_Callback*)cb_revp4); - revp4->align(FL_ALIGN_BOTTOM); + revp4->align(Fl_Align(FL_ALIGN_BOTTOM)); revp4->when(FL_WHEN_CHANGED); } // WidgetPDial* revp4 { revp5 = new WidgetPDial(200, 40, 30, 30, "R.delay"); @@ -1113,7 +1113,7 @@ Fl_Group* EffUI::make_reverb_window() { revp5->labelcolor(FL_FOREGROUND_COLOR); revp5->maximum(127); revp5->callback((Fl_Callback*)cb_revp5); - revp5->align(FL_ALIGN_BOTTOM); + revp5->align(Fl_Align(FL_ALIGN_BOTTOM)); revp5->when(FL_WHEN_RELEASE); revp5->deactivate(); } // WidgetPDial* revp5 @@ -1127,7 +1127,7 @@ Fl_Group* EffUI::make_reverb_window() { revp6->labelcolor(FL_FOREGROUND_COLOR); revp6->maximum(127); revp6->callback((Fl_Callback*)cb_revp6); - revp6->align(FL_ALIGN_BOTTOM); + revp6->align(Fl_Align(FL_ALIGN_BOTTOM)); revp6->when(FL_WHEN_CHANGED); revp6->deactivate(); } // WidgetPDial* revp6 @@ -1142,7 +1142,7 @@ Fl_Group* EffUI::make_reverb_window() { revp7->labelcolor(FL_FOREGROUND_COLOR); revp7->maximum(127); revp7->callback((Fl_Callback*)cb_revp7); - revp7->align(FL_ALIGN_BOTTOM); + revp7->align(Fl_Align(FL_ALIGN_BOTTOM)); revp7->when(FL_WHEN_CHANGED); } // WidgetPDial* revp7 { revp8 = new WidgetPDial(305, 40, 30, 30, "HPF"); @@ -1156,7 +1156,7 @@ Fl_Group* EffUI::make_reverb_window() { revp8->labelcolor(FL_FOREGROUND_COLOR); revp8->maximum(127); revp8->callback((Fl_Callback*)cb_revp8); - revp8->align(FL_ALIGN_BOTTOM); + revp8->align(Fl_Align(FL_ALIGN_BOTTOM)); revp8->when(FL_WHEN_CHANGED); } // WidgetPDial* revp8 { revp9 = new WidgetPDial(340, 40, 30, 30, "Damp"); @@ -1172,7 +1172,7 @@ Fl_Group* EffUI::make_reverb_window() { revp9->maximum(127); revp9->step(1); revp9->callback((Fl_Callback*)cb_revp9); - revp9->align(FL_ALIGN_BOTTOM); + revp9->align(Fl_Align(FL_ALIGN_BOTTOM)); revp9->when(FL_WHEN_CHANGED); } // WidgetPDial* revp9 { revp11 = new WidgetPDial(190, 10, 25, 25, "R.S."); @@ -1188,7 +1188,7 @@ Fl_Group* EffUI::make_reverb_window() { revp11->maximum(127); revp11->step(1); revp11->callback((Fl_Callback*)cb_revp11); - revp11->align(FL_ALIGN_RIGHT); + revp11->align(Fl_Align(FL_ALIGN_RIGHT)); revp11->when(FL_WHEN_CHANGED); } // WidgetPDial* revp11 effreverbwindow->end(); @@ -1206,7 +1206,7 @@ Fl_Group* EffUI::make_echo_window() { effechowindow->labelsize(14); effechowindow->labelcolor(FL_FOREGROUND_COLOR); effechowindow->user_data((void*)(this)); - effechowindow->align(FL_ALIGN_TOP); + effechowindow->align(Fl_Align(FL_ALIGN_TOP)); effechowindow->when(FL_WHEN_RELEASE); { echop = new Fl_Choice(11, 15, 95, 15, "Preset"); echop->down_box(FL_BORDER_BOX); @@ -1216,9 +1216,9 @@ Fl_Group* EffUI::make_echo_window() { echop->labelsize(10); echop->textfont(1); echop->textsize(10); - echop->textcolor(7); + echop->textcolor(FL_BACKGROUND2_COLOR); echop->callback((Fl_Callback*)cb_echop); - echop->align(FL_ALIGN_TOP_LEFT); + echop->align(Fl_Align(FL_ALIGN_TOP_LEFT)); echop->menu(menu_echop); } // Fl_Choice* echop { Fl_Text_Display* o = new Fl_Text_Display(295, 10, 10, 20, "Echo"); @@ -1226,7 +1226,7 @@ Fl_Group* EffUI::make_echo_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { echop0 = new WidgetPDial(10, 40, 30, 30, "Vol"); echop0->tooltip("Effect Volume"); @@ -1239,7 +1239,7 @@ Fl_Group* EffUI::make_echo_window() { echop0->labelcolor(FL_FOREGROUND_COLOR); echop0->maximum(127); echop0->callback((Fl_Callback*)cb_echop0); - echop0->align(FL_ALIGN_BOTTOM); + echop0->align(Fl_Align(FL_ALIGN_BOTTOM)); echop0->when(FL_WHEN_CHANGED); } // WidgetPDial* echop0 { echop1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1252,7 +1252,7 @@ Fl_Group* EffUI::make_echo_window() { echop1->labelcolor(FL_FOREGROUND_COLOR); echop1->maximum(127); echop1->callback((Fl_Callback*)cb_echop1); - echop1->align(FL_ALIGN_BOTTOM); + echop1->align(Fl_Align(FL_ALIGN_BOTTOM)); echop1->when(FL_WHEN_CHANGED); } // WidgetPDial* echop1 { echop2 = new WidgetPDial(80, 40, 30, 30, "Delay"); @@ -1265,7 +1265,7 @@ Fl_Group* EffUI::make_echo_window() { echop2->labelcolor(FL_FOREGROUND_COLOR); echop2->maximum(127); echop2->callback((Fl_Callback*)cb_echop2); - echop2->align(FL_ALIGN_BOTTOM); + echop2->align(Fl_Align(FL_ALIGN_BOTTOM)); echop2->when(FL_WHEN_RELEASE); } // WidgetPDial* echop2 { echop3 = new WidgetPDial(120, 40, 30, 30, "LRdl."); @@ -1279,7 +1279,7 @@ Fl_Group* EffUI::make_echo_window() { echop3->labelcolor(FL_FOREGROUND_COLOR); echop3->maximum(127); echop3->callback((Fl_Callback*)cb_echop3); - echop3->align(FL_ALIGN_BOTTOM); + echop3->align(Fl_Align(FL_ALIGN_BOTTOM)); echop3->when(FL_WHEN_RELEASE); } // WidgetPDial* echop3 { echop4 = new WidgetPDial(155, 40, 30, 30, "LRc."); @@ -1293,7 +1293,7 @@ Fl_Group* EffUI::make_echo_window() { echop4->labelcolor(FL_FOREGROUND_COLOR); echop4->maximum(127); echop4->callback((Fl_Callback*)cb_echop4); - echop4->align(FL_ALIGN_BOTTOM); + echop4->align(Fl_Align(FL_ALIGN_BOTTOM)); echop4->when(FL_WHEN_CHANGED); } // WidgetPDial* echop4 { echop5 = new WidgetPDial(195, 40, 30, 30, "Fb."); @@ -1307,7 +1307,7 @@ Fl_Group* EffUI::make_echo_window() { echop5->labelcolor(FL_FOREGROUND_COLOR); echop5->maximum(127); echop5->callback((Fl_Callback*)cb_echop5); - echop5->align(FL_ALIGN_BOTTOM); + echop5->align(Fl_Align(FL_ALIGN_BOTTOM)); echop5->when(FL_WHEN_CHANGED); } // WidgetPDial* echop5 { echop6 = new WidgetPDial(235, 40, 30, 30, "Damp"); @@ -1321,7 +1321,7 @@ Fl_Group* EffUI::make_echo_window() { echop6->labelcolor(FL_FOREGROUND_COLOR); echop6->maximum(127); echop6->callback((Fl_Callback*)cb_echop6); - echop6->align(FL_ALIGN_BOTTOM); + echop6->align(Fl_Align(FL_ALIGN_BOTTOM)); echop6->when(FL_WHEN_CHANGED); } // WidgetPDial* echop6 effechowindow->end(); @@ -1339,7 +1339,7 @@ Fl_Group* EffUI::make_chorus_window() { effchoruswindow->labelsize(14); effchoruswindow->labelcolor(FL_FOREGROUND_COLOR); effchoruswindow->user_data((void*)(this)); - effchoruswindow->align(FL_ALIGN_TOP); + effchoruswindow->align(Fl_Align(FL_ALIGN_TOP)); effchoruswindow->when(FL_WHEN_RELEASE); { chorusp = new Fl_Choice(10, 15, 90, 15, "Preset"); chorusp->down_box(FL_BORDER_BOX); @@ -1349,9 +1349,9 @@ Fl_Group* EffUI::make_chorus_window() { chorusp->labelsize(10); chorusp->textfont(1); chorusp->textsize(10); - chorusp->textcolor(7); + chorusp->textcolor(FL_BACKGROUND2_COLOR); chorusp->callback((Fl_Callback*)cb_chorusp); - chorusp->align(FL_ALIGN_TOP_LEFT); + chorusp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); chorusp->menu(menu_chorusp); } // Fl_Choice* chorusp { Fl_Text_Display* o = new Fl_Text_Display(265, 10, 10, 20, "Chorus"); @@ -1359,7 +1359,7 @@ Fl_Group* EffUI::make_chorus_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { chorusp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); chorusp0->box(FL_ROUND_UP_BOX); @@ -1371,7 +1371,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp0->labelcolor(FL_FOREGROUND_COLOR); chorusp0->maximum(127); chorusp0->callback((Fl_Callback*)cb_chorusp0); - chorusp0->align(FL_ALIGN_BOTTOM); + chorusp0->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp0->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp0 { chorusp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1384,7 +1384,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp1->labelcolor(FL_FOREGROUND_COLOR); chorusp1->maximum(127); chorusp1->callback((Fl_Callback*)cb_chorusp1); - chorusp1->align(FL_ALIGN_BOTTOM); + chorusp1->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp1->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp1 { chorusp2 = new WidgetPDial(85, 40, 30, 30, "Freq"); @@ -1398,7 +1398,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp2->labelcolor(FL_FOREGROUND_COLOR); chorusp2->maximum(127); chorusp2->callback((Fl_Callback*)cb_chorusp2); - chorusp2->align(FL_ALIGN_BOTTOM); + chorusp2->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp2->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp2 { chorusp3 = new WidgetPDial(120, 40, 30, 30, "Rnd"); @@ -1412,7 +1412,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp3->labelcolor(FL_FOREGROUND_COLOR); chorusp3->maximum(127); chorusp3->callback((Fl_Callback*)cb_chorusp3); - chorusp3->align(FL_ALIGN_BOTTOM); + chorusp3->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp3->when(FL_WHEN_RELEASE); } // WidgetPDial* chorusp3 { chorusp5 = new WidgetPDial(200, 40, 30, 30, "St.df"); @@ -1426,7 +1426,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp5->labelcolor(FL_FOREGROUND_COLOR); chorusp5->maximum(127); chorusp5->callback((Fl_Callback*)cb_chorusp5); - chorusp5->align(FL_ALIGN_BOTTOM); + chorusp5->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp5->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp5 { chorusp6 = new WidgetPDial(235, 40, 30, 30, "Dpth"); @@ -1440,7 +1440,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp6->labelcolor(FL_FOREGROUND_COLOR); chorusp6->maximum(127); chorusp6->callback((Fl_Callback*)cb_chorusp6); - chorusp6->align(FL_ALIGN_BOTTOM); + chorusp6->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp6->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp6 { chorusp7 = new WidgetPDial(270, 40, 30, 30, "Delay"); @@ -1453,7 +1453,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp7->labelcolor(FL_FOREGROUND_COLOR); chorusp7->maximum(127); chorusp7->callback((Fl_Callback*)cb_chorusp7); - chorusp7->align(FL_ALIGN_BOTTOM); + chorusp7->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp7->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp7 { chorusp8 = new WidgetPDial(305, 40, 30, 30, "Fb"); @@ -1467,7 +1467,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp8->labelcolor(FL_FOREGROUND_COLOR); chorusp8->maximum(127); chorusp8->callback((Fl_Callback*)cb_chorusp8); - chorusp8->align(FL_ALIGN_BOTTOM); + chorusp8->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp8->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp8 { chorusp9 = new WidgetPDial(340, 40, 30, 30, "L/R"); @@ -1481,7 +1481,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp9->labelcolor(FL_FOREGROUND_COLOR); chorusp9->maximum(127); chorusp9->callback((Fl_Callback*)cb_chorusp9); - chorusp9->align(FL_ALIGN_BOTTOM); + chorusp9->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp9->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp9 { Fl_Check_Button* o = new Fl_Check_Button(120, 10, 55, 20, "Flange"); @@ -1511,7 +1511,7 @@ Fl_Group* EffUI::make_chorus_window() { chorusp4->labelsize(10); chorusp4->textsize(8); chorusp4->callback((Fl_Callback*)cb_chorusp4); - chorusp4->align(130); + chorusp4->align(Fl_Align(130)); chorusp4->menu(menu_chorusp4); } // Fl_Choice* chorusp4 effchoruswindow->end(); @@ -1529,7 +1529,7 @@ Fl_Group* EffUI::make_phaser_window() { effphaserwindow->labelsize(14); effphaserwindow->labelcolor(FL_FOREGROUND_COLOR); effphaserwindow->user_data((void*)(this)); - effphaserwindow->align(FL_ALIGN_TOP); + effphaserwindow->align(Fl_Align(FL_ALIGN_TOP)); effphaserwindow->when(FL_WHEN_RELEASE); { phaserp = new Fl_Choice(10, 15, 90, 15, "Preset"); phaserp->down_box(FL_BORDER_BOX); @@ -1539,9 +1539,9 @@ Fl_Group* EffUI::make_phaser_window() { phaserp->labelsize(10); phaserp->textfont(1); phaserp->textsize(10); - phaserp->textcolor(7); + phaserp->textcolor(FL_BACKGROUND2_COLOR); phaserp->callback((Fl_Callback*)cb_phaserp); - phaserp->align(FL_ALIGN_TOP_LEFT); + phaserp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); phaserp->menu(menu_phaserp); } // Fl_Choice* phaserp { Fl_Text_Display* o = new Fl_Text_Display(275, 10, 10, 20, "Phaser"); @@ -1549,7 +1549,7 @@ Fl_Group* EffUI::make_phaser_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { phaserp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); phaserp0->tooltip("Effect Volume"); @@ -1562,7 +1562,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp0->labelcolor(FL_FOREGROUND_COLOR); phaserp0->maximum(127); phaserp0->callback((Fl_Callback*)cb_phaserp0); - phaserp0->align(FL_ALIGN_BOTTOM); + phaserp0->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp0->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp0 { phaserp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1575,7 +1575,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp1->labelcolor(FL_FOREGROUND_COLOR); phaserp1->maximum(127); phaserp1->callback((Fl_Callback*)cb_phaserp1); - phaserp1->align(FL_ALIGN_BOTTOM); + phaserp1->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp1->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp1 { phaserp2 = new WidgetPDial(85, 40, 30, 30, "Freq"); @@ -1589,7 +1589,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp2->labelcolor(FL_FOREGROUND_COLOR); phaserp2->maximum(127); phaserp2->callback((Fl_Callback*)cb_phaserp2); - phaserp2->align(FL_ALIGN_BOTTOM); + phaserp2->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp2->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp2 { phaserp3 = new WidgetPDial(120, 40, 30, 30, "Rnd"); @@ -1603,7 +1603,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp3->labelcolor(FL_FOREGROUND_COLOR); phaserp3->maximum(127); phaserp3->callback((Fl_Callback*)cb_phaserp3); - phaserp3->align(FL_ALIGN_BOTTOM); + phaserp3->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp3->when(FL_WHEN_RELEASE); } // WidgetPDial* phaserp3 { phaserp5 = new WidgetPDial(200, 40, 30, 30, "St.df"); @@ -1617,7 +1617,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp5->labelcolor(FL_FOREGROUND_COLOR); phaserp5->maximum(127); phaserp5->callback((Fl_Callback*)cb_phaserp5); - phaserp5->align(FL_ALIGN_BOTTOM); + phaserp5->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp5->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp5 { phaserp6 = new WidgetPDial(235, 40, 30, 30, "Dpth"); @@ -1631,7 +1631,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp6->labelcolor(FL_FOREGROUND_COLOR); phaserp6->maximum(127); phaserp6->callback((Fl_Callback*)cb_phaserp6); - phaserp6->align(FL_ALIGN_BOTTOM); + phaserp6->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp6->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp6 { phaserp7 = new WidgetPDial(270, 40, 30, 30, "Fb"); @@ -1645,7 +1645,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp7->labelcolor(FL_FOREGROUND_COLOR); phaserp7->maximum(127); phaserp7->callback((Fl_Callback*)cb_phaserp7); - phaserp7->align(FL_ALIGN_BOTTOM); + phaserp7->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp7->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp7 { phaserp9 = new WidgetPDial(345, 40, 30, 30, "L/R"); @@ -1659,7 +1659,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp9->labelcolor(FL_FOREGROUND_COLOR); phaserp9->maximum(127); phaserp9->callback((Fl_Callback*)cb_phaserp9); - phaserp9->align(FL_ALIGN_BOTTOM); + phaserp9->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp9->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp9 { phaserp10 = new Fl_Check_Button(185, 10, 74, 20, "Substract"); @@ -1678,7 +1678,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp4->labelsize(10); phaserp4->textsize(8); phaserp4->callback((Fl_Callback*)cb_phaserp4); - phaserp4->align(130); + phaserp4->align(Fl_Align(130)); phaserp4->menu(menu_phaserp4); } // Fl_Choice* phaserp4 { Fl_Counter* o = phaserp8 = new Fl_Counter(305, 55, 35, 15, "Stages"); @@ -1701,7 +1701,7 @@ Fl_Group* EffUI::make_phaser_window() { phaserp11->labelcolor(FL_FOREGROUND_COLOR); phaserp11->maximum(127); phaserp11->callback((Fl_Callback*)cb_phaserp11); - phaserp11->align(FL_ALIGN_BOTTOM); + phaserp11->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp11->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp11 effphaserwindow->end(); @@ -1719,7 +1719,7 @@ Fl_Group* EffUI::make_alienwah_window() { effalienwahwindow->labelsize(14); effalienwahwindow->labelcolor(FL_FOREGROUND_COLOR); effalienwahwindow->user_data((void*)(this)); - effalienwahwindow->align(FL_ALIGN_TOP); + effalienwahwindow->align(Fl_Align(FL_ALIGN_TOP)); effalienwahwindow->when(FL_WHEN_RELEASE); { awp = new Fl_Choice(10, 15, 90, 15, "Preset"); awp->down_box(FL_BORDER_BOX); @@ -1729,9 +1729,9 @@ Fl_Group* EffUI::make_alienwah_window() { awp->labelsize(10); awp->textfont(1); awp->textsize(10); - awp->textcolor(7); + awp->textcolor(FL_BACKGROUND2_COLOR); awp->callback((Fl_Callback*)cb_awp); - awp->align(FL_ALIGN_TOP_LEFT); + awp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); awp->menu(menu_awp); } // Fl_Choice* awp { Fl_Text_Display* o = new Fl_Text_Display(245, 10, 10, 20, "AlienWah"); @@ -1739,7 +1739,7 @@ Fl_Group* EffUI::make_alienwah_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { awp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); awp0->tooltip("Effect Volume"); @@ -1752,7 +1752,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp0->labelcolor(FL_FOREGROUND_COLOR); awp0->maximum(127); awp0->callback((Fl_Callback*)cb_awp0); - awp0->align(FL_ALIGN_BOTTOM); + awp0->align(Fl_Align(FL_ALIGN_BOTTOM)); awp0->when(FL_WHEN_CHANGED); } // WidgetPDial* awp0 { awp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1765,7 +1765,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp1->labelcolor(FL_FOREGROUND_COLOR); awp1->maximum(127); awp1->callback((Fl_Callback*)cb_awp1); - awp1->align(FL_ALIGN_BOTTOM); + awp1->align(Fl_Align(FL_ALIGN_BOTTOM)); awp1->when(FL_WHEN_CHANGED); } // WidgetPDial* awp1 { awp2 = new WidgetPDial(85, 40, 30, 30, "Freq"); @@ -1779,7 +1779,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp2->labelcolor(FL_FOREGROUND_COLOR); awp2->maximum(127); awp2->callback((Fl_Callback*)cb_awp2); - awp2->align(FL_ALIGN_BOTTOM); + awp2->align(Fl_Align(FL_ALIGN_BOTTOM)); awp2->when(FL_WHEN_CHANGED); } // WidgetPDial* awp2 { awp3 = new WidgetPDial(120, 40, 30, 30, "Rnd"); @@ -1793,7 +1793,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp3->labelcolor(FL_FOREGROUND_COLOR); awp3->maximum(127); awp3->callback((Fl_Callback*)cb_awp3); - awp3->align(FL_ALIGN_BOTTOM); + awp3->align(Fl_Align(FL_ALIGN_BOTTOM)); awp3->when(FL_WHEN_RELEASE); } // WidgetPDial* awp3 { awp5 = new WidgetPDial(200, 40, 30, 30, "St.df"); @@ -1807,7 +1807,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp5->labelcolor(FL_FOREGROUND_COLOR); awp5->maximum(127); awp5->callback((Fl_Callback*)cb_awp5); - awp5->align(FL_ALIGN_BOTTOM); + awp5->align(Fl_Align(FL_ALIGN_BOTTOM)); awp5->when(FL_WHEN_CHANGED); } // WidgetPDial* awp5 { awp6 = new WidgetPDial(235, 40, 30, 30, "Dpth"); @@ -1821,7 +1821,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp6->labelcolor(FL_FOREGROUND_COLOR); awp6->maximum(127); awp6->callback((Fl_Callback*)cb_awp6); - awp6->align(FL_ALIGN_BOTTOM); + awp6->align(Fl_Align(FL_ALIGN_BOTTOM)); awp6->when(FL_WHEN_CHANGED); } // WidgetPDial* awp6 { awp7 = new WidgetPDial(270, 40, 30, 30, "Fb"); @@ -1835,7 +1835,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp7->labelcolor(FL_FOREGROUND_COLOR); awp7->maximum(127); awp7->callback((Fl_Callback*)cb_awp7); - awp7->align(FL_ALIGN_BOTTOM); + awp7->align(Fl_Align(FL_ALIGN_BOTTOM)); awp7->when(FL_WHEN_CHANGED); } // WidgetPDial* awp7 { awp9 = new WidgetPDial(345, 40, 30, 30, "L/R"); @@ -1848,7 +1848,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp9->labelcolor(FL_FOREGROUND_COLOR); awp9->maximum(127); awp9->callback((Fl_Callback*)cb_awp9); - awp9->align(FL_ALIGN_BOTTOM); + awp9->align(Fl_Align(FL_ALIGN_BOTTOM)); awp9->when(FL_WHEN_CHANGED); } // WidgetPDial* awp9 { awp4 = new Fl_Choice(155, 50, 40, 15, "LFO type"); @@ -1858,7 +1858,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp4->labelsize(10); awp4->textsize(8); awp4->callback((Fl_Callback*)cb_awp4); - awp4->align(130); + awp4->align(Fl_Align(130)); awp4->menu(menu_awp4); } // Fl_Choice* awp4 { awp10 = new WidgetPDial(160, 5, 30, 30, "Phase"); @@ -1871,7 +1871,7 @@ Fl_Group* EffUI::make_alienwah_window() { awp10->labelcolor(FL_FOREGROUND_COLOR); awp10->maximum(127); awp10->callback((Fl_Callback*)cb_awp10); - awp10->align(FL_ALIGN_BOTTOM); + awp10->align(Fl_Align(FL_ALIGN_BOTTOM)); awp10->when(FL_WHEN_CHANGED); } // WidgetPDial* awp10 { Fl_Counter* o = awp8 = new Fl_Counter(305, 55, 35, 15, "Delay"); @@ -1899,7 +1899,7 @@ Fl_Group* EffUI::make_distorsion_window() { effdistorsionwindow->labelsize(14); effdistorsionwindow->labelcolor(FL_FOREGROUND_COLOR); effdistorsionwindow->user_data((void*)(this)); - effdistorsionwindow->align(FL_ALIGN_TOP); + effdistorsionwindow->align(Fl_Align(FL_ALIGN_TOP)); effdistorsionwindow->when(FL_WHEN_RELEASE); { distp = new Fl_Choice(11, 15, 95, 15, "Preset"); distp->down_box(FL_BORDER_BOX); @@ -1909,9 +1909,9 @@ Fl_Group* EffUI::make_distorsion_window() { distp->labelsize(10); distp->textfont(1); distp->textsize(10); - distp->textcolor(7); + distp->textcolor(FL_BACKGROUND2_COLOR); distp->callback((Fl_Callback*)cb_distp); - distp->align(FL_ALIGN_TOP_LEFT); + distp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); distp->menu(menu_distp); } // Fl_Choice* distp { Fl_Text_Display* o = new Fl_Text_Display(230, 10, 10, 20, "Distortion"); @@ -1919,7 +1919,7 @@ Fl_Group* EffUI::make_distorsion_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { distp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); distp0->tooltip("Effect Volume"); @@ -1932,7 +1932,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp0->labelcolor(FL_FOREGROUND_COLOR); distp0->maximum(127); distp0->callback((Fl_Callback*)cb_distp0); - distp0->align(FL_ALIGN_BOTTOM); + distp0->align(Fl_Align(FL_ALIGN_BOTTOM)); distp0->when(FL_WHEN_CHANGED); } // WidgetPDial* distp0 { distp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -1945,7 +1945,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp1->labelcolor(FL_FOREGROUND_COLOR); distp1->maximum(127); distp1->callback((Fl_Callback*)cb_distp1); - distp1->align(FL_ALIGN_BOTTOM); + distp1->align(Fl_Align(FL_ALIGN_BOTTOM)); distp1->when(FL_WHEN_CHANGED); } // WidgetPDial* distp1 { distp2 = new WidgetPDial(80, 40, 30, 30, "LRc."); @@ -1959,7 +1959,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp2->labelcolor(FL_FOREGROUND_COLOR); distp2->maximum(127); distp2->callback((Fl_Callback*)cb_distp2); - distp2->align(FL_ALIGN_BOTTOM); + distp2->align(Fl_Align(FL_ALIGN_BOTTOM)); distp2->when(FL_WHEN_RELEASE); } // WidgetPDial* distp2 { distp3 = new WidgetPDial(120, 40, 30, 30, "Drive"); @@ -1973,7 +1973,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp3->labelcolor(FL_FOREGROUND_COLOR); distp3->maximum(127); distp3->callback((Fl_Callback*)cb_distp3); - distp3->align(FL_ALIGN_BOTTOM); + distp3->align(Fl_Align(FL_ALIGN_BOTTOM)); distp3->when(FL_WHEN_RELEASE); } // WidgetPDial* distp3 { distp4 = new WidgetPDial(155, 40, 30, 30, "Level"); @@ -1987,7 +1987,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp4->labelcolor(FL_FOREGROUND_COLOR); distp4->maximum(127); distp4->callback((Fl_Callback*)cb_distp4); - distp4->align(FL_ALIGN_BOTTOM); + distp4->align(Fl_Align(FL_ALIGN_BOTTOM)); distp4->when(FL_WHEN_CHANGED); } // WidgetPDial* distp4 { distp7 = new WidgetPDial(285, 40, 30, 30, "LPF"); @@ -2001,7 +2001,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp7->labelcolor(FL_FOREGROUND_COLOR); distp7->maximum(127); distp7->callback((Fl_Callback*)cb_distp7); - distp7->align(FL_ALIGN_BOTTOM); + distp7->align(Fl_Align(FL_ALIGN_BOTTOM)); distp7->when(FL_WHEN_CHANGED); } // WidgetPDial* distp7 { distp8 = new WidgetPDial(320, 40, 30, 30, "HPF"); @@ -2015,7 +2015,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp8->labelcolor(FL_FOREGROUND_COLOR); distp8->maximum(127); distp8->callback((Fl_Callback*)cb_distp8); - distp8->align(FL_ALIGN_BOTTOM); + distp8->align(Fl_Align(FL_ALIGN_BOTTOM)); distp8->when(FL_WHEN_CHANGED); } // WidgetPDial* distp8 { distp5 = new Fl_Choice(190, 50, 60, 20, "Type"); @@ -2025,7 +2025,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp5->labelsize(11); distp5->textsize(10); distp5->callback((Fl_Callback*)cb_distp5); - distp5->align(FL_ALIGN_BOTTOM); + distp5->align(Fl_Align(FL_ALIGN_BOTTOM)); distp5->menu(menu_distp5); } // Fl_Choice* distp5 { distp6 = new Fl_Check_Button(260, 55, 15, 15, "Neg."); @@ -2033,7 +2033,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp6->labelfont(1); distp6->labelsize(11); distp6->callback((Fl_Callback*)cb_distp6); - distp6->align(FL_ALIGN_BOTTOM); + distp6->align(Fl_Align(FL_ALIGN_BOTTOM)); } // Fl_Check_Button* distp6 { distp9 = new Fl_Check_Button(355, 60, 15, 15, "St."); distp9->tooltip("Stereo"); @@ -2041,7 +2041,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp9->labelfont(1); distp9->labelsize(11); distp9->callback((Fl_Callback*)cb_distp9); - distp9->align(FL_ALIGN_BOTTOM); + distp9->align(Fl_Align(FL_ALIGN_BOTTOM)); } // Fl_Check_Button* distp9 { distp10 = new Fl_Check_Button(355, 44, 15, 15, "PF"); distp10->tooltip("Applies the filters(before or after) the distorsion"); @@ -2049,7 +2049,7 @@ Fl_Group* EffUI::make_distorsion_window() { distp10->labelfont(1); distp10->labelsize(11); distp10->callback((Fl_Callback*)cb_distp10); - distp10->align(FL_ALIGN_TOP); + distp10->align(Fl_Align(FL_ALIGN_TOP)); } // Fl_Check_Button* distp10 effdistorsionwindow->end(); } // Fl_Group* effdistorsionwindow @@ -2066,14 +2066,14 @@ Fl_Group* EffUI::make_eq_window() { effeqwindow->labelsize(14); effeqwindow->labelcolor(FL_FOREGROUND_COLOR); effeqwindow->user_data((void*)(this)); - effeqwindow->align(FL_ALIGN_TOP); + effeqwindow->align(Fl_Align(FL_ALIGN_TOP)); effeqwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(320, 10, 15, 20, "EQ"); o->box(FL_NO_BOX); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { eqp0 = new WidgetPDial(10, 35, 30, 30, "Gain"); eqp0->box(FL_ROUND_UP_BOX); @@ -2085,7 +2085,7 @@ Fl_Group* EffUI::make_eq_window() { eqp0->labelcolor(FL_FOREGROUND_COLOR); eqp0->maximum(127); eqp0->callback((Fl_Callback*)cb_eqp0); - eqp0->align(FL_ALIGN_BOTTOM); + eqp0->align(Fl_Align(FL_ALIGN_BOTTOM)); eqp0->when(FL_WHEN_CHANGED); } // WidgetPDial* eqp0 { Fl_Counter* o = bandcounter = new Fl_Counter(240, 20, 45, 15, "B."); @@ -2099,7 +2099,7 @@ Fl_Group* EffUI::make_eq_window() { bandcounter->textfont(1); bandcounter->textsize(11); bandcounter->callback((Fl_Callback*)cb_bandcounter); - bandcounter->align(FL_ALIGN_TOP); + bandcounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(0,MAX_EQ_BANDS-1); } // Fl_Counter* bandcounter { Fl_Group* o = bandgroup = new Fl_Group(245, 40, 130, 50); @@ -2114,7 +2114,7 @@ Fl_Group* EffUI::make_eq_window() { freqdial->labelcolor(FL_FOREGROUND_COLOR); freqdial->maximum(127); freqdial->callback((Fl_Callback*)cb_freqdial); - freqdial->align(FL_ALIGN_BOTTOM); + freqdial->align(Fl_Align(FL_ALIGN_BOTTOM)); freqdial->when(3); } // WidgetPDial* freqdial { gaindial = new WidgetPDial(280, 50, 25, 25, "Gain"); @@ -2128,7 +2128,7 @@ Fl_Group* EffUI::make_eq_window() { gaindial->maximum(127); gaindial->step(1); gaindial->callback((Fl_Callback*)cb_gaindial); - gaindial->align(FL_ALIGN_BOTTOM); + gaindial->align(Fl_Align(FL_ALIGN_BOTTOM)); gaindial->when(3); } // WidgetPDial* gaindial { qdial = new WidgetPDial(310, 50, 25, 25, "Q"); @@ -2142,7 +2142,7 @@ Fl_Group* EffUI::make_eq_window() { qdial->labelcolor(FL_FOREGROUND_COLOR); qdial->maximum(127); qdial->callback((Fl_Callback*)cb_qdial); - qdial->align(FL_ALIGN_BOTTOM); + qdial->align(Fl_Align(FL_ALIGN_BOTTOM)); qdial->when(3); } // WidgetPDial* qdial { Fl_Counter* o = stagescounter = new Fl_Counter(340, 60, 30, 15, "St."); @@ -2168,7 +2168,7 @@ Fl_Group* EffUI::make_eq_window() { typechoice->labelsize(10); typechoice->textsize(10); typechoice->callback((Fl_Callback*)cb_typechoice); - typechoice->align(FL_ALIGN_TOP); + typechoice->align(Fl_Align(FL_ALIGN_TOP)); typechoice->when(FL_WHEN_RELEASE_ALWAYS); typechoice->menu(menu_typechoice); } // Fl_Choice* typechoice @@ -2180,7 +2180,7 @@ Fl_Group* EffUI::make_eq_window() { eqgraph->labelfont(0); eqgraph->labelsize(14); eqgraph->labelcolor(FL_FOREGROUND_COLOR); - eqgraph->align(FL_ALIGN_CENTER); + eqgraph->align(Fl_Align(FL_ALIGN_CENTER)); eqgraph->when(FL_WHEN_RELEASE); o->init(eff); } // EQGraph* eqgraph @@ -2199,7 +2199,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { effdynamicfilterwindow->labelsize(14); effdynamicfilterwindow->labelcolor(FL_FOREGROUND_COLOR); effdynamicfilterwindow->user_data((void*)(this)); - effdynamicfilterwindow->align(FL_ALIGN_TOP); + effdynamicfilterwindow->align(Fl_Align(FL_ALIGN_TOP)); effdynamicfilterwindow->when(FL_WHEN_RELEASE); { dfp = new Fl_Choice(10, 15, 90, 15, "Preset"); dfp->down_box(FL_BORDER_BOX); @@ -2209,9 +2209,9 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp->labelsize(10); dfp->textfont(1); dfp->textsize(10); - dfp->textcolor(7); + dfp->textcolor(FL_BACKGROUND2_COLOR); dfp->callback((Fl_Callback*)cb_dfp); - dfp->align(FL_ALIGN_TOP_LEFT); + dfp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); dfp->menu(menu_dfp); } // Fl_Choice* dfp { Fl_Text_Display* o = new Fl_Text_Display(245, 10, 10, 20, "DynFilter"); @@ -2219,7 +2219,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { dfp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); dfp0->tooltip("Effect Volume"); @@ -2232,7 +2232,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp0->labelcolor(FL_FOREGROUND_COLOR); dfp0->maximum(127); dfp0->callback((Fl_Callback*)cb_dfp0); - dfp0->align(FL_ALIGN_BOTTOM); + dfp0->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp0->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp0 { dfp1 = new WidgetPDial(45, 40, 30, 30, "Pan"); @@ -2245,7 +2245,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp1->labelcolor(FL_FOREGROUND_COLOR); dfp1->maximum(127); dfp1->callback((Fl_Callback*)cb_dfp1); - dfp1->align(FL_ALIGN_BOTTOM); + dfp1->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp1->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp1 { dfp2 = new WidgetPDial(85, 40, 30, 30, "Freq"); @@ -2259,7 +2259,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp2->labelcolor(FL_FOREGROUND_COLOR); dfp2->maximum(127); dfp2->callback((Fl_Callback*)cb_dfp2); - dfp2->align(FL_ALIGN_BOTTOM); + dfp2->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp2->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp2 { dfp3 = new WidgetPDial(120, 40, 30, 30, "Rnd"); @@ -2273,7 +2273,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp3->labelcolor(FL_FOREGROUND_COLOR); dfp3->maximum(127); dfp3->callback((Fl_Callback*)cb_dfp3); - dfp3->align(FL_ALIGN_BOTTOM); + dfp3->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp3->when(FL_WHEN_RELEASE); } // WidgetPDial* dfp3 { dfp5 = new WidgetPDial(200, 40, 30, 30, "St.df"); @@ -2287,7 +2287,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp5->labelcolor(FL_FOREGROUND_COLOR); dfp5->maximum(127); dfp5->callback((Fl_Callback*)cb_dfp5); - dfp5->align(FL_ALIGN_BOTTOM); + dfp5->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp5->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp5 { dfp6 = new WidgetPDial(235, 40, 30, 30, "LfoD"); @@ -2301,7 +2301,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp6->labelcolor(FL_FOREGROUND_COLOR); dfp6->maximum(127); dfp6->callback((Fl_Callback*)cb_dfp6); - dfp6->align(FL_ALIGN_BOTTOM); + dfp6->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp6->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp6 { dfp4 = new Fl_Choice(155, 50, 40, 15, "LFO type"); @@ -2311,7 +2311,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp4->labelsize(10); dfp4->textsize(8); dfp4->callback((Fl_Callback*)cb_dfp4); - dfp4->align(130); + dfp4->align(Fl_Align(130)); dfp4->menu(menu_dfp4); } // Fl_Choice* dfp4 { Fl_Button* o = new Fl_Button(115, 10, 55, 25, "Filter"); @@ -2332,7 +2332,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp7->labelcolor(FL_FOREGROUND_COLOR); dfp7->maximum(127); dfp7->callback((Fl_Callback*)cb_dfp7); - dfp7->align(FL_ALIGN_BOTTOM); + dfp7->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp7->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp7 { dfp9 = new WidgetPDial(305, 45, 25, 25, "A.M"); @@ -2346,7 +2346,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp9->labelcolor(FL_FOREGROUND_COLOR); dfp9->maximum(127); dfp9->callback((Fl_Callback*)cb_dfp9); - dfp9->align(FL_ALIGN_BOTTOM); + dfp9->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp9->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp9 { dfp8 = new Fl_Check_Button(345, 55, 15, 15, "A.Inv."); @@ -2355,7 +2355,7 @@ Fl_Group* EffUI::make_dynamicfilter_window() { dfp8->labelfont(1); dfp8->labelsize(11); dfp8->callback((Fl_Callback*)cb_dfp8); - dfp8->align(FL_ALIGN_BOTTOM); + dfp8->align(Fl_Align(FL_ALIGN_BOTTOM)); } // Fl_Check_Button* dfp8 o->end(); } // Fl_Group* o @@ -2375,7 +2375,7 @@ Fl_Double_Window* EffUI::make_filter_window() { o->labelfont(0); o->labelsize(14); o->labelcolor(FL_FOREGROUND_COLOR); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); o->when(FL_WHEN_RELEASE); o->init(eff->filterpars,NULL,NULL); o->use_for_dynamic_filter(); @@ -3075,7 +3075,7 @@ Fl_Group* SimpleEffUI::make_null_window() { effnullwindow->labelsize(14); effnullwindow->labelcolor(FL_FOREGROUND_COLOR); effnullwindow->user_data((void*)(this)); - effnullwindow->align(FL_ALIGN_TOP); + effnullwindow->align(Fl_Align(FL_ALIGN_TOP)); effnullwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(25, 35, 35, 20, "No Effect"); o->box(FL_NO_BOX); @@ -3083,7 +3083,7 @@ Fl_Group* SimpleEffUI::make_null_window() { o->labelfont(1); o->labelsize(22); o->labelcolor((Fl_Color)43); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o effnullwindow->end(); } // Fl_Group* effnullwindow @@ -3100,14 +3100,14 @@ Fl_Group* SimpleEffUI::make_reverb_window() { effreverbwindow->labelsize(14); effreverbwindow->labelcolor(FL_FOREGROUND_COLOR); effreverbwindow->user_data((void*)(this)); - effreverbwindow->align(FL_ALIGN_TOP); + effreverbwindow->align(Fl_Align(FL_ALIGN_TOP)); effreverbwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(115, 10, 20, 20, "Reverb "); o->box(FL_NO_BOX); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { revp = new Fl_Choice(10, 15, 90, 15, "Preset"); revp->down_box(FL_BORDER_BOX); @@ -3117,9 +3117,9 @@ Fl_Group* SimpleEffUI::make_reverb_window() { revp->labelsize(10); revp->textfont(1); revp->textsize(10); - revp->textcolor(7); + revp->textcolor(FL_BACKGROUND2_COLOR); revp->callback((Fl_Callback*)cb_revpa); - revp->align(FL_ALIGN_TOP_LEFT); + revp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); revp->menu(menu_revp1); } // Fl_Choice* revp { revp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); @@ -3133,7 +3133,7 @@ Fl_Group* SimpleEffUI::make_reverb_window() { revp0->labelcolor(FL_FOREGROUND_COLOR); revp0->maximum(127); revp0->callback((Fl_Callback*)cb_revp01); - revp0->align(FL_ALIGN_BOTTOM); + revp0->align(Fl_Align(FL_ALIGN_BOTTOM)); revp0->when(FL_WHEN_CHANGED); } // WidgetPDial* revp0 { revp2 = new WidgetPDial(45, 40, 30, 30, "Time"); @@ -3147,7 +3147,7 @@ Fl_Group* SimpleEffUI::make_reverb_window() { revp2->labelcolor(FL_FOREGROUND_COLOR); revp2->maximum(127); revp2->callback((Fl_Callback*)cb_revp21); - revp2->align(FL_ALIGN_BOTTOM); + revp2->align(Fl_Align(FL_ALIGN_BOTTOM)); revp2->when(FL_WHEN_CHANGED); } // WidgetPDial* revp2 { revp3 = new WidgetPDial(85, 40, 30, 30, "I.del"); @@ -3161,7 +3161,7 @@ Fl_Group* SimpleEffUI::make_reverb_window() { revp3->labelcolor(FL_FOREGROUND_COLOR); revp3->maximum(127); revp3->callback((Fl_Callback*)cb_revp31); - revp3->align(FL_ALIGN_BOTTOM); + revp3->align(Fl_Align(FL_ALIGN_BOTTOM)); revp3->when(FL_WHEN_RELEASE); } // WidgetPDial* revp3 { revp9 = new WidgetPDial(120, 40, 30, 30, "Damp"); @@ -3177,7 +3177,7 @@ Fl_Group* SimpleEffUI::make_reverb_window() { revp9->maximum(127); revp9->step(1); revp9->callback((Fl_Callback*)cb_revp91); - revp9->align(FL_ALIGN_BOTTOM); + revp9->align(Fl_Align(FL_ALIGN_BOTTOM)); revp9->when(FL_WHEN_CHANGED); } // WidgetPDial* revp9 effreverbwindow->end(); @@ -3195,7 +3195,7 @@ Fl_Group* SimpleEffUI::make_echo_window() { effechowindow->labelsize(14); effechowindow->labelcolor(FL_FOREGROUND_COLOR); effechowindow->user_data((void*)(this)); - effechowindow->align(FL_ALIGN_TOP); + effechowindow->align(Fl_Align(FL_ALIGN_TOP)); effechowindow->when(FL_WHEN_RELEASE); { echop = new Fl_Choice(11, 15, 95, 15, "Preset"); echop->down_box(FL_BORDER_BOX); @@ -3205,9 +3205,9 @@ Fl_Group* SimpleEffUI::make_echo_window() { echop->labelsize(10); echop->textfont(1); echop->textsize(10); - echop->textcolor(7); + echop->textcolor(FL_BACKGROUND2_COLOR); echop->callback((Fl_Callback*)cb_echop7); - echop->align(FL_ALIGN_TOP_LEFT); + echop->align(Fl_Align(FL_ALIGN_TOP_LEFT)); echop->menu(menu_echop1); } // Fl_Choice* echop { Fl_Text_Display* o = new Fl_Text_Display(145, 10, 10, 20, "Echo"); @@ -3215,7 +3215,7 @@ Fl_Group* SimpleEffUI::make_echo_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { echop0 = new WidgetPDial(10, 40, 30, 30, "Vol"); echop0->tooltip("Effect Volume"); @@ -3228,7 +3228,7 @@ Fl_Group* SimpleEffUI::make_echo_window() { echop0->labelcolor(FL_FOREGROUND_COLOR); echop0->maximum(127); echop0->callback((Fl_Callback*)cb_echop01); - echop0->align(FL_ALIGN_BOTTOM); + echop0->align(Fl_Align(FL_ALIGN_BOTTOM)); echop0->when(FL_WHEN_CHANGED); } // WidgetPDial* echop0 { echop2 = new WidgetPDial(45, 40, 30, 30, "Delay"); @@ -3241,7 +3241,7 @@ Fl_Group* SimpleEffUI::make_echo_window() { echop2->labelcolor(FL_FOREGROUND_COLOR); echop2->maximum(127); echop2->callback((Fl_Callback*)cb_echop21); - echop2->align(FL_ALIGN_BOTTOM); + echop2->align(Fl_Align(FL_ALIGN_BOTTOM)); echop2->when(FL_WHEN_RELEASE); } // WidgetPDial* echop2 { echop5 = new WidgetPDial(80, 40, 30, 30, "Fb."); @@ -3255,7 +3255,7 @@ Fl_Group* SimpleEffUI::make_echo_window() { echop5->labelcolor(FL_FOREGROUND_COLOR); echop5->maximum(127); echop5->callback((Fl_Callback*)cb_echop51); - echop5->align(FL_ALIGN_BOTTOM); + echop5->align(Fl_Align(FL_ALIGN_BOTTOM)); echop5->when(FL_WHEN_CHANGED); } // WidgetPDial* echop5 effechowindow->end(); @@ -3273,7 +3273,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { effchoruswindow->labelsize(14); effchoruswindow->labelcolor(FL_FOREGROUND_COLOR); effchoruswindow->user_data((void*)(this)); - effchoruswindow->align(FL_ALIGN_TOP); + effchoruswindow->align(Fl_Align(FL_ALIGN_TOP)); effchoruswindow->when(FL_WHEN_RELEASE); { chorusp = new Fl_Choice(10, 15, 90, 15, "Preset"); chorusp->down_box(FL_BORDER_BOX); @@ -3283,9 +3283,9 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp->labelsize(10); chorusp->textfont(1); chorusp->textsize(10); - chorusp->textcolor(7); + chorusp->textcolor(FL_BACKGROUND2_COLOR); chorusp->callback((Fl_Callback*)cb_choruspa); - chorusp->align(FL_ALIGN_TOP_LEFT); + chorusp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); chorusp->menu(menu_chorusp1); } // Fl_Choice* chorusp { Fl_Text_Display* o = new Fl_Text_Display(120, 10, 10, 20, "Chorus"); @@ -3293,7 +3293,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { chorusp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); chorusp0->tooltip("Effect Volume"); @@ -3306,7 +3306,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp0->labelcolor(FL_FOREGROUND_COLOR); chorusp0->maximum(127); chorusp0->callback((Fl_Callback*)cb_chorusp01); - chorusp0->align(FL_ALIGN_BOTTOM); + chorusp0->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp0->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp0 { chorusp2 = new WidgetPDial(45, 40, 30, 30, "Freq"); @@ -3320,7 +3320,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp2->labelcolor(FL_FOREGROUND_COLOR); chorusp2->maximum(127); chorusp2->callback((Fl_Callback*)cb_chorusp21); - chorusp2->align(FL_ALIGN_BOTTOM); + chorusp2->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp2->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp2 { chorusp6 = new WidgetPDial(80, 40, 30, 30, "Dpth"); @@ -3334,7 +3334,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp6->labelcolor(FL_FOREGROUND_COLOR); chorusp6->maximum(127); chorusp6->callback((Fl_Callback*)cb_chorusp61); - chorusp6->align(FL_ALIGN_BOTTOM); + chorusp6->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp6->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp6 { chorusp7 = new WidgetPDial(115, 40, 30, 30, "Delay"); @@ -3347,7 +3347,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp7->labelcolor(FL_FOREGROUND_COLOR); chorusp7->maximum(127); chorusp7->callback((Fl_Callback*)cb_chorusp71); - chorusp7->align(FL_ALIGN_BOTTOM); + chorusp7->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp7->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp7 { chorusp8 = new WidgetPDial(150, 40, 30, 30, "Fb"); @@ -3361,7 +3361,7 @@ Fl_Group* SimpleEffUI::make_chorus_window() { chorusp8->labelcolor(FL_FOREGROUND_COLOR); chorusp8->maximum(127); chorusp8->callback((Fl_Callback*)cb_chorusp81); - chorusp8->align(FL_ALIGN_BOTTOM); + chorusp8->align(Fl_Align(FL_ALIGN_BOTTOM)); chorusp8->when(FL_WHEN_CHANGED); } // WidgetPDial* chorusp8 { Fl_Check_Button* o = new Fl_Check_Button(120, 10, 55, 20, "Flange"); @@ -3390,7 +3390,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { effphaserwindow->labelsize(14); effphaserwindow->labelcolor(FL_FOREGROUND_COLOR); effphaserwindow->user_data((void*)(this)); - effphaserwindow->align(FL_ALIGN_TOP); + effphaserwindow->align(Fl_Align(FL_ALIGN_TOP)); effphaserwindow->when(FL_WHEN_RELEASE); { phaserp = new Fl_Choice(10, 15, 90, 15, "Preset"); phaserp->down_box(FL_BORDER_BOX); @@ -3400,9 +3400,9 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp->labelsize(10); phaserp->textfont(1); phaserp->textsize(10); - phaserp->textcolor(7); + phaserp->textcolor(FL_BACKGROUND2_COLOR); phaserp->callback((Fl_Callback*)cb_phaserpa); - phaserp->align(FL_ALIGN_TOP_LEFT); + phaserp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); phaserp->menu(menu_phaserp1); } // Fl_Choice* phaserp { Fl_Text_Display* o = new Fl_Text_Display(125, 10, 10, 20, "Phaser"); @@ -3410,7 +3410,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { phaserp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); phaserp0->tooltip("Effect Volume"); @@ -3423,7 +3423,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp0->labelcolor(FL_FOREGROUND_COLOR); phaserp0->maximum(127); phaserp0->callback((Fl_Callback*)cb_phaserp01); - phaserp0->align(FL_ALIGN_BOTTOM); + phaserp0->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp0->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp0 { phaserp2 = new WidgetPDial(45, 40, 30, 30, "Freq"); @@ -3437,7 +3437,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp2->labelcolor(FL_FOREGROUND_COLOR); phaserp2->maximum(127); phaserp2->callback((Fl_Callback*)cb_phaserp21); - phaserp2->align(FL_ALIGN_BOTTOM); + phaserp2->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp2->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp2 { phaserp5 = new WidgetPDial(80, 40, 30, 30, "St.df"); @@ -3451,7 +3451,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp5->labelcolor(FL_FOREGROUND_COLOR); phaserp5->maximum(127); phaserp5->callback((Fl_Callback*)cb_phaserp51); - phaserp5->align(FL_ALIGN_BOTTOM); + phaserp5->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp5->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp5 { phaserp6 = new WidgetPDial(115, 40, 30, 30, "Dpth"); @@ -3465,7 +3465,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp6->labelcolor(FL_FOREGROUND_COLOR); phaserp6->maximum(127); phaserp6->callback((Fl_Callback*)cb_phaserp61); - phaserp6->align(FL_ALIGN_BOTTOM); + phaserp6->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp6->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp6 { phaserp7 = new WidgetPDial(150, 40, 30, 30, "Fb"); @@ -3479,7 +3479,7 @@ Fl_Group* SimpleEffUI::make_phaser_window() { phaserp7->labelcolor(FL_FOREGROUND_COLOR); phaserp7->maximum(127); phaserp7->callback((Fl_Callback*)cb_phaserp71); - phaserp7->align(FL_ALIGN_BOTTOM); + phaserp7->align(Fl_Align(FL_ALIGN_BOTTOM)); phaserp7->when(FL_WHEN_CHANGED); } // WidgetPDial* phaserp7 { Fl_Counter* o = phaserp8 = new Fl_Counter(185, 55, 35, 15, "Stages"); @@ -3507,7 +3507,7 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { effalienwahwindow->labelsize(14); effalienwahwindow->labelcolor(FL_FOREGROUND_COLOR); effalienwahwindow->user_data((void*)(this)); - effalienwahwindow->align(FL_ALIGN_TOP); + effalienwahwindow->align(Fl_Align(FL_ALIGN_TOP)); effalienwahwindow->when(FL_WHEN_RELEASE); { awp = new Fl_Choice(10, 15, 90, 15, "Preset"); awp->down_box(FL_BORDER_BOX); @@ -3517,9 +3517,9 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { awp->labelsize(10); awp->textfont(1); awp->textsize(10); - awp->textcolor(7); + awp->textcolor(FL_BACKGROUND2_COLOR); awp->callback((Fl_Callback*)cb_awpa); - awp->align(FL_ALIGN_TOP_LEFT); + awp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); awp->menu(menu_awp1); } // Fl_Choice* awp { Fl_Text_Display* o = new Fl_Text_Display(100, 10, 10, 20, "AlienWah"); @@ -3527,7 +3527,7 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { awp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); awp0->tooltip("Effect Volume"); @@ -3540,7 +3540,7 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { awp0->labelcolor(FL_FOREGROUND_COLOR); awp0->maximum(127); awp0->callback((Fl_Callback*)cb_awp01); - awp0->align(FL_ALIGN_BOTTOM); + awp0->align(Fl_Align(FL_ALIGN_BOTTOM)); awp0->when(FL_WHEN_CHANGED); } // WidgetPDial* awp0 { awp2 = new WidgetPDial(45, 40, 30, 30, "Freq"); @@ -3554,7 +3554,7 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { awp2->labelcolor(FL_FOREGROUND_COLOR); awp2->maximum(127); awp2->callback((Fl_Callback*)cb_awp21); - awp2->align(FL_ALIGN_BOTTOM); + awp2->align(Fl_Align(FL_ALIGN_BOTTOM)); awp2->when(FL_WHEN_CHANGED); } // WidgetPDial* awp2 { awp6 = new WidgetPDial(85, 40, 30, 30, "Dpth"); @@ -3568,7 +3568,7 @@ Fl_Group* SimpleEffUI::make_alienwah_window() { awp6->labelcolor(FL_FOREGROUND_COLOR); awp6->maximum(127); awp6->callback((Fl_Callback*)cb_awp61); - awp6->align(FL_ALIGN_BOTTOM); + awp6->align(Fl_Align(FL_ALIGN_BOTTOM)); awp6->when(FL_WHEN_CHANGED); } // WidgetPDial* awp6 { Fl_Counter* o = awp8 = new Fl_Counter(125, 55, 35, 15, "Delay"); @@ -3596,7 +3596,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { effdistorsionwindow->labelsize(14); effdistorsionwindow->labelcolor(FL_FOREGROUND_COLOR); effdistorsionwindow->user_data((void*)(this)); - effdistorsionwindow->align(FL_ALIGN_TOP); + effdistorsionwindow->align(Fl_Align(FL_ALIGN_TOP)); effdistorsionwindow->when(FL_WHEN_RELEASE); { distp = new Fl_Choice(11, 15, 95, 15, "Preset"); distp->down_box(FL_BORDER_BOX); @@ -3606,9 +3606,9 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp->labelsize(10); distp->textfont(1); distp->textsize(10); - distp->textcolor(7); + distp->textcolor(FL_BACKGROUND2_COLOR); distp->callback((Fl_Callback*)cb_distpa); - distp->align(FL_ALIGN_TOP_LEFT); + distp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); distp->menu(menu_distp1); } // Fl_Choice* distp { Fl_Text_Display* o = new Fl_Text_Display(110, 10, 10, 20, "Distortion"); @@ -3616,7 +3616,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(16); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { distp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); distp0->tooltip("Effect Volume"); @@ -3629,7 +3629,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp0->labelcolor(FL_FOREGROUND_COLOR); distp0->maximum(127); distp0->callback((Fl_Callback*)cb_distp01); - distp0->align(FL_ALIGN_BOTTOM); + distp0->align(Fl_Align(FL_ALIGN_BOTTOM)); distp0->when(FL_WHEN_CHANGED); } // WidgetPDial* distp0 { distp3 = new WidgetPDial(45, 40, 30, 30, "Drive"); @@ -3643,7 +3643,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp3->labelcolor(FL_FOREGROUND_COLOR); distp3->maximum(127); distp3->callback((Fl_Callback*)cb_distp31); - distp3->align(FL_ALIGN_BOTTOM); + distp3->align(Fl_Align(FL_ALIGN_BOTTOM)); distp3->when(FL_WHEN_RELEASE); } // WidgetPDial* distp3 { distp4 = new WidgetPDial(80, 40, 30, 30, "Level"); @@ -3657,7 +3657,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp4->labelcolor(FL_FOREGROUND_COLOR); distp4->maximum(127); distp4->callback((Fl_Callback*)cb_distp41); - distp4->align(FL_ALIGN_BOTTOM); + distp4->align(Fl_Align(FL_ALIGN_BOTTOM)); distp4->when(FL_WHEN_CHANGED); } // WidgetPDial* distp4 { distp7 = new WidgetPDial(190, 40, 30, 30, "LPF"); @@ -3671,7 +3671,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp7->labelcolor(FL_FOREGROUND_COLOR); distp7->maximum(127); distp7->callback((Fl_Callback*)cb_distp71); - distp7->align(FL_ALIGN_BOTTOM); + distp7->align(Fl_Align(FL_ALIGN_BOTTOM)); distp7->when(FL_WHEN_CHANGED); } // WidgetPDial* distp7 { distp5 = new Fl_Choice(120, 50, 60, 20, "Type"); @@ -3681,7 +3681,7 @@ Fl_Group* SimpleEffUI::make_distorsion_window() { distp5->labelsize(11); distp5->textsize(10); distp5->callback((Fl_Callback*)cb_distp51); - distp5->align(FL_ALIGN_BOTTOM); + distp5->align(Fl_Align(FL_ALIGN_BOTTOM)); distp5->menu(menu_distp51); } // Fl_Choice* distp5 effdistorsionwindow->end(); @@ -3699,14 +3699,14 @@ Fl_Group* SimpleEffUI::make_eq_window() { effeqwindow->labelsize(14); effeqwindow->labelcolor(FL_FOREGROUND_COLOR); effeqwindow->user_data((void*)(this)); - effeqwindow->align(FL_ALIGN_TOP); + effeqwindow->align(Fl_Align(FL_ALIGN_TOP)); effeqwindow->when(FL_WHEN_RELEASE); { Fl_Text_Display* o = new Fl_Text_Display(170, 5, 15, 25, "EQ"); o->box(FL_NO_BOX); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { Fl_Counter* o = bandcounter = new Fl_Counter(85, 15, 45, 15, "Band"); bandcounter->tooltip("Band no."); @@ -3719,7 +3719,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { bandcounter->textfont(1); bandcounter->textsize(11); bandcounter->callback((Fl_Callback*)cb_bandcounter1); - bandcounter->align(FL_ALIGN_TOP); + bandcounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(0,MAX_EQ_BANDS-1); } // Fl_Counter* bandcounter { Fl_Group* o = bandgroup = new Fl_Group(5, 5, 75, 85); @@ -3734,7 +3734,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { freqdial->labelcolor(FL_FOREGROUND_COLOR); freqdial->maximum(127); freqdial->callback((Fl_Callback*)cb_freqdial1); - freqdial->align(FL_ALIGN_BOTTOM); + freqdial->align(Fl_Align(FL_ALIGN_BOTTOM)); freqdial->when(3); } // WidgetPDial* freqdial { gaindial = new WidgetPDial(45, 10, 25, 25, "Gain"); @@ -3748,7 +3748,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { gaindial->maximum(127); gaindial->step(1); gaindial->callback((Fl_Callback*)cb_gaindial1); - gaindial->align(FL_ALIGN_BOTTOM); + gaindial->align(Fl_Align(FL_ALIGN_BOTTOM)); gaindial->when(3); } // WidgetPDial* gaindial { qdial = new WidgetPDial(10, 50, 25, 25, "Q"); @@ -3762,7 +3762,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { qdial->labelcolor(FL_FOREGROUND_COLOR); qdial->maximum(127); qdial->callback((Fl_Callback*)cb_qdial1); - qdial->align(FL_ALIGN_BOTTOM); + qdial->align(Fl_Align(FL_ALIGN_BOTTOM)); qdial->when(3); } // WidgetPDial* qdial { Fl_Counter* o = stagescounter = new Fl_Counter(40, 55, 30, 15, "Stages"); @@ -3788,7 +3788,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { typechoice->labelsize(10); typechoice->textsize(10); typechoice->callback((Fl_Callback*)cb_typechoice1); - typechoice->align(FL_ALIGN_TOP); + typechoice->align(Fl_Align(FL_ALIGN_TOP)); typechoice->when(FL_WHEN_RELEASE_ALWAYS); typechoice->menu(menu_typechoice1); } // Fl_Choice* typechoice @@ -3800,7 +3800,7 @@ Fl_Group* SimpleEffUI::make_eq_window() { eqgraph->labelfont(0); eqgraph->labelsize(14); eqgraph->labelcolor(FL_FOREGROUND_COLOR); - eqgraph->align(FL_ALIGN_CENTER); + eqgraph->align(Fl_Align(FL_ALIGN_CENTER)); eqgraph->when(FL_WHEN_RELEASE); o->init(eff); } // EQGraph* eqgraph @@ -3819,7 +3819,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { effdynamicfilterwindow->labelsize(14); effdynamicfilterwindow->labelcolor(FL_FOREGROUND_COLOR); effdynamicfilterwindow->user_data((void*)(this)); - effdynamicfilterwindow->align(FL_ALIGN_TOP); + effdynamicfilterwindow->align(Fl_Align(FL_ALIGN_TOP)); effdynamicfilterwindow->when(FL_WHEN_RELEASE); { dfp = new Fl_Choice(10, 15, 90, 15, "Preset"); dfp->down_box(FL_BORDER_BOX); @@ -3829,9 +3829,9 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp->labelsize(10); dfp->textfont(1); dfp->textsize(10); - dfp->textcolor(7); + dfp->textcolor(FL_BACKGROUND2_COLOR); dfp->callback((Fl_Callback*)cb_dfpa); - dfp->align(FL_ALIGN_TOP_LEFT); + dfp->align(Fl_Align(FL_ALIGN_TOP_LEFT)); dfp->menu(menu_dfp1); } // Fl_Choice* dfp { Fl_Text_Display* o = new Fl_Text_Display(100, 10, 10, 20, "DynFilter"); @@ -3839,7 +3839,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Text_Display* o { dfp0 = new WidgetPDial(10, 40, 30, 30, "Vol"); dfp0->tooltip("Effect Volume"); @@ -3852,7 +3852,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp0->labelcolor(FL_FOREGROUND_COLOR); dfp0->maximum(127); dfp0->callback((Fl_Callback*)cb_dfp01); - dfp0->align(FL_ALIGN_BOTTOM); + dfp0->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp0->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp0 { dfp2 = new WidgetPDial(45, 40, 30, 30, "Freq"); @@ -3866,7 +3866,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp2->labelcolor(FL_FOREGROUND_COLOR); dfp2->maximum(127); dfp2->callback((Fl_Callback*)cb_dfp21); - dfp2->align(FL_ALIGN_BOTTOM); + dfp2->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp2->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp2 { dfp6 = new WidgetPDial(80, 40, 30, 30, "LfoD"); @@ -3880,7 +3880,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp6->labelcolor(FL_FOREGROUND_COLOR); dfp6->maximum(127); dfp6->callback((Fl_Callback*)cb_dfp61); - dfp6->align(FL_ALIGN_BOTTOM); + dfp6->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp6->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp6 { Fl_Group* o = new Fl_Group(115, 40, 65, 45); @@ -3897,7 +3897,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp7->labelcolor(FL_FOREGROUND_COLOR); dfp7->maximum(127); dfp7->callback((Fl_Callback*)cb_dfp71); - dfp7->align(FL_ALIGN_BOTTOM); + dfp7->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp7->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp7 { dfp9 = new WidgetPDial(150, 45, 25, 25, "A.M"); @@ -3911,7 +3911,7 @@ Fl_Group* SimpleEffUI::make_dynamicfilter_window() { dfp9->labelcolor(FL_FOREGROUND_COLOR); dfp9->maximum(127); dfp9->callback((Fl_Callback*)cb_dfp91); - dfp9->align(FL_ALIGN_BOTTOM); + dfp9->align(Fl_Align(FL_ALIGN_BOTTOM)); dfp9->when(FL_WHEN_CHANGED); } // WidgetPDial* dfp9 o->end(); diff --git a/plugins/zynaddsubfx/src/UI/EffUI.h b/plugins/zynaddsubfx/src/UI/EffUI.h index 3f6edfb55..3fddc2920 100644 --- a/plugins/zynaddsubfx/src/UI/EffUI.h +++ b/plugins/zynaddsubfx/src/UI/EffUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef EffUI_h #define EffUI_h diff --git a/plugins/zynaddsubfx/src/UI/EnvelopeUI.cc b/plugins/zynaddsubfx/src/UI/EnvelopeUI.cc index e7fa3516e..120e743ec 100644 --- a/plugins/zynaddsubfx/src/UI/EnvelopeUI.cc +++ b/plugins/zynaddsubfx/src/UI/EnvelopeUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "EnvelopeUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -620,7 +620,7 @@ Fl_Double_Window* EnvelopeUI::make_freemode_edit_window() { freeedit->labelfont(0); freeedit->labelsize(14); freeedit->labelcolor(FL_FOREGROUND_COLOR); - freeedit->align(FL_ALIGN_CENTER); + freeedit->align(Fl_Align(FL_ALIGN_CENTER)); freeedit->when(FL_WHEN_RELEASE); o->init(env); } // EnvelopeFreeEdit* freeedit @@ -659,7 +659,7 @@ Fl_Double_Window* EnvelopeUI::make_freemode_edit_window() { envstretchdial->maximum(127); envstretchdial->step(1); envstretchdial->callback((Fl_Callback*)cb_envstretchdial); - envstretchdial->align(FL_ALIGN_LEFT); + envstretchdial->align(Fl_Align(FL_ALIGN_LEFT)); envstretchdial->when(FL_WHEN_CHANGED); o->value(env->Penvstretch); if (env->Pfreemode==0) o->hide(); @@ -684,7 +684,7 @@ Fl_Double_Window* EnvelopeUI::make_freemode_edit_window() { sustaincounter->maximum(127); sustaincounter->step(1); sustaincounter->callback((Fl_Callback*)cb_sustaincounter); - sustaincounter->align(FL_ALIGN_LEFT); + sustaincounter->align(Fl_Align(FL_ALIGN_LEFT)); o->value(env->Penvsustain); if (env->Pfreemode==0) o->hide(); o->maximum(env->Penvpoints-2); @@ -720,14 +720,14 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { envADSR->labelsize(14); envADSR->labelcolor(FL_FOREGROUND_COLOR); envADSR->user_data((void*)(this)); - envADSR->align(FL_ALIGN_TOP); + envADSR->align(Fl_Align(FL_ALIGN_TOP)); envADSR->when(FL_WHEN_RELEASE); { Fl_Group* o = new Fl_Group(0, 0, 205, 70, "Amplitude Envelope"); o->box(FL_PLASTIC_UP_BOX); o->color(FL_CYAN); o->labeltype(FL_ENGRAVED_LABEL); o->labelsize(10); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { WidgetPDial* o = e1adt = new WidgetPDial(5, 20, 30, 30, "A.dt"); e1adt->tooltip("Attack time"); e1adt->box(FL_ROUND_UP_BOX); @@ -740,7 +740,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1adt->maximum(127); e1adt->step(1); e1adt->callback((Fl_Callback*)cb_e1adt); - e1adt->align(FL_ALIGN_BOTTOM); + e1adt->align(Fl_Align(FL_ALIGN_BOTTOM)); e1adt->when(FL_WHEN_CHANGED); o->value(env->PA_dt); } // WidgetPDial* e1adt @@ -756,7 +756,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1ddt->maximum(127); e1ddt->step(1); e1ddt->callback((Fl_Callback*)cb_e1ddt); - e1ddt->align(FL_ALIGN_BOTTOM); + e1ddt->align(Fl_Align(FL_ALIGN_BOTTOM)); e1ddt->when(FL_WHEN_CHANGED); o->value(env->PD_dt); } // WidgetPDial* e1ddt @@ -772,7 +772,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1rdt->maximum(127); e1rdt->step(1); e1rdt->callback((Fl_Callback*)cb_e1rdt); - e1rdt->align(FL_ALIGN_BOTTOM); + e1rdt->align(Fl_Align(FL_ALIGN_BOTTOM)); e1rdt->when(FL_WHEN_CHANGED); o->value(env->PR_dt); } // WidgetPDial* e1rdt @@ -788,7 +788,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1sval->maximum(127); e1sval->step(1); e1sval->callback((Fl_Callback*)cb_e1sval); - e1sval->align(FL_ALIGN_BOTTOM); + e1sval->align(Fl_Align(FL_ALIGN_BOTTOM)); e1sval->when(FL_WHEN_CHANGED); o->value(env->PS_val); } // WidgetPDial* e1sval @@ -797,7 +797,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1forcedrelease->down_box(FL_DOWN_BOX); e1forcedrelease->labelsize(10); e1forcedrelease->callback((Fl_Callback*)cb_e1forcedrelease); - e1forcedrelease->align(FL_ALIGN_BOTTOM_LEFT); + e1forcedrelease->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->value(env->Pforcedrelease); } // Fl_Check_Button* e1forcedrelease { WidgetPDial* o = e1envstretch = new WidgetPDial(145, 25, 25, 25, "Stretch"); @@ -812,7 +812,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1envstretch->maximum(127); e1envstretch->step(1); e1envstretch->callback((Fl_Callback*)cb_e1envstretch); - e1envstretch->align(FL_ALIGN_BOTTOM); + e1envstretch->align(Fl_Align(FL_ALIGN_BOTTOM)); e1envstretch->when(FL_WHEN_CHANGED); o->value(env->Penvstretch); } // WidgetPDial* e1envstretch @@ -828,7 +828,7 @@ Fl_Group* EnvelopeUI::make_ADSR_window() { e1linearenvelope->down_box(FL_DOWN_BOX); e1linearenvelope->labelsize(10); e1linearenvelope->callback((Fl_Callback*)cb_e1linearenvelope); - e1linearenvelope->align(FL_ALIGN_LEFT); + e1linearenvelope->align(Fl_Align(FL_ALIGN_LEFT)); o->value(env->Plinearenvelope); } // Fl_Check_Button* e1linearenvelope { Fl_Button* o = new Fl_Button(150, 5, 15, 15, "C"); @@ -864,14 +864,14 @@ Fl_Group* EnvelopeUI::make_ASR_window() { envASR->labelsize(14); envASR->labelcolor(FL_FOREGROUND_COLOR); envASR->user_data((void*)(this)); - envASR->align(FL_ALIGN_TOP); + envASR->align(Fl_Align(FL_ALIGN_TOP)); envASR->when(FL_WHEN_RELEASE); { Fl_Group* o = new Fl_Group(0, 0, 210, 70, "Frequency Envelope"); o->box(FL_PLASTIC_UP_BOX); o->color(FL_CYAN); o->labeltype(FL_ENGRAVED_LABEL); o->labelsize(10); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { WidgetPDial* o = e2aval = new WidgetPDial(5, 20, 30, 30, "A.val"); e2aval->tooltip("Starting value"); e2aval->box(FL_ROUND_UP_BOX); @@ -884,7 +884,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2aval->maximum(127); e2aval->step(1); e2aval->callback((Fl_Callback*)cb_e2aval); - e2aval->align(FL_ALIGN_BOTTOM); + e2aval->align(Fl_Align(FL_ALIGN_BOTTOM)); e2aval->when(FL_WHEN_CHANGED); o->value(env->PA_val); } // WidgetPDial* e2aval @@ -900,7 +900,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2adt->maximum(127); e2adt->step(1); e2adt->callback((Fl_Callback*)cb_e2adt); - e2adt->align(FL_ALIGN_BOTTOM); + e2adt->align(Fl_Align(FL_ALIGN_BOTTOM)); e2adt->when(FL_WHEN_CHANGED); o->value(env->PA_dt); } // WidgetPDial* e2adt @@ -916,7 +916,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2rval->maximum(127); e2rval->step(1); e2rval->callback((Fl_Callback*)cb_e2rval); - e2rval->align(FL_ALIGN_BOTTOM); + e2rval->align(Fl_Align(FL_ALIGN_BOTTOM)); e2rval->when(FL_WHEN_CHANGED); o->value(env->PR_val); } // WidgetPDial* e2rval @@ -932,7 +932,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2rdt->maximum(127); e2rdt->step(1); e2rdt->callback((Fl_Callback*)cb_e2rdt); - e2rdt->align(FL_ALIGN_BOTTOM); + e2rdt->align(Fl_Align(FL_ALIGN_BOTTOM)); e2rdt->when(FL_WHEN_CHANGED); o->value(env->PR_dt); } // WidgetPDial* e2rdt @@ -948,7 +948,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2envstretch->maximum(127); e2envstretch->step(1); e2envstretch->callback((Fl_Callback*)cb_e2envstretch); - e2envstretch->align(FL_ALIGN_BOTTOM); + e2envstretch->align(Fl_Align(FL_ALIGN_BOTTOM)); e2envstretch->when(FL_WHEN_CHANGED); o->value(env->Penvstretch); } // WidgetPDial* e2envstretch @@ -957,7 +957,7 @@ Fl_Group* EnvelopeUI::make_ASR_window() { e2forcedrelease->down_box(FL_DOWN_BOX); e2forcedrelease->labelsize(10); e2forcedrelease->callback((Fl_Callback*)cb_e2forcedrelease); - e2forcedrelease->align(FL_ALIGN_BOTTOM_LEFT); + e2forcedrelease->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->value(env->Pforcedrelease); } // Fl_Check_Button* e2forcedrelease { Fl_Button* o = new Fl_Button(155, 5, 15, 15, "C"); @@ -1000,14 +1000,14 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { envADSRfilter->labelsize(14); envADSRfilter->labelcolor(FL_FOREGROUND_COLOR); envADSRfilter->user_data((void*)(this)); - envADSRfilter->align(FL_ALIGN_TOP); + envADSRfilter->align(Fl_Align(FL_ALIGN_TOP)); envADSRfilter->when(FL_WHEN_RELEASE); { Fl_Group* o = new Fl_Group(0, 0, 275, 70, "Filter Envelope"); o->box(FL_PLASTIC_UP_BOX); o->color(FL_CYAN); o->labeltype(FL_ENGRAVED_LABEL); o->labelsize(10); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { WidgetPDial* o = e3aval = new WidgetPDial(5, 20, 30, 30, "A.val"); e3aval->tooltip("Starting value"); e3aval->box(FL_ROUND_UP_BOX); @@ -1020,7 +1020,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3aval->maximum(127); e3aval->step(1); e3aval->callback((Fl_Callback*)cb_e3aval); - e3aval->align(FL_ALIGN_BOTTOM); + e3aval->align(Fl_Align(FL_ALIGN_BOTTOM)); e3aval->when(FL_WHEN_CHANGED); o->value(env->PA_val); } // WidgetPDial* e3aval @@ -1036,7 +1036,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3adt->maximum(127); e3adt->step(1); e3adt->callback((Fl_Callback*)cb_e3adt); - e3adt->align(FL_ALIGN_BOTTOM); + e3adt->align(Fl_Align(FL_ALIGN_BOTTOM)); e3adt->when(FL_WHEN_CHANGED); o->value(env->PA_dt); } // WidgetPDial* e3adt @@ -1052,7 +1052,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3dval->maximum(127); e3dval->step(1); e3dval->callback((Fl_Callback*)cb_e3dval); - e3dval->align(FL_ALIGN_BOTTOM); + e3dval->align(Fl_Align(FL_ALIGN_BOTTOM)); e3dval->when(FL_WHEN_CHANGED); o->value(env->PD_val); } // WidgetPDial* e3dval @@ -1068,7 +1068,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3ddt->maximum(127); e3ddt->step(1); e3ddt->callback((Fl_Callback*)cb_e3ddt); - e3ddt->align(FL_ALIGN_BOTTOM); + e3ddt->align(Fl_Align(FL_ALIGN_BOTTOM)); e3ddt->when(FL_WHEN_CHANGED); o->value(env->PD_dt); } // WidgetPDial* e3ddt @@ -1084,7 +1084,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3rdt->maximum(127); e3rdt->step(1); e3rdt->callback((Fl_Callback*)cb_e3rdt); - e3rdt->align(FL_ALIGN_BOTTOM); + e3rdt->align(Fl_Align(FL_ALIGN_BOTTOM)); e3rdt->when(FL_WHEN_CHANGED); o->value(env->PR_dt); } // WidgetPDial* e3rdt @@ -1100,7 +1100,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3rval->maximum(127); e3rval->step(1); e3rval->callback((Fl_Callback*)cb_e3rval); - e3rval->align(FL_ALIGN_BOTTOM); + e3rval->align(Fl_Align(FL_ALIGN_BOTTOM)); e3rval->when(FL_WHEN_CHANGED); o->value(env->PR_val); } // WidgetPDial* e3rval @@ -1116,7 +1116,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3envstretch->maximum(127); e3envstretch->step(1); e3envstretch->callback((Fl_Callback*)cb_e3envstretch); - e3envstretch->align(FL_ALIGN_BOTTOM); + e3envstretch->align(Fl_Align(FL_ALIGN_BOTTOM)); e3envstretch->when(FL_WHEN_CHANGED); o->value(env->Penvstretch); } // WidgetPDial* e3envstretch @@ -1125,7 +1125,7 @@ Fl_Group* EnvelopeUI::make_ADSRfilter_window() { e3forcedrelease->down_box(FL_DOWN_BOX); e3forcedrelease->labelsize(10); e3forcedrelease->callback((Fl_Callback*)cb_e3forcedrelease); - e3forcedrelease->align(FL_ALIGN_BOTTOM_LEFT); + e3forcedrelease->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->value(env->Pforcedrelease); } // Fl_Check_Button* e3forcedrelease { Fl_Button* o = new Fl_Button(255, 5, 15, 15, "E"); @@ -1167,14 +1167,14 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { envASRbw->labelsize(14); envASRbw->labelcolor(FL_FOREGROUND_COLOR); envASRbw->user_data((void*)(this)); - envASRbw->align(FL_ALIGN_TOP); + envASRbw->align(Fl_Align(FL_ALIGN_TOP)); envASRbw->when(FL_WHEN_RELEASE); { Fl_Group* o = new Fl_Group(0, 0, 210, 70, "BandWidth Envelope"); o->box(FL_PLASTIC_UP_BOX); o->color(FL_CYAN); o->labeltype(FL_ENGRAVED_LABEL); o->labelsize(10); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { WidgetPDial* o = e4aval = new WidgetPDial(5, 20, 30, 30, "A.val"); e4aval->tooltip("Starting value"); e4aval->box(FL_ROUND_UP_BOX); @@ -1187,7 +1187,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4aval->maximum(127); e4aval->step(1); e4aval->callback((Fl_Callback*)cb_e4aval); - e4aval->align(FL_ALIGN_BOTTOM); + e4aval->align(Fl_Align(FL_ALIGN_BOTTOM)); e4aval->when(FL_WHEN_CHANGED); o->value(env->PA_val); } // WidgetPDial* e4aval @@ -1203,7 +1203,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4adt->maximum(127); e4adt->step(1); e4adt->callback((Fl_Callback*)cb_e4adt); - e4adt->align(FL_ALIGN_BOTTOM); + e4adt->align(Fl_Align(FL_ALIGN_BOTTOM)); e4adt->when(FL_WHEN_CHANGED); o->value(env->PA_dt); } // WidgetPDial* e4adt @@ -1219,7 +1219,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4rval->maximum(127); e4rval->step(1); e4rval->callback((Fl_Callback*)cb_e4rval); - e4rval->align(FL_ALIGN_BOTTOM); + e4rval->align(Fl_Align(FL_ALIGN_BOTTOM)); e4rval->when(FL_WHEN_CHANGED); o->value(env->PR_val); } // WidgetPDial* e4rval @@ -1235,7 +1235,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4rdt->maximum(127); e4rdt->step(1); e4rdt->callback((Fl_Callback*)cb_e4rdt); - e4rdt->align(FL_ALIGN_BOTTOM); + e4rdt->align(Fl_Align(FL_ALIGN_BOTTOM)); e4rdt->when(FL_WHEN_CHANGED); o->value(env->PR_dt); } // WidgetPDial* e4rdt @@ -1251,7 +1251,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4envstretch->maximum(127); e4envstretch->step(1); e4envstretch->callback((Fl_Callback*)cb_e4envstretch); - e4envstretch->align(FL_ALIGN_BOTTOM); + e4envstretch->align(Fl_Align(FL_ALIGN_BOTTOM)); e4envstretch->when(FL_WHEN_CHANGED); o->value(env->Penvstretch); } // WidgetPDial* e4envstretch @@ -1260,7 +1260,7 @@ Fl_Group* EnvelopeUI::make_ASRbw_window() { e4forcedrelease->down_box(FL_DOWN_BOX); e4forcedrelease->labelsize(10); e4forcedrelease->callback((Fl_Callback*)cb_e4forcedrelease); - e4forcedrelease->align(FL_ALIGN_BOTTOM_LEFT); + e4forcedrelease->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->value(env->Pforcedrelease); } // Fl_Check_Button* e4forcedrelease { Fl_Button* o = new Fl_Button(155, 5, 15, 15, "C"); @@ -1302,14 +1302,14 @@ Fl_Group* EnvelopeUI::make_free_window() { envfree->labelsize(14); envfree->labelcolor(FL_FOREGROUND_COLOR); envfree->user_data((void*)(this)); - envfree->align(FL_ALIGN_TOP); + envfree->align(Fl_Align(FL_ALIGN_TOP)); envfree->when(FL_WHEN_RELEASE); { envfreegroup = new Fl_Group(0, 0, 205, 70, "Amplitude Envelope"); envfreegroup->box(FL_PLASTIC_UP_BOX); envfreegroup->color(FL_CYAN); envfreegroup->labeltype(FL_ENGRAVED_LABEL); envfreegroup->labelsize(10); - envfreegroup->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + envfreegroup->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeFreeEdit* o = freeeditsmall = new EnvelopeFreeEdit(5, 20, 195, 45, "Envelope"); freeeditsmall->box(FL_FLAT_BOX); freeeditsmall->color(FL_FOREGROUND_COLOR); @@ -1319,7 +1319,7 @@ Fl_Group* EnvelopeUI::make_free_window() { freeeditsmall->labelsize(14); freeeditsmall->labelcolor(FL_FOREGROUND_COLOR); freeeditsmall->callback((Fl_Callback*)cb_freeeditsmall); - freeeditsmall->align(FL_ALIGN_CENTER); + freeeditsmall->align(Fl_Align(FL_ALIGN_CENTER)); freeeditsmall->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(freeeditsmall); o->init(env); diff --git a/plugins/zynaddsubfx/src/UI/EnvelopeUI.h b/plugins/zynaddsubfx/src/UI/EnvelopeUI.h index 670696091..0450433b3 100644 --- a/plugins/zynaddsubfx/src/UI/EnvelopeUI.h +++ b/plugins/zynaddsubfx/src/UI/EnvelopeUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef EnvelopeUI_h #define EnvelopeUI_h diff --git a/plugins/zynaddsubfx/src/UI/FilterUI.cc b/plugins/zynaddsubfx/src/UI/FilterUI.cc index 86c7ea57a..8218ac0ae 100644 --- a/plugins/zynaddsubfx/src/UI/FilterUI.cc +++ b/plugins/zynaddsubfx/src/UI/FilterUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "FilterUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -432,21 +432,21 @@ Fl_Group* FilterUI::make_window() { filterui->labelsize(14); filterui->labelcolor(FL_FOREGROUND_COLOR); filterui->user_data((void*)(this)); - filterui->align(FL_ALIGN_TOP); + filterui->align(Fl_Align(FL_ALIGN_TOP)); filterui->when(FL_WHEN_RELEASE); { filterparamswindow = new Fl_Group(0, 0, 275, 75, "Filter Parameters"); filterparamswindow->box(FL_PLASTIC_UP_BOX); filterparamswindow->color((Fl_Color)183); filterparamswindow->labeltype(FL_ENGRAVED_LABEL); filterparamswindow->labelsize(10); - filterparamswindow->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + filterparamswindow->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Choice* o = analogfiltertypechoice = new Fl_Choice(10, 50, 50, 15, "FilterType"); analogfiltertypechoice->tooltip("The Filter type"); analogfiltertypechoice->down_box(FL_BORDER_BOX); analogfiltertypechoice->labelsize(10); analogfiltertypechoice->textsize(10); analogfiltertypechoice->callback((Fl_Callback*)cb_analogfiltertypechoice); - analogfiltertypechoice->align(FL_ALIGN_TOP_LEFT); + analogfiltertypechoice->align(Fl_Align(FL_ALIGN_TOP_LEFT)); analogfiltertypechoice->menu(menu_analogfiltertypechoice); o->value(pars->Ptype); } // Fl_Choice* analogfiltertypechoice @@ -456,7 +456,7 @@ Fl_Group* FilterUI::make_window() { svfiltertypechoice->labelsize(10); svfiltertypechoice->textsize(10); svfiltertypechoice->callback((Fl_Callback*)cb_svfiltertypechoice); - svfiltertypechoice->align(FL_ALIGN_TOP_LEFT); + svfiltertypechoice->align(Fl_Align(FL_ALIGN_TOP_LEFT)); svfiltertypechoice->menu(menu_svfiltertypechoice); o->value(pars->Ptype); } // Fl_Choice* svfiltertypechoice @@ -466,7 +466,7 @@ Fl_Group* FilterUI::make_window() { filtertype->labelsize(10); filtertype->textsize(10); filtertype->callback((Fl_Callback*)cb_filtertype); - filtertype->align(FL_ALIGN_TOP_LEFT); + filtertype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); filtertype->menu(menu_filtertype); o->value(pars->Pcategory); } // Fl_Choice* filtertype @@ -482,7 +482,7 @@ Fl_Group* FilterUI::make_window() { cfreqdial->maximum(127); cfreqdial->step(1); cfreqdial->callback((Fl_Callback*)cb_cfreqdial); - cfreqdial->align(FL_ALIGN_BOTTOM); + cfreqdial->align(Fl_Align(FL_ALIGN_BOTTOM)); cfreqdial->when(FL_WHEN_CHANGED); o->value(pars->Pfreq); } // WidgetPDial* cfreqdial @@ -498,7 +498,7 @@ Fl_Group* FilterUI::make_window() { qdial->maximum(127); qdial->step(1); qdial->callback((Fl_Callback*)cb_qdial); - qdial->align(FL_ALIGN_BOTTOM); + qdial->align(Fl_Align(FL_ALIGN_BOTTOM)); qdial->when(FL_WHEN_CHANGED); o->value(pars->Pq); } // WidgetPDial* qdial @@ -515,7 +515,7 @@ ve)"); freqtrdial->maximum(127); freqtrdial->step(1); freqtrdial->callback((Fl_Callback*)cb_freqtrdial); - freqtrdial->align(FL_ALIGN_BOTTOM); + freqtrdial->align(Fl_Align(FL_ALIGN_BOTTOM)); freqtrdial->when(FL_WHEN_CHANGED); o->value(pars->Pfreqtrack); } // WidgetPDial* freqtrdial @@ -531,7 +531,7 @@ ve)"); vsnsadial->maximum(127); vsnsadial->step(1); vsnsadial->callback((Fl_Callback*)cb_vsnsadial); - vsnsadial->align(FL_ALIGN_BOTTOM); + vsnsadial->align(Fl_Align(FL_ALIGN_BOTTOM)); vsnsadial->when(FL_WHEN_CHANGED); } // WidgetPDial* vsnsadial { vsnsdial = new WidgetPDial(180, 25, 30, 30, "V.Sns."); @@ -546,7 +546,7 @@ ve)"); vsnsdial->maximum(127); vsnsdial->step(1); vsnsdial->callback((Fl_Callback*)cb_vsnsdial); - vsnsdial->align(FL_ALIGN_BOTTOM); + vsnsdial->align(Fl_Align(FL_ALIGN_BOTTOM)); vsnsdial->when(FL_WHEN_CHANGED); } // WidgetPDial* vsnsdial { WidgetPDial* o = gaindial = new WidgetPDial(250, 35, 20, 20, "gain"); @@ -561,7 +561,7 @@ ve)"); gaindial->maximum(127); gaindial->step(1); gaindial->callback((Fl_Callback*)cb_gaindial); - gaindial->align(FL_ALIGN_BOTTOM); + gaindial->align(Fl_Align(FL_ALIGN_BOTTOM)); gaindial->when(FL_WHEN_CHANGED); o->value(pars->Pgain); } // WidgetPDial* gaindial @@ -619,7 +619,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { o->step(1); o->textsize(10); o->callback((Fl_Callback*)cb_Formant); - o->align(FL_ALIGN_LEFT); + o->align(Fl_Align(FL_ALIGN_LEFT)); o->bounds(0,FF_MAX_FORMANTS-1); o->value(nformant); } // Fl_Counter* o @@ -633,7 +633,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Vowel); - o->align(FL_ALIGN_LEFT); + o->align(Fl_Align(FL_ALIGN_LEFT)); o->bounds(0,FF_MAX_VOWELS-1); o->value(nvowel); } // Fl_Counter* o @@ -651,7 +651,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { formant_freq_dial->maximum(127); formant_freq_dial->step(1); formant_freq_dial->callback((Fl_Callback*)cb_formant_freq_dial); - formant_freq_dial->align(FL_ALIGN_BOTTOM); + formant_freq_dial->align(Fl_Align(FL_ALIGN_BOTTOM)); formant_freq_dial->when(FL_WHEN_CHANGED); } // WidgetPDial* formant_freq_dial { formant_q_dial = new WidgetPDial(525, 115, 24, 25, "Q"); @@ -666,7 +666,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { formant_q_dial->maximum(127); formant_q_dial->step(1); formant_q_dial->callback((Fl_Callback*)cb_formant_q_dial); - formant_q_dial->align(FL_ALIGN_BOTTOM); + formant_q_dial->align(Fl_Align(FL_ALIGN_BOTTOM)); formant_q_dial->when(FL_WHEN_CHANGED); } // WidgetPDial* formant_q_dial { formant_amp_dial = new WidgetPDial(555, 115, 24, 25, "amp"); @@ -681,7 +681,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { formant_amp_dial->maximum(127); formant_amp_dial->step(1); formant_amp_dial->callback((Fl_Callback*)cb_formant_amp_dial); - formant_amp_dial->align(FL_ALIGN_BOTTOM); + formant_amp_dial->align(Fl_Align(FL_ALIGN_BOTTOM)); formant_amp_dial->when(FL_WHEN_CHANGED); } // WidgetPDial* formant_amp_dial formantparsgroup->end(); @@ -700,7 +700,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Seq); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->bounds(1,FF_MAX_SEQUENCE-1); o->value(pars->Psequencesize); } // Fl_Counter* o @@ -714,7 +714,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { o->step(1); o->textsize(10); o->callback((Fl_Callback*)cb_S); - o->align(FL_ALIGN_TOP_RIGHT); + o->align(Fl_Align(FL_ALIGN_TOP_RIGHT)); o->bounds(0,FF_MAX_SEQUENCE-2); o->value(nseqpos); } // Fl_Counter* o @@ -726,7 +726,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { vowel_counter->step(1); vowel_counter->textsize(10); vowel_counter->callback((Fl_Callback*)cb_vowel_counter); - vowel_counter->align(FL_ALIGN_TOP); + vowel_counter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(0,FF_MAX_VOWELS-1); } // Fl_Counter* vowel_counter { Fl_Check_Button* o = new Fl_Check_Button(625, 132, 60, 20, "Neg.Input"); @@ -748,7 +748,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { strchdial->maximum(127); strchdial->step(1); strchdial->callback((Fl_Callback*)cb_strchdial); - strchdial->align(FL_ALIGN_TOP); + strchdial->align(Fl_Align(FL_ALIGN_TOP)); strchdial->when(FL_WHEN_CHANGED); o->value(pars->Psequencestretch); } // WidgetPDial* strchdial @@ -762,7 +762,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Num); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->bounds(1,FF_MAX_FORMANTS); o->value(pars->Pnumformants); } // Fl_Counter* o @@ -778,7 +778,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { frsldial->maximum(127); frsldial->step(1); frsldial->callback((Fl_Callback*)cb_frsldial); - frsldial->align(FL_ALIGN_TOP); + frsldial->align(Fl_Align(FL_ALIGN_TOP)); frsldial->when(FL_WHEN_CHANGED); o->value(pars->Pformantslowness); } // WidgetPDial* frsldial @@ -826,7 +826,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { formantfiltergraph->labelfont(0); formantfiltergraph->labelsize(14); formantfiltergraph->labelcolor(FL_FOREGROUND_COLOR); - formantfiltergraph->align(FL_ALIGN_CENTER); + formantfiltergraph->align(Fl_Align(FL_ALIGN_CENTER)); formantfiltergraph->when(FL_WHEN_RELEASE); o->init(pars,&nvowel,&nformant); } // FormantFilterGraph* formantfiltergraph @@ -842,7 +842,7 @@ Fl_Double_Window* FilterUI::make_formant_window() { wvknob->maximum(127); wvknob->step(1); wvknob->callback((Fl_Callback*)cb_wvknob); - wvknob->align(FL_ALIGN_TOP); + wvknob->align(Fl_Align(FL_ALIGN_TOP)); wvknob->when(FL_WHEN_CHANGED); o->value(pars->Pvowelclearness); } // WidgetPDial* wvknob diff --git a/plugins/zynaddsubfx/src/UI/FilterUI.h b/plugins/zynaddsubfx/src/UI/FilterUI.h index 573eac7e6..e8226d4e6 100644 --- a/plugins/zynaddsubfx/src/UI/FilterUI.h +++ b/plugins/zynaddsubfx/src/UI/FilterUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef FilterUI_h #define FilterUI_h diff --git a/plugins/zynaddsubfx/src/UI/LFOUI.cc b/plugins/zynaddsubfx/src/UI/LFOUI.cc index 216b52c39..af6c1f189 100644 --- a/plugins/zynaddsubfx/src/UI/LFOUI.cc +++ b/plugins/zynaddsubfx/src/UI/LFOUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "LFOUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -112,14 +112,14 @@ Fl_Group* LFOUI::make_window() { lfoui->labelsize(14); lfoui->labelcolor(FL_FOREGROUND_COLOR); lfoui->user_data((void*)(this)); - lfoui->align(FL_ALIGN_TOP); + lfoui->align(Fl_Align(FL_ALIGN_TOP)); lfoui->when(FL_WHEN_RELEASE); { lfoparamswindow = new Fl_Group(0, 0, 230, 70, "LFO"); lfoparamswindow->box(FL_PLASTIC_UP_BOX); lfoparamswindow->color(FL_CYAN); lfoparamswindow->labeltype(FL_ENGRAVED_LABEL); lfoparamswindow->labelsize(10); - lfoparamswindow->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + lfoparamswindow->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { freq = new WidgetPDial(5, 20, 30, 30, "Freq."); freq->tooltip("LFO Frequency"); freq->box(FL_ROUND_UP_BOX); @@ -131,7 +131,7 @@ Fl_Group* LFOUI::make_window() { freq->labelcolor(FL_FOREGROUND_COLOR); freq->step(1e-05); freq->callback((Fl_Callback*)cb_freq); - freq->align(FL_ALIGN_BOTTOM); + freq->align(Fl_Align(FL_ALIGN_BOTTOM)); freq->when(FL_WHEN_CHANGED); } // WidgetPDial* freq { intensity = new WidgetPDial(40, 20, 30, 30, "Depth"); @@ -146,7 +146,7 @@ Fl_Group* LFOUI::make_window() { intensity->maximum(127); intensity->step(1); intensity->callback((Fl_Callback*)cb_intensity); - intensity->align(FL_ALIGN_BOTTOM); + intensity->align(Fl_Align(FL_ALIGN_BOTTOM)); intensity->when(FL_WHEN_CHANGED); } // WidgetPDial* intensity { delay = new WidgetPDial(110, 20, 30, 30, "Delay"); @@ -161,7 +161,7 @@ Fl_Group* LFOUI::make_window() { delay->maximum(127); delay->step(1); delay->callback((Fl_Callback*)cb_delay); - delay->align(FL_ALIGN_BOTTOM); + delay->align(Fl_Align(FL_ALIGN_BOTTOM)); delay->when(FL_WHEN_CHANGED); } // WidgetPDial* delay { startphase = new WidgetPDial(75, 20, 30, 30, "Start"); @@ -176,7 +176,7 @@ Fl_Group* LFOUI::make_window() { startphase->maximum(127); startphase->step(1); startphase->callback((Fl_Callback*)cb_startphase); - startphase->align(FL_ALIGN_BOTTOM); + startphase->align(Fl_Align(FL_ALIGN_BOTTOM)); startphase->when(FL_WHEN_CHANGED); } // WidgetPDial* startphase { randomness = new WidgetPDial(180, 7, 20, 20, "A.R."); @@ -191,7 +191,7 @@ Fl_Group* LFOUI::make_window() { randomness->maximum(127); randomness->step(1); randomness->callback((Fl_Callback*)cb_randomness); - randomness->align(FL_ALIGN_BOTTOM); + randomness->align(Fl_Align(FL_ALIGN_BOTTOM)); randomness->when(FL_WHEN_CHANGED); } // WidgetPDial* randomness { LFOtype = new Fl_Choice(180, 40, 45, 15, "Type"); @@ -200,7 +200,7 @@ Fl_Group* LFOUI::make_window() { LFOtype->labelsize(10); LFOtype->textsize(8); LFOtype->callback((Fl_Callback*)cb_LFOtype); - LFOtype->align(FL_ALIGN_BOTTOM); + LFOtype->align(Fl_Align(FL_ALIGN_BOTTOM)); LFOtype->menu(menu_LFOtype); } // Fl_Choice* LFOtype { continous = new Fl_Check_Button(165, 35, 15, 15, "C."); @@ -208,7 +208,7 @@ Fl_Group* LFOUI::make_window() { continous->down_box(FL_DOWN_BOX); continous->labelsize(10); continous->callback((Fl_Callback*)cb_continous); - continous->align(FL_ALIGN_BOTTOM); + continous->align(Fl_Align(FL_ALIGN_BOTTOM)); } // Fl_Check_Button* continous { freqrand = new WidgetPDial(205, 7, 20, 20, "F.R."); freqrand->tooltip("LFO Frequency Randomness"); @@ -222,7 +222,7 @@ Fl_Group* LFOUI::make_window() { freqrand->maximum(127); freqrand->step(1); freqrand->callback((Fl_Callback*)cb_freqrand); - freqrand->align(FL_ALIGN_BOTTOM); + freqrand->align(Fl_Align(FL_ALIGN_BOTTOM)); freqrand->when(FL_WHEN_CHANGED); } // WidgetPDial* freqrand { stretch = new WidgetPDial(144, 30, 20, 20, "Str."); @@ -237,7 +237,7 @@ Fl_Group* LFOUI::make_window() { stretch->maximum(127); stretch->step(1); stretch->callback((Fl_Callback*)cb_stretch); - stretch->align(FL_ALIGN_BOTTOM); + stretch->align(Fl_Align(FL_ALIGN_BOTTOM)); stretch->when(FL_WHEN_CHANGED); } // WidgetPDial* stretch { Fl_Button* o = new Fl_Button(145, 10, 15, 15, "C"); diff --git a/plugins/zynaddsubfx/src/UI/LFOUI.h b/plugins/zynaddsubfx/src/UI/LFOUI.h index e5497ac1f..6959fe3f3 100644 --- a/plugins/zynaddsubfx/src/UI/LFOUI.h +++ b/plugins/zynaddsubfx/src/UI/LFOUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef LFOUI_h #define LFOUI_h diff --git a/plugins/zynaddsubfx/src/UI/MasterUI.cc b/plugins/zynaddsubfx/src/UI/MasterUI.cc index 80adb2584..e37d70b9c 100644 --- a/plugins/zynaddsubfx/src/UI/MasterUI.cc +++ b/plugins/zynaddsubfx/src/UI/MasterUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "MasterUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -301,7 +301,7 @@ Fl_Group* Panellistitem::make_window() { panellistitem->labelsize(14); panellistitem->labelcolor(FL_FOREGROUND_COLOR); panellistitem->user_data((void*)(this)); - panellistitem->align(FL_ALIGN_TOP); + panellistitem->align(Fl_Align(FL_ALIGN_TOP)); panellistitem->when(FL_WHEN_RELEASE); { Fl_Group* o = panellistitemgroup = new Fl_Group(0, 20, 70, 240); panellistitemgroup->box(FL_PLASTIC_THIN_UP_BOX); @@ -315,7 +315,7 @@ Fl_Group* Panellistitem::make_window() { o->labelfont(0); o->labelsize(14); o->labelcolor((Fl_Color)55); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); o->when(FL_WHEN_RELEASE); o->init(master,npart); } // VUMeter* o @@ -327,7 +327,7 @@ Fl_Group* Panellistitem::make_window() { partname->labelfont(1); partname->labelsize(10); partname->callback((Fl_Callback*)cb_partname); - partname->align(192|FL_ALIGN_INSIDE); + partname->align(Fl_Align(192|FL_ALIGN_INSIDE)); } // Fl_Button* partname { Fl_Slider* o = partvolume = new Fl_Slider(10, 65, 30, 110); partvolume->type(4); @@ -350,7 +350,7 @@ Fl_Group* Panellistitem::make_window() { partpanning->maximum(127); partpanning->step(1); partpanning->callback((Fl_Callback*)cb_partpanning); - partpanning->align(FL_ALIGN_BOTTOM); + partpanning->align(Fl_Align(FL_ALIGN_BOTTOM)); partpanning->when(FL_WHEN_CHANGED); o->value(master->part[npart]->Ppanning); } // WidgetPDial* partpanning @@ -366,7 +366,7 @@ Fl_Group* Panellistitem::make_window() { partrcv->textfont(1); partrcv->textsize(10); partrcv->callback((Fl_Callback*)cb_partrcv); - partrcv->align(FL_ALIGN_TOP_LEFT); + partrcv->align(Fl_Align(FL_ALIGN_TOP_LEFT)); char nrstr[10]; for(int i=0;iadd(nrstr); else o->add("Dr10");}; o->value(master->part[npart]->Prcvchn); } // Fl_Choice* partrcv @@ -379,7 +379,7 @@ Fl_Group* Panellistitem::make_window() { partenabled->labelfont(1); partenabled->labelsize(13); partenabled->callback((Fl_Callback*)cb_partenabled); - partenabled->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); + partenabled->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",npart+1);o->label(strdup(tmp)); o->value(master->part[npart]->Penabled); } // Fl_Check_Button* partenabled @@ -1456,7 +1456,7 @@ Fl_Double_Window* MasterUI::make_window() { mastervolumedial->maximum(127); mastervolumedial->step(1); mastervolumedial->callback((Fl_Callback*)cb_mastervolumedial); - mastervolumedial->align(130); + mastervolumedial->align(Fl_Align(130)); mastervolumedial->when(FL_WHEN_CHANGED); o->value(master->Pvolume); } // WidgetPDial* mastervolumedial @@ -1485,7 +1485,7 @@ Fl_Double_Window* MasterUI::make_window() { partui->labelfont(0); partui->labelsize(14); partui->labelcolor(FL_FOREGROUND_COLOR); - partui->align(FL_ALIGN_TOP); + partui->align(Fl_Align(FL_ALIGN_TOP)); partui->when(FL_WHEN_RELEASE); o->init(master->part[0],master,0,bankui); o->show(); @@ -1498,7 +1498,7 @@ Fl_Double_Window* MasterUI::make_window() { o->box(FL_ENGRAVED_FRAME); o->labeltype(FL_EMBOSSED_LABEL); o->labelsize(15); - o->align(FL_ALIGN_TOP_RIGHT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP_RIGHT|FL_ALIGN_INSIDE)); { Fl_Counter* o = syseffnocounter = new Fl_Counter(5, 120, 80, 20, "Sys.Effect No."); syseffnocounter->type(1); syseffnocounter->labelfont(1); @@ -1509,7 +1509,7 @@ Fl_Double_Window* MasterUI::make_window() { syseffnocounter->value(1); syseffnocounter->textfont(1); syseffnocounter->callback((Fl_Callback*)cb_syseffnocounter); - syseffnocounter->align(FL_ALIGN_TOP); + syseffnocounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(1,NUM_SYS_EFX); o->value(nsyseff+1); } // Fl_Counter* syseffnocounter @@ -1531,7 +1531,7 @@ Fl_Double_Window* MasterUI::make_window() { syseffectui->labelfont(0); syseffectui->labelsize(14); syseffectui->labelcolor(FL_FOREGROUND_COLOR); - syseffectui->align(FL_ALIGN_TOP); + syseffectui->align(Fl_Align(FL_ALIGN_TOP)); syseffectui->when(FL_WHEN_RELEASE); o->init(master->sysefx[nsyseff]); syseffectui->end(); @@ -1566,7 +1566,7 @@ Fl_Double_Window* MasterUI::make_window() { o->box(FL_ENGRAVED_FRAME); o->labeltype(FL_EMBOSSED_LABEL); o->labelsize(15); - o->align(FL_ALIGN_TOP_RIGHT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP_RIGHT|FL_ALIGN_INSIDE)); o->hide(); { Fl_Counter* o = inseffnocounter = new Fl_Counter(5, 120, 80, 20, "Ins.Effect No."); inseffnocounter->type(1); @@ -1578,7 +1578,7 @@ Fl_Double_Window* MasterUI::make_window() { inseffnocounter->value(1); inseffnocounter->textfont(1); inseffnocounter->callback((Fl_Callback*)cb_inseffnocounter); - inseffnocounter->align(FL_ALIGN_TOP); + inseffnocounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(1,NUM_INS_EFX); o->value(ninseff+1); } // Fl_Counter* inseffnocounter @@ -1601,7 +1601,7 @@ Fl_Double_Window* MasterUI::make_window() { inseffectui->labelfont(0); inseffectui->labelsize(14); inseffectui->labelcolor(FL_FOREGROUND_COLOR); - inseffectui->align(FL_ALIGN_TOP); + inseffectui->align(Fl_Align(FL_ALIGN_TOP)); inseffectui->when(FL_WHEN_RELEASE); o->init(master->insefx[ninseff]); if (master->Pinsparts[ninseff]== -1) o->deactivate(); @@ -1615,7 +1615,7 @@ Fl_Double_Window* MasterUI::make_window() { inseffpart->labelsize(10); inseffpart->textsize(10); inseffpart->callback((Fl_Callback*)cb_inseffpart); - inseffpart->align(FL_ALIGN_TOP_LEFT); + inseffpart->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("Master Out");o->add("Off"); char tmp[50]; for (int i=0;iadd(tmp);}; o->value(master->Pinsparts[ninseff]+2); @@ -1656,7 +1656,7 @@ Fl_Double_Window* MasterUI::make_window() { recordbutton->labelfont(1); recordbutton->labelsize(10); recordbutton->callback((Fl_Callback*)cb_recordbutton); - recordbutton->align(FL_ALIGN_BOTTOM); + recordbutton->align(Fl_Align(FL_ALIGN_BOTTOM)); recordbutton->deactivate(); } // Fl_Button* recordbutton { stopbutton = new Fl_Button(259, 36, 21, 21, "Stop"); @@ -1666,7 +1666,7 @@ Fl_Double_Window* MasterUI::make_window() { stopbutton->labelfont(1); stopbutton->labelsize(10); stopbutton->callback((Fl_Callback*)cb_stopbutton); - stopbutton->align(FL_ALIGN_BOTTOM); + stopbutton->align(Fl_Align(FL_ALIGN_BOTTOM)); stopbutton->deactivate(); } // Fl_Button* stopbutton { pausebutton = new Fl_Button(220, 36, 21, 21, "@||"); @@ -1677,7 +1677,7 @@ Fl_Double_Window* MasterUI::make_window() { pausebutton->labelfont(1); pausebutton->labelcolor((Fl_Color)3); pausebutton->callback((Fl_Callback*)cb_pausebutton); - pausebutton->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + pausebutton->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); pausebutton->deactivate(); } // Fl_Button* pausebutton { pauselabel = new Fl_Box(214, 56, 30, 15, "Pause"); @@ -1697,7 +1697,7 @@ Fl_Double_Window* MasterUI::make_window() { o->labelfont(0); o->labelsize(14); o->labelcolor(FL_FOREGROUND_COLOR); - o->align(FL_ALIGN_CENTER); + o->align(Fl_Align(FL_ALIGN_CENTER)); o->when(FL_WHEN_RELEASE); o->init(master,-1); } // VUMeter* o @@ -1751,7 +1751,7 @@ Fl_Double_Window* MasterUI::make_window() { globalfinedetuneslider->step(1); globalfinedetuneslider->value(64); globalfinedetuneslider->callback((Fl_Callback*)cb_globalfinedetuneslider); - globalfinedetuneslider->align(130); + globalfinedetuneslider->align(Fl_Align(130)); globalfinedetuneslider->when(FL_WHEN_CHANGED); o->value(master->microtonal.Pglobalfinedetune); } // WidgetPDial* globalfinedetuneslider @@ -1771,7 +1771,7 @@ Fl_Double_Window* MasterUI::make_window() { { Fl_Box* o = new Fl_Box(0, 35, 330, 25, "Copyright (c) 2002-2005 Nasca O. Paul and others"); o->labeltype(FL_EMBOSSED_LABEL); o->labelsize(15); - o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(0, 60, 325, 115, "This is free software; you may redistribute it and/or modify it under the ter\ ms of the \nversion 2 (or any later version) of the GNU General Public License\ @@ -1780,7 +1780,7 @@ OLUTELY NO WARRANTY. \n See the version 2 (or any later version) of the \nGNU \ General Public License for details."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Button* o = new Fl_Button(80, 180, 180, 25, "Close this window"); o->box(FL_THIN_UP_BOX); @@ -1791,7 +1791,7 @@ General Public License for details."); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(20); - o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); } // Fl_Box* o aboutwindow->end(); } // Fl_Double_Window* aboutwindow @@ -1810,7 +1810,7 @@ General Public License for details."); } // Fl_Button* o { Fl_Box* o = new Fl_Box(5, 5, 110, 35, "Send system effect\'s output to other system effects"); o->labelsize(10); - o->align(192); + o->align(Fl_Align(192)); } // Fl_Box* o syseffsendwindow->end(); } // Fl_Double_Window* syseffsendwindow @@ -1862,7 +1862,7 @@ General Public License for details."); partname->labelfont(1); partname->labelsize(11); partname->callback((Fl_Callback*)cb_partname1); - partname->align(192|FL_ALIGN_INSIDE); + partname->align(Fl_Align(192|FL_ALIGN_INSIDE)); } // Fl_Button* partname { Fl_Slider* o = partpanning = new Fl_Slider(185, 95, 70, 15, "Pan"); partpanning->type(5); @@ -1879,7 +1879,7 @@ General Public License for details."); partrcv->labelsize(10); partrcv->textfont(1); partrcv->callback((Fl_Callback*)cb_partrcv1); - partrcv->align(130); + partrcv->align(Fl_Align(130)); char nrstr[10]; for(int i=0;iadd(nrstr); else o->add("Dr10");}; o->value(master->part[npart]->Prcvchn); } // Fl_Choice* partrcv @@ -1894,7 +1894,7 @@ General Public License for details."); partvolume->maximum(127); partvolume->step(1); partvolume->callback((Fl_Callback*)cb_partvolume1); - partvolume->align(FL_ALIGN_BOTTOM); + partvolume->align(Fl_Align(FL_ALIGN_BOTTOM)); partvolume->when(FL_WHEN_CHANGED); o->value(master->part[npart]->Pvolume); } // WidgetPDial* partvolume @@ -1971,7 +1971,7 @@ General Public License for details."); simplesyseffsend->maximum(127); simplesyseffsend->step(1); simplesyseffsend->callback((Fl_Callback*)cb_simplesyseffsend); - simplesyseffsend->align(FL_ALIGN_BOTTOM); + simplesyseffsend->align(Fl_Align(FL_ALIGN_BOTTOM)); simplesyseffsend->when(FL_WHEN_CHANGED); } // WidgetPDial* simplesyseffsend { new Fl_Box(295, 190, 40, 15, "Effect"); @@ -1985,7 +1985,7 @@ General Public License for details."); partenabled->labelfont(1); partenabled->labelsize(13); partenabled->callback((Fl_Callback*)cb_partenabled1); - partenabled->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); + partenabled->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE)); //char tmp[10];snprintf(tmp,10,"%d",npart+1);o->label(strdup(tmp)); o->value(master->part[npart]->Penabled); } // Fl_Check_Button* partenabled @@ -1997,19 +1997,19 @@ General Public License for details."); virkeys->labelfont(0); virkeys->labelsize(14); virkeys->labelcolor(FL_FOREGROUND_COLOR); - virkeys->align(FL_ALIGN_CENTER); + virkeys->align(Fl_Align(FL_ALIGN_CENTER)); virkeys->when(FL_WHEN_RELEASE); o->init(master); } // VirKeys* virkeys { Fl_Group* o = new Fl_Group(340, 30, 255, 185); o->box(FL_ENGRAVED_BOX); { Fl_Tabs* o = new Fl_Tabs(345, 35, 245, 175); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); { Fl_Group* o = new Fl_Group(345, 55, 245, 155, "System Effects"); o->box(FL_ENGRAVED_FRAME); o->labelfont(1); o->labelsize(12); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); { Fl_Counter* o = simplesyseffnocounter = new Fl_Counter(350, 75, 80, 20, "Sys.Effect No."); simplesyseffnocounter->type(1); simplesyseffnocounter->labelfont(1); @@ -2020,7 +2020,7 @@ General Public License for details."); simplesyseffnocounter->value(1); simplesyseffnocounter->textfont(1); simplesyseffnocounter->callback((Fl_Callback*)cb_simplesyseffnocounter); - simplesyseffnocounter->align(FL_ALIGN_TOP); + simplesyseffnocounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(1,NUM_SYS_EFX); o->value(nsyseff+1); } // Fl_Counter* simplesyseffnocounter @@ -2028,7 +2028,7 @@ General Public License for details."); simplesysefftype->down_box(FL_BORDER_BOX); simplesysefftype->labelsize(10); simplesysefftype->callback((Fl_Callback*)cb_simplesysefftype); - simplesysefftype->align(FL_ALIGN_TOP_LEFT); + simplesysefftype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); simplesysefftype->menu(menu_simplesysefftype); o->value(master->sysefx[nsyseff]->geteffect()); } // Fl_Choice* simplesysefftype @@ -2043,7 +2043,7 @@ General Public License for details."); simplesyseffectui->labelfont(0); simplesyseffectui->labelsize(14); simplesyseffectui->labelcolor(FL_FOREGROUND_COLOR); - simplesyseffectui->align(FL_ALIGN_TOP); + simplesyseffectui->align(Fl_Align(FL_ALIGN_TOP)); simplesyseffectui->when(FL_WHEN_RELEASE); o->init(master->sysefx[nsyseff]); simplesyseffectui->end(); @@ -2070,7 +2070,7 @@ General Public License for details."); o->box(FL_ENGRAVED_FRAME); o->labelfont(1); o->labelsize(12); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); o->hide(); { Fl_Counter* o = simpleinseffnocounter = new Fl_Counter(350, 75, 80, 20, "Ins.Effect No."); simpleinseffnocounter->type(1); @@ -2082,7 +2082,7 @@ General Public License for details."); simpleinseffnocounter->value(1); simpleinseffnocounter->textfont(1); simpleinseffnocounter->callback((Fl_Callback*)cb_simpleinseffnocounter); - simpleinseffnocounter->align(FL_ALIGN_TOP); + simpleinseffnocounter->align(Fl_Align(FL_ALIGN_TOP)); o->bounds(1,NUM_INS_EFX); o->value(ninseff+1); } // Fl_Counter* simpleinseffnocounter @@ -2090,7 +2090,7 @@ General Public License for details."); simpleinsefftype->down_box(FL_BORDER_BOX); simpleinsefftype->labelsize(10); simpleinsefftype->callback((Fl_Callback*)cb_simpleinsefftype); - simpleinsefftype->align(FL_ALIGN_TOP_LEFT); + simpleinsefftype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); simpleinsefftype->menu(menu_simpleinsefftype); o->value(master->insefx[ninseff]->geteffect()); if (master->Pinsparts[ninseff]== -1) o->deactivate(); @@ -2106,7 +2106,7 @@ General Public License for details."); simpleinseffectui->labelfont(0); simpleinseffectui->labelsize(14); simpleinseffectui->labelcolor(FL_FOREGROUND_COLOR); - simpleinseffectui->align(FL_ALIGN_TOP); + simpleinseffectui->align(Fl_Align(FL_ALIGN_TOP)); simpleinseffectui->when(FL_WHEN_RELEASE); o->init(master->insefx[ninseff]); if (master->Pinsparts[ninseff]== -1) o->deactivate(); @@ -2120,7 +2120,7 @@ General Public License for details."); simpleinseffpart->labelsize(10); simpleinseffpart->textsize(10); simpleinseffpart->callback((Fl_Callback*)cb_simpleinseffpart); - simpleinseffpart->align(FL_ALIGN_TOP_LEFT); + simpleinseffpart->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("Master Out");o->add("Off"); char tmp[50]; for (int i=0;iadd(tmp);}; o->value(master->Pinsparts[ninseff]+2); @@ -2149,7 +2149,7 @@ General Public License for details."); o->labelfont(0); o->labelsize(14); o->labelcolor(FL_FOREGROUND_COLOR); - o->align(FL_ALIGN_CENTER); + o->align(Fl_Align(FL_ALIGN_CENTER)); o->when(FL_WHEN_RELEASE); o->init(master,-1); } // VUMeter* o @@ -2167,7 +2167,7 @@ General Public License for details."); simplemastervolumedial->maximum(127); simplemastervolumedial->step(1); simplemastervolumedial->callback((Fl_Callback*)cb_simplemastervolumedial); - simplemastervolumedial->align(130); + simplemastervolumedial->align(Fl_Align(130)); simplemastervolumedial->when(FL_WHEN_CHANGED); o->value(master->Pvolume); } // WidgetPDial* simplemastervolumedial @@ -2193,7 +2193,7 @@ General Public License for details."); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)cb_Reset); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { WidgetPDial* o = simpleglobalfinedetuneslider = new WidgetPDial(80, 45, 30, 30, "Fine Detune"); simpleglobalfinedetuneslider->tooltip("global fine detune"); @@ -2208,7 +2208,7 @@ General Public License for details."); simpleglobalfinedetuneslider->step(1); simpleglobalfinedetuneslider->value(64); simpleglobalfinedetuneslider->callback((Fl_Callback*)cb_simpleglobalfinedetuneslider); - simpleglobalfinedetuneslider->align(130); + simpleglobalfinedetuneslider->align(Fl_Align(130)); simpleglobalfinedetuneslider->when(FL_WHEN_CHANGED); o->value(master->microtonal.Pglobalfinedetune); } // WidgetPDial* simpleglobalfinedetuneslider @@ -2222,7 +2222,7 @@ General Public License for details."); simplenpartcounter->value(1); simplenpartcounter->textfont(1); simplenpartcounter->callback((Fl_Callback*)cb_simplenpartcounter); - simplenpartcounter->align(FL_ALIGN_LEFT); + simplenpartcounter->align(Fl_Align(FL_ALIGN_LEFT)); o->bounds(1,NUM_MIDI_PARTS); } // Fl_Counter* simplenpartcounter { Fl_Counter* o = new Fl_Counter(5, 195, 55, 20, "Keyb.Oct."); @@ -2235,7 +2235,7 @@ General Public License for details."); o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Keyb); - o->align(FL_ALIGN_RIGHT); + o->align(Fl_Align(FL_ALIGN_RIGHT)); o->when(FL_WHEN_RELEASE_ALWAYS); o->value(virkeys->midioct); } // Fl_Counter* o @@ -2263,7 +2263,7 @@ General Public License for details."); all parameters."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Button* o = new Fl_Button(10, 80, 100, 65, "Beginner"); o->box(FL_PLASTIC_UP_BOX); @@ -2277,14 +2277,14 @@ r user interfaces. Most functionality of ZynAddSubFX will be hidden in this mo\ de to make simple the learning/using it."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(30, 215, 360, 25, "You can switch the interface modes anytime you want."); o->box(FL_BORDER_BOX); o->color((Fl_Color)51); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); } // Fl_Box* o selectuiwindow->set_non_modal(); selectuiwindow->end(); diff --git a/plugins/zynaddsubfx/src/UI/MasterUI.h b/plugins/zynaddsubfx/src/UI/MasterUI.h index 2235123c5..4eed5af0c 100644 --- a/plugins/zynaddsubfx/src/UI/MasterUI.h +++ b/plugins/zynaddsubfx/src/UI/MasterUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef MasterUI_h #define MasterUI_h diff --git a/plugins/zynaddsubfx/src/UI/MicrotonalUI.cc b/plugins/zynaddsubfx/src/UI/MicrotonalUI.cc index aa233bced..c37e08155 100644 --- a/plugins/zynaddsubfx/src/UI/MicrotonalUI.cc +++ b/plugins/zynaddsubfx/src/UI/MicrotonalUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "MicrotonalUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -189,7 +189,7 @@ Fl_Double_Window* MicrotonalUI::make_window() { o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)cb_Invert); - o->align(132|FL_ALIGN_INSIDE); + o->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(microtonal->Pinvertupdown); } // Fl_Check_Button* o { Fl_Counter* o = centerinvertcounter = new Fl_Counter(319, 13, 80, 20, "Center"); @@ -200,7 +200,7 @@ Fl_Double_Window* MicrotonalUI::make_window() { centerinvertcounter->step(1); centerinvertcounter->textfont(1); centerinvertcounter->callback((Fl_Callback*)cb_centerinvertcounter); - centerinvertcounter->align(130); + centerinvertcounter->align(Fl_Align(130)); o->lstep(microtonal->getoctavesize()); o->value(microtonal->Pinvertupdowncenter); if (microtonal->Pinvertupdown==0) o->deactivate(); @@ -226,21 +226,21 @@ pings\""); octavesizeoutput->value(12); octavesizeoutput->textfont(1); octavesizeoutput->callback((Fl_Callback*)cb_octavesizeoutput); - octavesizeoutput->align(FL_ALIGN_TOP_LEFT); + octavesizeoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(microtonal->getoctavesize()); } // Fl_Value_Output* octavesizeoutput { Fl_Input* o = nameinput = new Fl_Input(8, 64, 285, 25, "Name:"); nameinput->labelfont(1); nameinput->labelsize(11); nameinput->callback((Fl_Callback*)cb_nameinput); - nameinput->align(FL_ALIGN_TOP_LEFT); + nameinput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->insert((char *)microtonal->Pname); } // Fl_Input* nameinput { tuningsinput = new Fl_Input(8, 144, 182, 264, "Tunings:"); tuningsinput->type(4); tuningsinput->labelfont(1); tuningsinput->labelsize(11); - tuningsinput->align(FL_ALIGN_TOP_LEFT); + tuningsinput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); tuningsinput->when(FL_WHEN_NEVER); updateTuningsInput(); } // Fl_Input* tuningsinput @@ -248,7 +248,7 @@ pings\""); commentinput->labelfont(1); commentinput->labelsize(11); commentinput->callback((Fl_Callback*)cb_commentinput); - commentinput->align(FL_ALIGN_TOP_LEFT); + commentinput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->insert((char *)microtonal->Pcomment); } // Fl_Input* commentinput { Fl_Counter* o = new Fl_Counter(313, 69, 70, 20, "Shift"); @@ -259,7 +259,7 @@ pings\""); o->step(1); o->textfont(1); o->callback((Fl_Callback*)cb_Shift); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); o->value(microtonal->Pscaleshift-64); } // Fl_Counter* o { Fl_Button* o = new Fl_Button(243, 411, 84, 15, "Import .SCL file"); @@ -277,7 +277,7 @@ pings\""); mappinginput->type(4); mappinginput->labelfont(1); mappinginput->labelsize(11); - mappinginput->align(FL_ALIGN_TOP_LEFT); + mappinginput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); mappinginput->when(FL_WHEN_NEVER); updateMappingInput(); } // Fl_Input* mappinginput @@ -291,7 +291,7 @@ pings\""); firstnotecounter->textfont(1); firstnotecounter->textsize(11); firstnotecounter->callback((Fl_Callback*)cb_firstnotecounter); - firstnotecounter->align(FL_ALIGN_TOP_LEFT); + firstnotecounter->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(microtonal->Pfirstkey); } // Fl_Counter* firstnotecounter { Fl_Counter* o = lastnotecounter = new Fl_Counter(199, 225, 42, 18, "Last note"); @@ -305,7 +305,7 @@ pings\""); lastnotecounter->textfont(1); lastnotecounter->textsize(11); lastnotecounter->callback((Fl_Callback*)cb_lastnotecounter); - lastnotecounter->align(FL_ALIGN_TOP_LEFT); + lastnotecounter->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(microtonal->Plastkey); } // Fl_Counter* lastnotecounter { Fl_Counter* o = middlenotecounter = new Fl_Counter(199, 267, 42, 18, "Midle note"); @@ -319,7 +319,7 @@ pings\""); middlenotecounter->textfont(1); middlenotecounter->textsize(11); middlenotecounter->callback((Fl_Callback*)cb_middlenotecounter); - middlenotecounter->align(FL_ALIGN_TOP_LEFT); + middlenotecounter->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(microtonal->Pmiddlenote); } // Fl_Counter* middlenotecounter { Fl_Value_Output* o = mapsizeoutput = new Fl_Value_Output(201, 382, 44, 20, "Map Size"); @@ -329,7 +329,7 @@ pings\""); mapsizeoutput->value(12); mapsizeoutput->textfont(1); mapsizeoutput->callback((Fl_Callback*)cb_mapsizeoutput); - mapsizeoutput->align(FL_ALIGN_TOP_LEFT); + mapsizeoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(microtonal->Pmapsize); } // Fl_Value_Output* mapsizeoutput keymappinggroup->end(); @@ -366,7 +366,7 @@ pings\""); anotecounter->textfont(1); anotecounter->textsize(10); anotecounter->callback((Fl_Callback*)cb_anotecounter); - anotecounter->align(129); + anotecounter->align(Fl_Align(129)); o->lstep(12); o->value(microtonal->PAnote); } // Fl_Counter* anotecounter @@ -381,7 +381,7 @@ pings\""); afreqinput->textfont(1); afreqinput->textsize(10); afreqinput->callback((Fl_Callback*)cb_afreqinput); - afreqinput->align(FL_ALIGN_TOP); + afreqinput->align(Fl_Align(FL_ALIGN_TOP)); o->value(microtonal->PAfreq); } // Fl_Value_Input* afreqinput o->end(); @@ -396,7 +396,7 @@ pings\""); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)cb_Enable); - o->align(132|FL_ALIGN_INSIDE); + o->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(microtonal->Penabled); } // Fl_Check_Button* o microtonaluiwindow->end(); diff --git a/plugins/zynaddsubfx/src/UI/MicrotonalUI.h b/plugins/zynaddsubfx/src/UI/MicrotonalUI.h index 626f2b983..3668b41e5 100644 --- a/plugins/zynaddsubfx/src/UI/MicrotonalUI.h +++ b/plugins/zynaddsubfx/src/UI/MicrotonalUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef MicrotonalUI_h #define MicrotonalUI_h diff --git a/plugins/zynaddsubfx/src/UI/OscilGenUI.cc b/plugins/zynaddsubfx/src/UI/OscilGenUI.cc index 20e016a5d..7bcb5ad3e 100644 --- a/plugins/zynaddsubfx/src/UI/OscilGenUI.cc +++ b/plugins/zynaddsubfx/src/UI/OscilGenUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "OscilGenUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -244,7 +244,7 @@ Fl_Group* Oscilharmonic::make_window() { harmonic->labelsize(14); harmonic->labelcolor(FL_FOREGROUND_COLOR); harmonic->user_data((void*)(this)); - harmonic->align(FL_ALIGN_TOP); + harmonic->align(Fl_Align(FL_ALIGN_TOP)); harmonic->when(FL_WHEN_RELEASE); { PSlider* o = mag = new PSlider(0, 15, 15, 115); mag->type(4); @@ -259,7 +259,7 @@ Fl_Group* Oscilharmonic::make_window() { mag->step(1); mag->value(64); mag->callback((Fl_Callback*)cb_mag); - mag->align(FL_ALIGN_BOTTOM); + mag->align(Fl_Align(FL_ALIGN_BOTTOM)); mag->when(FL_WHEN_CHANGED); o->value(127-oscil->Phmag[n]); if (oscil->Phmag[n]==64) o->selection_color(0); @@ -277,7 +277,7 @@ Fl_Group* Oscilharmonic::make_window() { phase->step(1); phase->value(64); phase->callback((Fl_Callback*)cb_phase); - phase->align(FL_ALIGN_BOTTOM); + phase->align(Fl_Align(FL_ALIGN_BOTTOM)); phase->when(FL_WHEN_CHANGED); o->value(oscil->Phphase[n]); } // PSlider* phase @@ -292,13 +292,13 @@ Fl_Group* Oscilharmonic::make_window() { { Fl_Box* o = new Fl_Box(0, 210, 20, 15, "01"); o->labelfont(1); o->labelsize(9); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",n+1);o->label(strdup(tmp)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(0, 0, 20, 15, "01"); o->labelfont(1); o->labelsize(9); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",n+1);o->label(strdup(tmp)); } // Fl_Box* o harmonic->end(); @@ -852,7 +852,7 @@ Fl_Double_Window* OscilEditor::make_window() { rndslider->maximum(63); rndslider->step(1); rndslider->callback((Fl_Callback*)cb_rndslider); - rndslider->align(FL_ALIGN_TOP_LEFT); + rndslider->align(Fl_Align(FL_ALIGN_TOP_LEFT)); if (oscil->ADvsPAD) o->hide(); } // Fl_Value_Slider* rndslider { Fl_Group* o = new Fl_Group(10, 30, 350, 50); @@ -886,7 +886,7 @@ Fl_Double_Window* OscilEditor::make_window() { hrnddial->maximum(127); hrnddial->step(1); hrnddial->callback((Fl_Callback*)cb_hrnddial); - hrnddial->align(FL_ALIGN_BOTTOM); + hrnddial->align(Fl_Align(FL_ALIGN_BOTTOM)); hrnddial->when(FL_WHEN_CHANGED); } // WidgetPDial* hrnddial if (oscil->ADvsPAD) o->hide(); @@ -922,7 +922,7 @@ Fl_Double_Window* OscilEditor::make_window() { bfslider->maximum(63); bfslider->step(1); bfslider->callback((Fl_Callback*)cb_bfslider); - bfslider->align(FL_ALIGN_BOTTOM); + bfslider->align(Fl_Align(FL_ALIGN_BOTTOM)); bfslider->when(FL_WHEN_CHANGED); } // WidgetPDial* bfslider { bftype = new Fl_Choice(370, 285, 90, 15, "Base.F.."); @@ -930,7 +930,7 @@ Fl_Double_Window* OscilEditor::make_window() { bftype->labelsize(10); bftype->textsize(11); bftype->callback((Fl_Callback*)cb_bftype); - bftype->align(FL_ALIGN_TOP_LEFT); + bftype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); bftype->menu(menu_bftype); } // Fl_Choice* bftype { Fl_Box* o = new Fl_Box(480, 10, 110, 20, "Base Func."); @@ -974,7 +974,7 @@ Fl_Double_Window* OscilEditor::make_window() { bfmodpar1->maximum(127); bfmodpar1->step(1); bfmodpar1->callback((Fl_Callback*)cb_bfmodpar1); - bfmodpar1->align(FL_ALIGN_BOTTOM); + bfmodpar1->align(Fl_Align(FL_ALIGN_BOTTOM)); bfmodpar1->when(FL_WHEN_CHANGED); } // WidgetPDial* bfmodpar1 { bfmodpar2 = new WidgetPDial(679, 281, 15, 15); @@ -989,7 +989,7 @@ Fl_Double_Window* OscilEditor::make_window() { bfmodpar2->maximum(127); bfmodpar2->step(1); bfmodpar2->callback((Fl_Callback*)cb_bfmodpar2); - bfmodpar2->align(FL_ALIGN_BOTTOM); + bfmodpar2->align(Fl_Align(FL_ALIGN_BOTTOM)); bfmodpar2->when(FL_WHEN_CHANGED); } // WidgetPDial* bfmodpar2 { bfmodpar3 = new WidgetPDial(699, 281, 15, 15); @@ -1004,7 +1004,7 @@ Fl_Double_Window* OscilEditor::make_window() { bfmodpar3->maximum(127); bfmodpar3->step(1); bfmodpar3->callback((Fl_Callback*)cb_bfmodpar3); - bfmodpar3->align(FL_ALIGN_BOTTOM); + bfmodpar3->align(Fl_Align(FL_ALIGN_BOTTOM)); bfmodpar3->when(FL_WHEN_CHANGED); } // WidgetPDial* bfmodpar3 if ((oscil->Pcurrentbasefunc==0)||(oscil->Pcurrentbasefunc==127)) basefuncmodulation->deactivate(); @@ -1059,7 +1059,7 @@ Fl_Double_Window* OscilEditor::make_window() { wshpar->maximum(63); wshpar->step(1); wshpar->callback((Fl_Callback*)cb_wshpar); - wshpar->align(FL_ALIGN_BOTTOM); + wshpar->align(Fl_Align(FL_ALIGN_BOTTOM)); wshpar->when(FL_WHEN_CHANGED); } // WidgetPDial* wshpar { wsparval = new Fl_Value_Output(228, 316, 25, 15); @@ -1099,7 +1099,7 @@ Fl_Double_Window* OscilEditor::make_window() { filtervalue1->maximum(127); filtervalue1->step(1); filtervalue1->callback((Fl_Callback*)cb_filtervalue1); - filtervalue1->align(FL_ALIGN_BOTTOM); + filtervalue1->align(Fl_Align(FL_ALIGN_BOTTOM)); filtervalue1->when(FL_WHEN_CHANGED); } // WidgetPDial* filtervalue1 { filterpref = new Fl_Check_Button(415, 313, 20, 20, "p"); @@ -1107,7 +1107,7 @@ Fl_Double_Window* OscilEditor::make_window() { filterpref->down_box(FL_DOWN_BOX); filterpref->labelsize(10); filterpref->callback((Fl_Callback*)cb_filterpref); - filterpref->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); + filterpref->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE)); } // Fl_Check_Button* filterpref { filtervalue2 = new WidgetPDial(392, 313, 20, 20); filtervalue2->tooltip("Oscillator\'s filter parameter2"); @@ -1121,7 +1121,7 @@ Fl_Double_Window* OscilEditor::make_window() { filtervalue2->maximum(127); filtervalue2->step(1); filtervalue2->callback((Fl_Callback*)cb_filtervalue2); - filtervalue2->align(FL_ALIGN_BOTTOM); + filtervalue2->align(Fl_Align(FL_ALIGN_BOTTOM)); filtervalue2->when(FL_WHEN_CHANGED); } // WidgetPDial* filtervalue2 o->end(); @@ -1148,7 +1148,7 @@ Fl_Double_Window* OscilEditor::make_window() { sadjpar->maximum(127); sadjpar->step(1); sadjpar->callback((Fl_Callback*)cb_sadjpar); - sadjpar->align(FL_ALIGN_BOTTOM); + sadjpar->align(Fl_Align(FL_ALIGN_BOTTOM)); sadjpar->when(FL_WHEN_CHANGED); } // WidgetPDial* sadjpar o->end(); @@ -1164,14 +1164,14 @@ Fl_Double_Window* OscilEditor::make_window() { harmonicshiftcounter->textfont(1); harmonicshiftcounter->textsize(10); harmonicshiftcounter->callback((Fl_Callback*)cb_harmonicshiftcounter); - harmonicshiftcounter->align(129); + harmonicshiftcounter->align(Fl_Align(129)); } // Fl_Counter* harmonicshiftcounter { harmonicshiftpre = new Fl_Check_Button(690, 385, 34, 15, "preH"); harmonicshiftpre->tooltip("Apply the harmonic shift before the waveshaping and filtering"); harmonicshiftpre->down_box(FL_DOWN_BOX); harmonicshiftpre->labelsize(10); harmonicshiftpre->callback((Fl_Callback*)cb_harmonicshiftpre); - harmonicshiftpre->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); + harmonicshiftpre->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE)); } // Fl_Check_Button* harmonicshiftpre { Fl_Button* o = new Fl_Button(670, 385, 20, 15, "R"); o->box(FL_THIN_UP_BOX); @@ -1189,7 +1189,7 @@ Fl_Double_Window* OscilEditor::make_window() { adhrtype->labelsize(10); adhrtype->textsize(10); adhrtype->callback((Fl_Callback*)cb_adhrtype); - adhrtype->align(129); + adhrtype->align(Fl_Align(129)); adhrtype->when(FL_WHEN_RELEASE_ALWAYS); adhrtype->menu(menu_adhrtype); } // Fl_Choice* adhrtype @@ -1205,7 +1205,7 @@ Fl_Double_Window* OscilEditor::make_window() { adhrpow->maximum(200); adhrpow->step(1); adhrpow->callback((Fl_Callback*)cb_adhrpow); - adhrpow->align(FL_ALIGN_BOTTOM); + adhrpow->align(Fl_Align(FL_ALIGN_BOTTOM)); adhrpow->when(FL_WHEN_CHANGED); } // WidgetPDial* adhrpow { adhrbf = new WidgetPDial(670, 460, 25, 25, "baseF"); @@ -1220,7 +1220,7 @@ Fl_Double_Window* OscilEditor::make_window() { adhrbf->maximum(255); adhrbf->step(1); adhrbf->callback((Fl_Callback*)cb_adhrbf); - adhrbf->align(FL_ALIGN_BOTTOM); + adhrbf->align(Fl_Align(FL_ALIGN_BOTTOM)); adhrbf->when(FL_WHEN_CHANGED); } // WidgetPDial* adhrbf { adhrpar = new Fl_Slider(670, 445, 55, 10); @@ -1255,7 +1255,7 @@ Fl_Double_Window* OscilEditor::make_window() { modpar1->maximum(127); modpar1->step(1); modpar1->callback((Fl_Callback*)cb_modpar1); - modpar1->align(FL_ALIGN_BOTTOM); + modpar1->align(Fl_Align(FL_ALIGN_BOTTOM)); modpar1->when(FL_WHEN_CHANGED); } // WidgetPDial* modpar1 { modpar2 = new WidgetPDial(550, 315, 15, 15); @@ -1270,7 +1270,7 @@ Fl_Double_Window* OscilEditor::make_window() { modpar2->maximum(127); modpar2->step(1); modpar2->callback((Fl_Callback*)cb_modpar2); - modpar2->align(FL_ALIGN_BOTTOM); + modpar2->align(Fl_Align(FL_ALIGN_BOTTOM)); modpar2->when(FL_WHEN_CHANGED); } // WidgetPDial* modpar2 { modpar3 = new WidgetPDial(570, 315, 15, 15); @@ -1285,7 +1285,7 @@ Fl_Double_Window* OscilEditor::make_window() { modpar3->maximum(127); modpar3->step(1); modpar3->callback((Fl_Callback*)cb_modpar3); - modpar3->align(FL_ALIGN_BOTTOM); + modpar3->align(Fl_Align(FL_ALIGN_BOTTOM)); modpar3->when(FL_WHEN_CHANGED); } // WidgetPDial* modpar3 o->end(); diff --git a/plugins/zynaddsubfx/src/UI/OscilGenUI.h b/plugins/zynaddsubfx/src/UI/OscilGenUI.h index 7ccf1c28f..0cd795bc8 100644 --- a/plugins/zynaddsubfx/src/UI/OscilGenUI.h +++ b/plugins/zynaddsubfx/src/UI/OscilGenUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef OscilGenUI_h #define OscilGenUI_h diff --git a/plugins/zynaddsubfx/src/UI/PADnoteUI.cc b/plugins/zynaddsubfx/src/UI/PADnoteUI.cc index 45a14121a..0478e4cb1 100644 --- a/plugins/zynaddsubfx/src/UI/PADnoteUI.cc +++ b/plugins/zynaddsubfx/src/UI/PADnoteUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "PADnoteUI.h" #include @@ -716,7 +716,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpbasepar1->maximum(127); hpbasepar1->step(1); hpbasepar1->callback((Fl_Callback*)cb_hpbasepar1); - hpbasepar1->align(FL_ALIGN_TOP); + hpbasepar1->align(Fl_Align(FL_ALIGN_TOP)); hpbasepar1->when(FL_WHEN_CHANGED); o->value(pars->Php.base.par1); } // WidgetPDial* hpbasepar1 @@ -725,7 +725,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpbasetype->labelsize(10); hpbasetype->textsize(10); hpbasetype->callback((Fl_Callback*)cb_hpbasetype); - hpbasetype->align(FL_ALIGN_TOP_LEFT); + hpbasetype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); hpbasetype->menu(menu_hpbasetype); o->value(pars->Php.base.type); } // Fl_Choice* hpbasetype @@ -740,7 +740,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpfreqmult->maximum(127); hpfreqmult->step(1); hpfreqmult->callback((Fl_Callback*)cb_hpfreqmult); - hpfreqmult->align(FL_ALIGN_TOP); + hpfreqmult->align(Fl_Align(FL_ALIGN_TOP)); hpfreqmult->when(FL_WHEN_CHANGED); o->value(pars->Php.freqmult); } // WidgetPDial* hpfreqmult @@ -755,7 +755,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpmpar1->maximum(127); hpmpar1->step(1); hpmpar1->callback((Fl_Callback*)cb_hpmpar1); - hpmpar1->align(FL_ALIGN_TOP); + hpmpar1->align(Fl_Align(FL_ALIGN_TOP)); hpmpar1->when(FL_WHEN_CHANGED); o->value(pars->Php.modulator.par1); } // WidgetPDial* hpmpar1 @@ -770,7 +770,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpmfreq->maximum(127); hpmfreq->step(1); hpmfreq->callback((Fl_Callback*)cb_hpmfreq); - hpmfreq->align(FL_ALIGN_TOP); + hpmfreq->align(Fl_Align(FL_ALIGN_TOP)); hpmfreq->when(FL_WHEN_CHANGED); o->value(pars->Php.modulator.freq); } // WidgetPDial* hpmfreq @@ -781,7 +781,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpamptype->labelsize(10); hpamptype->textsize(10); hpamptype->callback((Fl_Callback*)cb_hpamptype); - hpamptype->align(FL_ALIGN_TOP_LEFT); + hpamptype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); hpamptype->menu(menu_hpamptype); o->value(pars->Php.amp.type); } // Fl_Choice* hpamptype @@ -790,7 +790,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpampmode->labelsize(10); hpampmode->textsize(10); hpampmode->callback((Fl_Callback*)cb_hpampmode); - hpampmode->align(FL_ALIGN_TOP_LEFT); + hpampmode->align(Fl_Align(FL_ALIGN_TOP_LEFT)); hpampmode->menu(menu_hpampmode); o->value(pars->Php.amp.mode); } // Fl_Choice* hpampmode @@ -805,7 +805,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpamppar1->maximum(127); hpamppar1->step(1); hpamppar1->callback((Fl_Callback*)cb_hpamppar1); - hpamppar1->align(FL_ALIGN_TOP); + hpamppar1->align(Fl_Align(FL_ALIGN_TOP)); hpamppar1->when(FL_WHEN_CHANGED); o->value(pars->Php.amp.par1); } // WidgetPDial* hpamppar1 @@ -820,7 +820,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpamppar2->maximum(127); hpamppar2->step(1); hpamppar2->callback((Fl_Callback*)cb_hpamppar2); - hpamppar2->align(FL_ALIGN_TOP); + hpamppar2->align(Fl_Align(FL_ALIGN_TOP)); hpamppar2->when(FL_WHEN_CHANGED); o->value(pars->Php.amp.par2); } // WidgetPDial* hpamppar2 @@ -837,7 +837,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hponehalf->labelsize(10); hponehalf->textsize(10); hponehalf->callback((Fl_Callback*)cb_hponehalf); - hponehalf->align(FL_ALIGN_TOP_LEFT); + hponehalf->align(Fl_Align(FL_ALIGN_TOP_LEFT)); hponehalf->menu(menu_hponehalf); o->value(pars->Php.onehalf); } // Fl_Choice* hponehalf @@ -852,7 +852,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hpwidth->maximum(127); hpwidth->step(1); hpwidth->callback((Fl_Callback*)cb_hpwidth); - hpwidth->align(FL_ALIGN_TOP); + hpwidth->align(Fl_Align(FL_ALIGN_TOP)); hpwidth->when(FL_WHEN_CHANGED); o->value(pars->Php.width); } // WidgetPDial* hpwidth @@ -864,7 +864,7 @@ Fl_Double_Window* PADnoteUI::make_window() { o->color(FL_GRAY0); o->selection_color((Fl_Color)71); o->labelcolor((Fl_Color)179); - o->align(FL_ALIGN_BOTTOM_LEFT); + o->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); osc=new Oscilloscope(o->x(),o->y(),o->w(),o->h(),""); osc->init(pars->oscilgen,master); o->end(); @@ -877,7 +877,7 @@ Fl_Double_Window* PADnoteUI::make_window() { } // Fl_Button* o { cbwidget = new Fl_Box(125, 135, 205, 20, "Harmonic Content"); cbwidget->callback((Fl_Callback*)cb_cbwidget); - cbwidget->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + cbwidget->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); } // Fl_Box* cbwidget { Fl_Button* o = new Fl_Button(375, 225, 80, 20, "Resonance"); o->box(FL_THIN_UP_BOX); @@ -894,7 +894,7 @@ Fl_Double_Window* PADnoteUI::make_window() { bwdial->maximum(1000); bwdial->step(1); bwdial->callback((Fl_Callback*)cb_bwdial); - bwdial->align(FL_ALIGN_BOTTOM); + bwdial->align(Fl_Align(FL_ALIGN_BOTTOM)); bwdial->when(FL_WHEN_CHANGED); o->value(pars->Pbandwidth); if (pars->Pmode!=0) o->deactivate(); @@ -903,7 +903,7 @@ Fl_Double_Window* PADnoteUI::make_window() { bwcents->labelsize(10); bwcents->maximum(10000); bwcents->step(0.1); - bwcents->align(FL_ALIGN_BOTTOM_LEFT); + bwcents->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->value(pars->setPbandwidth(pars->Pbandwidth)); if (pars->Pmode!=0) o->deactivate(); } // Fl_Value_Output* bwcents @@ -914,7 +914,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hrpostype->labelsize(10); hrpostype->textsize(11); hrpostype->callback((Fl_Callback*)cb_hrpostype); - hrpostype->align(FL_ALIGN_TOP_LEFT); + hrpostype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); hrpostype->menu(menu_hrpostype); o->value(pars->Phrpos.type); } // Fl_Choice* hrpostype @@ -929,7 +929,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hrpospar1->maximum(255); hrpospar1->step(1); hrpospar1->callback((Fl_Callback*)cb_hrpospar1); - hrpospar1->align(FL_ALIGN_TOP); + hrpospar1->align(Fl_Align(FL_ALIGN_TOP)); hrpospar1->when(FL_WHEN_CHANGED); o->value(pars->Phrpos.par1); } // WidgetPDial* hrpospar1 @@ -944,7 +944,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hrpospar2->maximum(255); hrpospar2->step(1); hrpospar2->callback((Fl_Callback*)cb_hrpospar2); - hrpospar2->align(FL_ALIGN_TOP); + hrpospar2->align(Fl_Align(FL_ALIGN_TOP)); hrpospar2->when(FL_WHEN_CHANGED); o->value(pars->Phrpos.par2); } // WidgetPDial* hrpospar2 @@ -959,7 +959,7 @@ Fl_Double_Window* PADnoteUI::make_window() { hrpospar3->maximum(255); hrpospar3->step(1); hrpospar3->callback((Fl_Callback*)cb_hrpospar3); - hrpospar3->align(FL_ALIGN_TOP); + hrpospar3->align(Fl_Align(FL_ALIGN_TOP)); hrpospar3->when(FL_WHEN_CHANGED); o->value(pars->Phrpos.par3); } // WidgetPDial* hrpospar3 @@ -970,7 +970,7 @@ Fl_Double_Window* PADnoteUI::make_window() { bwscale->labelsize(10); bwscale->textsize(11); bwscale->callback((Fl_Callback*)cb_bwscale); - bwscale->align(FL_ALIGN_TOP_LEFT); + bwscale->align(Fl_Align(FL_ALIGN_TOP_LEFT)); bwscale->menu(menu_bwscale); o->value(pars->Pbwscale); if (pars->Pmode!=0) o->deactivate(); @@ -989,7 +989,7 @@ Fl_Double_Window* PADnoteUI::make_window() { qsamplesize->labelsize(10); qsamplesize->textsize(11); qsamplesize->callback((Fl_Callback*)cb_qsamplesize); - qsamplesize->align(FL_ALIGN_TOP_LEFT); + qsamplesize->align(Fl_Align(FL_ALIGN_TOP_LEFT)); qsamplesize->menu(menu_qsamplesize); o->value(pars->Pquality.samplesize); } // Fl_Choice* qsamplesize @@ -998,7 +998,7 @@ Fl_Double_Window* PADnoteUI::make_window() { qsmpoct->labelsize(11); qsmpoct->textsize(11); qsmpoct->callback((Fl_Callback*)cb_qsmpoct); - qsmpoct->align(FL_ALIGN_TOP_LEFT); + qsmpoct->align(Fl_Align(FL_ALIGN_TOP_LEFT)); qsmpoct->menu(menu_qsmpoct); o->value(pars->Pquality.smpoct); } // Fl_Choice* qsmpoct @@ -1007,7 +1007,7 @@ Fl_Double_Window* PADnoteUI::make_window() { qoct->labelsize(11); qoct->textsize(11); qoct->callback((Fl_Callback*)cb_qoct); - qoct->align(FL_ALIGN_TOP_LEFT); + qoct->align(Fl_Align(FL_ALIGN_TOP_LEFT)); qoct->menu(menu_qoct); o->value(pars->Pquality.oct); } // Fl_Choice* qoct @@ -1016,7 +1016,7 @@ Fl_Double_Window* PADnoteUI::make_window() { qbasenote->labelsize(11); qbasenote->textsize(11); qbasenote->callback((Fl_Callback*)cb_qbasenote); - qbasenote->align(FL_ALIGN_TOP_LEFT); + qbasenote->align(Fl_Align(FL_ALIGN_TOP_LEFT)); qbasenote->menu(menu_qbasenote); o->value(pars->Pquality.basenote); } // Fl_Choice* qbasenote @@ -1038,7 +1038,7 @@ Fl_Double_Window* PADnoteUI::make_window() { spectrummode->labelsize(10); spectrummode->textsize(11); spectrummode->callback((Fl_Callback*)cb_spectrummode); - spectrummode->align(FL_ALIGN_TOP_LEFT); + spectrummode->align(Fl_Align(FL_ALIGN_TOP_LEFT)); spectrummode->menu(menu_spectrummode); o->value(pars->Pmode); } // Fl_Choice* spectrummode @@ -1052,7 +1052,7 @@ Fl_Double_Window* PADnoteUI::make_window() { o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = freqenv = new EnvelopeUI(10, 315, 205, 70, "PADSynth - Frequency Envelope"); freqenv->box(FL_FLAT_BOX); freqenv->color((Fl_Color)51); @@ -1061,7 +1061,7 @@ Fl_Double_Window* PADnoteUI::make_window() { freqenv->labelfont(0); freqenv->labelsize(14); freqenv->labelcolor(FL_FOREGROUND_COLOR); - freqenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + freqenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); freqenv->when(FL_WHEN_RELEASE); o->init(pars->FreqEnvelope); freqenv->end(); @@ -1076,7 +1076,7 @@ Fl_Double_Window* PADnoteUI::make_window() { octave->textfont(1); octave->textsize(11); octave->callback((Fl_Callback*)cb_octave); - octave->align(FL_ALIGN_TOP); + octave->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->PCoarseDetune/1024; if (k>=8) k-=16; o->value(k); @@ -1090,7 +1090,7 @@ Fl_Double_Window* PADnoteUI::make_window() { coarsedet->textfont(1); coarsedet->textsize(11); coarsedet->callback((Fl_Callback*)cb_coarsedet); - coarsedet->align(FL_ALIGN_TOP_LEFT); + coarsedet->align(Fl_Align(FL_ALIGN_TOP_LEFT)); int k=pars->PCoarseDetune%1024; if (k>=512) k-=1024; o->value(k); @@ -1104,7 +1104,7 @@ Fl_Double_Window* PADnoteUI::make_window() { freqlfo->labelfont(0); freqlfo->labelsize(14); freqlfo->labelcolor(FL_FOREGROUND_COLOR); - freqlfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + freqlfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); freqlfo->when(FL_WHEN_RELEASE); o->init(pars->FreqLfo); freqlfo->end(); @@ -1127,7 +1127,7 @@ Fl_Double_Window* PADnoteUI::make_window() { detunevalueoutput->textfont(1); detunevalueoutput->textsize(10); detunevalueoutput->callback((Fl_Callback*)cb_detunevalueoutput); - detunevalueoutput->align(FL_ALIGN_TOP_LEFT); + detunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune(pars->PDetuneType,0,pars->PDetune)); } // Fl_Value_Output* detunevalueoutput { Fl_Choice* o = detunetype = new Fl_Choice(450, 335, 75, 15, "Detune Type"); @@ -1136,7 +1136,7 @@ Fl_Double_Window* PADnoteUI::make_window() { detunetype->textfont(1); detunetype->textsize(10); detunetype->callback((Fl_Callback*)cb_detunetype); - detunetype->align(FL_ALIGN_TOP_LEFT); + detunetype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents"); o->value(pars->PDetuneType-1); } // Fl_Choice* detunetype @@ -1161,7 +1161,7 @@ cy)"); fixedfreqetdial->maximum(127); fixedfreqetdial->step(1); fixedfreqetdial->callback((Fl_Callback*)cb_fixedfreqetdial); - fixedfreqetdial->align(FL_ALIGN_RIGHT); + fixedfreqetdial->align(Fl_Align(FL_ALIGN_RIGHT)); fixedfreqetdial->when(FL_WHEN_CHANGED); o->value(pars->PfixedfreqET); if (pars->Pfixedfreq==0) o->deactivate(); @@ -1173,7 +1173,7 @@ cy)"); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Value_Slider* o = volume = new Fl_Value_Slider(10, 50, 160, 15, "Vol"); volume->tooltip("Volume"); volume->type(5); @@ -1182,7 +1182,7 @@ cy)"); volume->maximum(127); volume->step(1); volume->callback((Fl_Callback*)cb_volume); - volume->align(FL_ALIGN_RIGHT); + volume->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->PVolume); } // Fl_Value_Slider* volume { Fl_Value_Slider* o = vsns = new Fl_Value_Slider(10, 70, 160, 15, "V.Sns"); @@ -1193,7 +1193,7 @@ cy)"); vsns->maximum(127); vsns->step(1); vsns->callback((Fl_Callback*)cb_vsns); - vsns->align(FL_ALIGN_RIGHT); + vsns->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->PAmpVelocityScaleFunction); } // Fl_Value_Slider* vsns { WidgetPDial* o = pan = new WidgetPDial(210, 45, 30, 30, "Pan"); @@ -1208,7 +1208,7 @@ cy)"); pan->maximum(127); pan->step(1); pan->callback((Fl_Callback*)cb_pan); - pan->align(FL_ALIGN_BOTTOM); + pan->align(Fl_Align(FL_ALIGN_BOTTOM)); pan->when(FL_WHEN_CHANGED); o->value(pars->PPanning); } // WidgetPDial* pan @@ -1224,7 +1224,7 @@ cy)"); pstr->maximum(127); pstr->step(1); pstr->callback((Fl_Callback*)cb_pstr); - pstr->align(FL_ALIGN_TOP); + pstr->align(Fl_Align(FL_ALIGN_TOP)); pstr->when(FL_WHEN_CHANGED); o->value(pars->PPunchStrength); } // WidgetPDial* pstr @@ -1240,7 +1240,7 @@ cy)"); pt->maximum(127); pt->step(1); pt->callback((Fl_Callback*)cb_pt); - pt->align(FL_ALIGN_TOP); + pt->align(Fl_Align(FL_ALIGN_TOP)); pt->when(FL_WHEN_CHANGED); o->value(pars->PPunchTime); } // WidgetPDial* pt @@ -1256,7 +1256,7 @@ cy)"); pstc->maximum(127); pstc->step(1); pstc->callback((Fl_Callback*)cb_pstc); - pstc->align(FL_ALIGN_TOP); + pstc->align(Fl_Align(FL_ALIGN_TOP)); pstc->when(FL_WHEN_CHANGED); o->value(pars->PPunchStretch); } // WidgetPDial* pstc @@ -1272,7 +1272,7 @@ cy)"); pvel->maximum(127); pvel->step(1); pvel->callback((Fl_Callback*)cb_pvel); - pvel->align(FL_ALIGN_TOP); + pvel->align(Fl_Align(FL_ALIGN_TOP)); pvel->when(FL_WHEN_CHANGED); o->value(pars->PPunchVelocitySensing); } // WidgetPDial* pvel @@ -1284,7 +1284,7 @@ cy)"); ampenv->labelfont(0); ampenv->labelsize(14); ampenv->labelcolor(FL_FOREGROUND_COLOR); - ampenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + ampenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); ampenv->when(FL_WHEN_RELEASE); o->init(pars->AmpEnvelope); ampenv->end(); @@ -1297,7 +1297,7 @@ cy)"); amplfo->labelfont(0); amplfo->labelsize(14); amplfo->labelcolor(FL_FOREGROUND_COLOR); - amplfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + amplfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); amplfo->when(FL_WHEN_RELEASE); o->init(pars->AmpLfo); amplfo->end(); @@ -1314,7 +1314,7 @@ cy)"); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); o->labelsize(13); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = filterenv = new EnvelopeUI(250, 130, 275, 70, "PADSynth - Filter Envelope"); filterenv->box(FL_FLAT_BOX); filterenv->color((Fl_Color)51); @@ -1323,7 +1323,7 @@ cy)"); filterenv->labelfont(0); filterenv->labelsize(14); filterenv->labelcolor(FL_FOREGROUND_COLOR); - filterenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterenv->when(FL_WHEN_RELEASE); o->init(pars->FilterEnvelope); filterenv->end(); @@ -1336,7 +1336,7 @@ cy)"); filterlfo->labelfont(0); filterlfo->labelsize(14); filterlfo->labelcolor(FL_FOREGROUND_COLOR); - filterlfo->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterlfo->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterlfo->when(FL_WHEN_RELEASE); o->init(pars->FilterLfo); filterlfo->end(); @@ -1349,7 +1349,7 @@ cy)"); filterui->labelfont(0); filterui->labelsize(14); filterui->labelcolor(FL_FOREGROUND_COLOR); - filterui->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterui->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterui->when(FL_WHEN_RELEASE); o->init(pars->GlobalFilter,&pars->PFilterVelocityScale,&pars->PFilterVelocityScaleFunction); filterui->end(); @@ -1394,7 +1394,7 @@ cy)"); o->color(FL_WHITE); o->labelsize(11); o->callback((Fl_Callback*)cb_export); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o padnotewindow->end(); } // Fl_Double_Window* padnotewindow diff --git a/plugins/zynaddsubfx/src/UI/PADnoteUI.h b/plugins/zynaddsubfx/src/UI/PADnoteUI.h index 79fd94b00..e21f494de 100644 --- a/plugins/zynaddsubfx/src/UI/PADnoteUI.h +++ b/plugins/zynaddsubfx/src/UI/PADnoteUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef PADnoteUI_h #define PADnoteUI_h diff --git a/plugins/zynaddsubfx/src/UI/PartUI.cc b/plugins/zynaddsubfx/src/UI/PartUI.cc index 8c370ba41..3c1d209ee 100644 --- a/plugins/zynaddsubfx/src/UI/PartUI.cc +++ b/plugins/zynaddsubfx/src/UI/PartUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "PartUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -21,7 +21,7 @@ Fl_Group* PartSysEffSend::make_window() { syseffsend->labelsize(14); syseffsend->labelcolor(FL_FOREGROUND_COLOR); syseffsend->user_data((void*)(this)); - syseffsend->align(FL_ALIGN_TOP); + syseffsend->align(Fl_Align(FL_ALIGN_TOP)); syseffsend->when(FL_WHEN_RELEASE); { WidgetPDial* o = new WidgetPDial(0, 0, 25, 25, "01"); o->box(FL_ROUND_UP_BOX); @@ -34,7 +34,7 @@ Fl_Group* PartSysEffSend::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_01); - o->align(130); + o->align(Fl_Align(130)); o->when(FL_WHEN_CHANGED); o->size(25,25); o->value(master->Psysefxvol[neff][npart]); @@ -209,7 +209,7 @@ Fl_Group* PartKitItem::make_window() { partkititem->labelsize(14); partkititem->labelcolor(FL_FOREGROUND_COLOR); partkititem->user_data((void*)(this)); - partkititem->align(FL_ALIGN_TOP); + partkititem->align(Fl_Align(FL_ALIGN_TOP)); partkititem->when(FL_WHEN_RELEASE); { Fl_Group* o = partkititemgroup = new Fl_Group(55, 0, 605, 20); partkititemgroup->box(FL_FLAT_BOX); @@ -259,7 +259,7 @@ Fl_Group* PartKitItem::make_window() { mutedcheck->labelfont(1); mutedcheck->labelsize(11); mutedcheck->callback((Fl_Callback*)cb_mutedcheck); - mutedcheck->align(FL_ALIGN_LEFT); + mutedcheck->align(Fl_Align(FL_ALIGN_LEFT)); o->value(part->kit[n].Pmuted); } // Fl_Check_Button* mutedcheck { Fl_Counter* o = maxkcounter = new Fl_Counter(335, 0, 55, 15); @@ -276,7 +276,7 @@ Fl_Group* PartKitItem::make_window() { labelbutton->labelfont(1); labelbutton->labelsize(10); labelbutton->callback((Fl_Callback*)cb_labelbutton); - labelbutton->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + labelbutton->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); o->label((char *)part->kit[n].Pname); } // Fl_Button* labelbutton { Fl_Check_Button* o = adcheck = new Fl_Check_Button(400, 0, 20, 15); @@ -284,7 +284,7 @@ Fl_Group* PartKitItem::make_window() { adcheck->labelfont(1); adcheck->labelsize(11); adcheck->callback((Fl_Callback*)cb_adcheck); - adcheck->align(FL_ALIGN_LEFT); + adcheck->align(Fl_Align(FL_ALIGN_LEFT)); o->value(part->kit[n].Padenabled); if (n==0) o->hide(); } // Fl_Check_Button* adcheck @@ -293,7 +293,7 @@ Fl_Group* PartKitItem::make_window() { subcheck->labelfont(1); subcheck->labelsize(11); subcheck->callback((Fl_Callback*)cb_subcheck); - subcheck->align(FL_ALIGN_LEFT); + subcheck->align(Fl_Align(FL_ALIGN_LEFT)); o->value(part->kit[n].Psubenabled); if (n==0) o->hide(); } // Fl_Check_Button* subcheck @@ -303,7 +303,7 @@ Fl_Group* PartKitItem::make_window() { sendtoeffect->textfont(1); sendtoeffect->textsize(10); sendtoeffect->callback((Fl_Callback*)cb_sendtoeffect); - sendtoeffect->align(FL_ALIGN_TOP_LEFT); + sendtoeffect->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("OFF");char nrstr[10]; for(int i=0;iadd(nrstr);}; o->value(part->kit[n].Psendtoparteffect+1);if (part->kit[n].Psendtoparteffect==127) o->value(0); } // Fl_Choice* sendtoeffect @@ -319,7 +319,7 @@ Fl_Group* PartKitItem::make_window() { padcheck->labelfont(1); padcheck->labelsize(11); padcheck->callback((Fl_Callback*)cb_padcheck); - padcheck->align(FL_ALIGN_LEFT); + padcheck->align(Fl_Align(FL_ALIGN_LEFT)); o->value(part->kit[n].Ppadenabled); if (n==0) o->hide(); } // Fl_Check_Button* padcheck @@ -332,7 +332,7 @@ Fl_Group* PartKitItem::make_window() { enabledcheck->labelfont(1); enabledcheck->labelsize(13); enabledcheck->callback((Fl_Callback*)cb_enabledcheck); - enabledcheck->align(FL_ALIGN_LEFT); + enabledcheck->align(Fl_Align(FL_ALIGN_LEFT)); snprintf(label,10,"%d",n+1);o->label(strdup(label)); o->value(part->kit[n].Penabled); if (n==0) o->deactivate(); @@ -948,7 +948,7 @@ Fl_Group* PartUI::make_window() { partgroup->labelsize(14); partgroup->labelcolor(FL_FOREGROUND_COLOR); partgroup->user_data((void*)(this)); - partgroup->align(FL_ALIGN_TOP); + partgroup->align(Fl_Align(FL_ALIGN_TOP)); partgroup->when(FL_WHEN_RELEASE); { Fl_Group* o = partgroupui = new Fl_Group(0, 0, 385, 180); { WidgetPDial* o = new WidgetPDial(50, 40, 25, 25, "Pan"); @@ -962,7 +962,7 @@ Fl_Group* PartUI::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Pan); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->Ppanning); } // WidgetPDial* o @@ -972,7 +972,7 @@ Fl_Group* PartUI::make_window() { o->maximum(64); o->step(1); o->callback((Fl_Callback*)cb_KeyShift); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); o->lstep(12); o->value(part->Pkeyshift-64); } // Fl_Counter* o @@ -980,7 +980,7 @@ Fl_Group* PartUI::make_window() { o->box(FL_ENGRAVED_FRAME); o->labelfont(1); o->labelsize(10); - o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); { Fl_Pack* o = new Fl_Pack(171, 96, 115, 35); o->type(1); o->spacing(5); @@ -997,7 +997,7 @@ nge the name or middle button to change the instrument information"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)cb_Grand); - o->align(68|FL_ALIGN_INSIDE); + o->align(Fl_Align(68|FL_ALIGN_INSIDE)); o->label((char *)part->Pname); } // Fl_Button* o { Fl_Box* o = new Fl_Box(166, 81, 95, 10, "To Sys.Efx."); @@ -1048,7 +1048,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Volume); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->Pvolume); } // WidgetPDial* o @@ -1064,7 +1064,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vel); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->Pveloffs); } // WidgetPDial* o @@ -1080,7 +1080,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vel1); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->Pvelsns); } // WidgetPDial* o @@ -1131,7 +1131,7 @@ nge the name or middle button to change the instrument information"); o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_MIDI); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); char nrstr[10]; for(int i=0;iadd(nrstr); else o->add("Drms10");}; o->value(part->Prcvchn); } // Fl_Choice* o @@ -1142,7 +1142,7 @@ nge the name or middle button to change the instrument information"); keylimitlist->textfont(1); keylimitlist->textsize(10); keylimitlist->callback((Fl_Callback*)cb_keylimitlist); - keylimitlist->align(FL_ALIGN_RIGHT); + keylimitlist->align(Fl_Align(FL_ALIGN_RIGHT)); } // Fl_Choice* keylimitlist { Fl_Choice* o = new Fl_Choice(80, 130, 64, 18, "Mode :"); o->tooltip("Poly, Mono or Legato mode"); @@ -1190,7 +1190,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_PanDpth); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.panning.depth); } // WidgetPDial* o @@ -1206,7 +1206,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_FltCut); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.filtercutoff.depth); } // WidgetPDial* o @@ -1222,7 +1222,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_FltQ); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.filterq.depth); } // WidgetPDial* o @@ -1238,7 +1238,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_BwDpth); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.bandwidth.depth); } // WidgetPDial* o @@ -1254,7 +1254,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_ModWh); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.modwheel.depth); } // WidgetPDial* o @@ -1265,7 +1265,7 @@ nge the name or middle button to change the instrument information"); o->maximum(6400); o->step(1); o->callback((Fl_Callback*)cb_PWheelB); - o->align(FL_ALIGN_TOP); + o->align(Fl_Align(FL_ALIGN_TOP)); o->value(part->ctl.pitchwheel.bendrange); o->lstep(100); } // Fl_Counter* o @@ -1325,7 +1325,7 @@ nge the name or middle button to change the instrument information"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_time); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.portamento.time); } // WidgetPDial* o @@ -1345,12 +1345,12 @@ cents)"); o->down_box(FL_DOWN_BOX); o->labelsize(10); o->callback((Fl_Callback*)cb_th); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->value(part->ctl.portamento.pitchthreshtype); } // Fl_Check_Button* o { Fl_Box* o = new Fl_Box(340, 50, 55, 15, "x100 cnt."); o->labelsize(10); - o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE)); } // Fl_Box* o { WidgetPDial* o = new WidgetPDial(315, 60, 25, 25, "t.dn/up"); o->tooltip("Portamento time stretch (up/down)"); @@ -1364,7 +1364,7 @@ cents)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_t); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.portamento.updowntimestretch); } // WidgetPDial* o @@ -1386,7 +1386,7 @@ cents)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_BWdpth); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.resonancebandwidth.depth); } // WidgetPDial* o @@ -1402,7 +1402,7 @@ cents)"); o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_CFdpth); - o->align(FL_ALIGN_BOTTOM); + o->align(Fl_Align(FL_ALIGN_BOTTOM)); o->when(FL_WHEN_CHANGED); o->value(part->ctl.resonancecenter.depth); } // WidgetPDial* o @@ -1413,7 +1413,7 @@ cents)"); o->down_box(FL_DOWN_BOX); o->labelsize(10); o->callback((Fl_Callback*)cb_Exp); - o->align(132|FL_ALIGN_INSIDE); + o->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(part->ctl.modwheel.exponential); } // Fl_Check_Button* o { Fl_Check_Button* o = new Fl_Check_Button(85, 15, 35, 25, "Exp BW"); @@ -1421,7 +1421,7 @@ cents)"); o->down_box(FL_DOWN_BOX); o->labelsize(10); o->callback((Fl_Callback*)cb_Exp1); - o->align(132|FL_ALIGN_INSIDE); + o->align(Fl_Align(132|FL_ALIGN_INSIDE)); o->value(part->ctl.bandwidth.exponential); } // Fl_Check_Button* o ctlwindow->end(); @@ -1436,7 +1436,7 @@ cents)"); inseffnocounter->step(1); inseffnocounter->textfont(1); inseffnocounter->callback((Fl_Callback*)cb_inseffnocounter); - inseffnocounter->align(FL_ALIGN_BOTTOM_LEFT); + inseffnocounter->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); o->bounds(1,NUM_PART_EFX); o->value(ninseff+1); } // Fl_Counter* inseffnocounter @@ -1444,7 +1444,7 @@ cents)"); insefftype->down_box(FL_BORDER_BOX); insefftype->labelsize(10); insefftype->callback((Fl_Callback*)cb_insefftype); - insefftype->align(FL_ALIGN_BOTTOM_LEFT); + insefftype->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); insefftype->menu(menu_insefftype); o->value(part->partefx[ninseff]->geteffect()); } // Fl_Choice* insefftype @@ -1459,7 +1459,7 @@ cents)"); inseffectui->labelfont(0); inseffectui->labelsize(14); inseffectui->labelcolor(FL_FOREGROUND_COLOR); - inseffectui->align(FL_ALIGN_TOP); + inseffectui->align(Fl_Align(FL_ALIGN_TOP)); inseffectui->when(FL_WHEN_RELEASE); o->init(part->partefx[ninseff]); inseffectui->end(); @@ -1474,7 +1474,7 @@ cents)"); sendtochoice->down_box(FL_BORDER_BOX); sendtochoice->labelsize(10); sendtochoice->callback((Fl_Callback*)cb_sendtochoice); - sendtochoice->align(FL_ALIGN_BOTTOM_LEFT); + sendtochoice->align(Fl_Align(FL_ALIGN_BOTTOM_LEFT)); sendtochoice->menu(menu_sendtochoice); int x=part->Pefxroute[ninseff]; if (x==127) x=1; o->value(x); @@ -1523,32 +1523,32 @@ cents)"); { Fl_Box* o = new Fl_Box(5, 0, 25, 15, "No."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(55, 0, 25, 15, "M."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(235, 0, 40, 15, "Min.k"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(345, 0, 40, 15, "Max.k"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(405, 0, 50, 15, "ADsynth"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(470, 0, 60, 15, "SUBsynth"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Choice* o = new Fl_Choice(35, 350, 70, 15, "Mode"); o->down_box(FL_BORDER_BOX); @@ -1568,12 +1568,12 @@ cents)"); { Fl_Box* o = new Fl_Box(620, 0, 30, 15, "FX.r."); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(540, 0, 60, 15, "PADsynth"); o->labelfont(1); o->labelsize(11); - o->align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_BOTTOM|FL_ALIGN_INSIDE)); } // Fl_Box* o instrumentkitlist->end(); } // Fl_Double_Window* instrumentkitlist @@ -1591,7 +1591,7 @@ cents)"); padeditbutton->labelfont(1); padeditbutton->labelsize(13); padeditbutton->callback((Fl_Callback*)cb_padeditbutton1); - padeditbutton->align(FL_ALIGN_WRAP); + padeditbutton->align(Fl_Align(FL_ALIGN_WRAP)); if (part->kit[0].Ppadenabled==0) o->deactivate(); } // Fl_Button* padeditbutton { Fl_Check_Button* o = padsynenabledcheck = new Fl_Check_Button(215, 255, 80, 20, "Enabled"); @@ -1628,7 +1628,7 @@ cents)"); adeditbutton->labelfont(1); adeditbutton->labelsize(13); adeditbutton->callback((Fl_Callback*)cb_adeditbutton1); - adeditbutton->align(FL_ALIGN_WRAP); + adeditbutton->align(Fl_Align(FL_ALIGN_WRAP)); if (part->kit[0].Padenabled==0) o->deactivate(); } // Fl_Button* adeditbutton o->end(); @@ -1654,7 +1654,7 @@ cents)"); subeditbutton->labelfont(1); subeditbutton->labelsize(13); subeditbutton->callback((Fl_Callback*)cb_subeditbutton1); - subeditbutton->align(FL_ALIGN_WRAP); + subeditbutton->align(Fl_Align(FL_ALIGN_WRAP)); if (part->kit[0].Psubenabled==0) o->deactivate(); } // Fl_Button* subeditbutton o->end(); @@ -1665,7 +1665,7 @@ cents)"); o->selection_color((Fl_Color)220); o->labelfont(1); o->callback((Fl_Callback*)cb_Kit); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { Fl_Button* o = new Fl_Button(310, 290, 80, 35, "Effects"); o->box(FL_PLASTIC_UP_BOX); @@ -1683,7 +1683,7 @@ cents)"); o->color((Fl_Color)26); o->labelsize(10); o->callback((Fl_Callback*)cb_Author); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->maximum_size(MAX_INFO_TEXT_SIZE); o->value((char *) &part->info.Pauthor); } // Fl_Input* o @@ -1692,7 +1692,7 @@ cents)"); o->color((Fl_Color)26); o->labelsize(11); o->callback((Fl_Callback*)cb_Comments); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->maximum_size(MAX_INFO_TEXT_SIZE); o->value((char *) &part->info.Pcomments); } // Fl_Input* o @@ -1702,7 +1702,7 @@ cents)"); o->labelsize(11); o->textsize(10); o->callback((Fl_Callback*)cb_Type); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->menu(menu_Type); o->value(part->info.Ptype); } // Fl_Choice* o diff --git a/plugins/zynaddsubfx/src/UI/PartUI.h b/plugins/zynaddsubfx/src/UI/PartUI.h index 48b9d413e..5189b790e 100644 --- a/plugins/zynaddsubfx/src/UI/PartUI.h +++ b/plugins/zynaddsubfx/src/UI/PartUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef PartUI_h #define PartUI_h diff --git a/plugins/zynaddsubfx/src/UI/PresetsUI.cc b/plugins/zynaddsubfx/src/UI/PresetsUI.cc index 77e77fbfe..b35c868f3 100644 --- a/plugins/zynaddsubfx/src/UI/PresetsUI.cc +++ b/plugins/zynaddsubfx/src/UI/PresetsUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "PresetsUI.h" @@ -136,23 +136,23 @@ Fl_Double_Window* PresetsUI::make_window() { { copybutton = new Fl_Button(25, 385, 90, 35, "Copy to Clipboard"); copybutton->box(FL_THIN_UP_BOX); copybutton->callback((Fl_Callback*)cb_copybutton); - copybutton->align(192); + copybutton->align(Fl_Align(192)); } // Fl_Button* copybutton { Fl_Button* o = new Fl_Button(160, 385, 80, 35, "Cancel"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)cb_Cancel); - o->align(192); + o->align(Fl_Align(192)); } // Fl_Button* o { Fl_Box* o = new Fl_Box(10, 5, 40, 15, "Type:"); o->labelsize(11); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); } // Fl_Box* o { copytypetext = new Fl_Box(50, 5, 205, 15); copytypetext->box(FL_FLAT_BOX); copytypetext->color((Fl_Color)238); copytypetext->labelfont(1); copytypetext->labelsize(11); - copytypetext->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + copytypetext->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); } // Fl_Box* copytypetext { presetname = new Fl_Input(10, 355, 130, 20); presetname->callback((Fl_Callback*)cb_presetname); @@ -176,23 +176,23 @@ Fl_Double_Window* PresetsUI::make_window() { { pastebutton = new Fl_Button(25, 385, 90, 35, "Paste from Clipboard"); pastebutton->box(FL_THIN_UP_BOX); pastebutton->callback((Fl_Callback*)cb_pastebutton); - pastebutton->align(192); + pastebutton->align(Fl_Align(192)); } // Fl_Button* pastebutton { Fl_Button* o = new Fl_Button(160, 385, 80, 35, "Cancel"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)cb_Cancel1); - o->align(192); + o->align(Fl_Align(192)); } // Fl_Button* o { pastetypetext = new Fl_Box(55, 5, 200, 15); pastetypetext->box(FL_FLAT_BOX); pastetypetext->color((Fl_Color)238); pastetypetext->labelfont(1); pastetypetext->labelsize(11); - pastetypetext->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + pastetypetext->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); } // Fl_Box* pastetypetext { Fl_Box* o = new Fl_Box(15, 5, 40, 15, "Type:"); o->labelsize(11); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); } // Fl_Box* o { deletepbutton = new Fl_Button(180, 355, 75, 20, "Delete"); deletepbutton->box(FL_THIN_UP_BOX); diff --git a/plugins/zynaddsubfx/src/UI/PresetsUI.h b/plugins/zynaddsubfx/src/UI/PresetsUI.h index 6dc3bd080..4adf0f1c0 100644 --- a/plugins/zynaddsubfx/src/UI/PresetsUI.h +++ b/plugins/zynaddsubfx/src/UI/PresetsUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef PresetsUI_h #define PresetsUI_h diff --git a/plugins/zynaddsubfx/src/UI/ResonanceUI.cc b/plugins/zynaddsubfx/src/UI/ResonanceUI.cc index 7fbfdb178..8718cd85d 100644 --- a/plugins/zynaddsubfx/src/UI/ResonanceUI.cc +++ b/plugins/zynaddsubfx/src/UI/ResonanceUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "ResonanceUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -322,7 +322,7 @@ Fl_Double_Window* ResonanceUI::make_window() { khzvalue->step(0.01); khzvalue->textfont(1); khzvalue->textsize(12); - khzvalue->align(FL_ALIGN_RIGHT); + khzvalue->align(Fl_Align(FL_ALIGN_RIGHT)); //this widget must be before the calling widgets } // Fl_Value_Output* khzvalue { dbvalue = new Fl_Value_Output(415, 282, 45, 18, "dB"); @@ -332,7 +332,7 @@ Fl_Double_Window* ResonanceUI::make_window() { dbvalue->step(0.1); dbvalue->textfont(1); dbvalue->textsize(12); - dbvalue->align(FL_ALIGN_RIGHT); + dbvalue->align(Fl_Align(FL_ALIGN_RIGHT)); //this widget must be before the calling widgets } // Fl_Value_Output* dbvalue { Fl_Group* o = new Fl_Group(6, 5, 768, 256); @@ -460,7 +460,7 @@ Fl_Double_Window* ResonanceUI::make_window() { centerfreq->maximum(127); centerfreq->step(1); centerfreq->callback((Fl_Callback*)cb_centerfreq); - centerfreq->align(FL_ALIGN_BOTTOM); + centerfreq->align(Fl_Align(FL_ALIGN_BOTTOM)); centerfreq->when(FL_WHEN_CHANGED); o->value(respar->Pcenterfreq); } // WidgetPDial* centerfreq @@ -475,7 +475,7 @@ Fl_Double_Window* ResonanceUI::make_window() { octavesfreq->maximum(127); octavesfreq->step(1); octavesfreq->callback((Fl_Callback*)cb_octavesfreq); - octavesfreq->align(FL_ALIGN_BOTTOM); + octavesfreq->align(Fl_Align(FL_ALIGN_BOTTOM)); octavesfreq->when(FL_WHEN_CHANGED); o->value(respar->Poctavesfreq); } // WidgetPDial* octavesfreq diff --git a/plugins/zynaddsubfx/src/UI/ResonanceUI.h b/plugins/zynaddsubfx/src/UI/ResonanceUI.h index e7c43e4db..b95475992 100644 --- a/plugins/zynaddsubfx/src/UI/ResonanceUI.h +++ b/plugins/zynaddsubfx/src/UI/ResonanceUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef ResonanceUI_h #define ResonanceUI_h diff --git a/plugins/zynaddsubfx/src/UI/SUBnoteUI.cc b/plugins/zynaddsubfx/src/UI/SUBnoteUI.cc index 6205167fe..c00c374c4 100644 --- a/plugins/zynaddsubfx/src/UI/SUBnoteUI.cc +++ b/plugins/zynaddsubfx/src/UI/SUBnoteUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "SUBnoteUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -36,7 +36,7 @@ Fl_Group* SUBnoteharmonic::make_window() { harmonic->labelsize(14); harmonic->labelcolor(FL_FOREGROUND_COLOR); harmonic->user_data((void*)(this)); - harmonic->align(FL_ALIGN_TOP); + harmonic->align(Fl_Align(FL_ALIGN_TOP)); harmonic->when(FL_WHEN_RELEASE); { Fl_Slider* o = mag = new Fl_Slider(0, 15, 10, 115); mag->tooltip("harmonic\'s magnitude"); @@ -69,13 +69,13 @@ Fl_Group* SUBnoteharmonic::make_window() { { Fl_Box* o = new Fl_Box(0, 210, 10, 15, "01"); o->labelfont(1); o->labelsize(9); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",n+1);o->label(strdup(tmp)); } // Fl_Box* o { Fl_Box* o = new Fl_Box(0, 0, 10, 15, "01"); o->labelfont(1); o->labelsize(9); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE)); char tmp[10];snprintf(tmp,10,"%d",n+1);o->label(strdup(tmp)); } // Fl_Box* o harmonic->end(); @@ -338,7 +338,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { o->box(FL_THIN_UP_FRAME); o->labeltype(FL_EMBOSSED_LABEL); o->labelfont(1); - o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { Fl_Value_Slider* o = vol = new Fl_Value_Slider(10, 25, 140, 15, "Vol"); vol->tooltip("Volume"); vol->type(5); @@ -347,7 +347,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { vol->maximum(127); vol->step(1); vol->callback((Fl_Callback*)cb_vol); - vol->align(FL_ALIGN_RIGHT); + vol->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->PVolume); } // Fl_Value_Slider* vol { Fl_Value_Slider* o = vsns = new Fl_Value_Slider(10, 45, 140, 15, "V.Sns"); @@ -358,7 +358,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { vsns->maximum(127); vsns->step(1); vsns->callback((Fl_Callback*)cb_vsns); - vsns->align(FL_ALIGN_RIGHT); + vsns->align(Fl_Align(FL_ALIGN_RIGHT)); o->value(pars->PAmpVelocityScaleFunction); } // Fl_Value_Slider* vsns { WidgetPDial* o = pan = new WidgetPDial(185, 20, 30, 30, "Pan"); @@ -373,7 +373,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { pan->maximum(127); pan->step(1); pan->callback((Fl_Callback*)cb_pan); - pan->align(FL_ALIGN_BOTTOM); + pan->align(Fl_Align(FL_ALIGN_BOTTOM)); pan->when(FL_WHEN_CHANGED); o->value(pars->PPanning); } // WidgetPDial* pan @@ -385,7 +385,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { ampenv->labelfont(0); ampenv->labelsize(14); ampenv->labelcolor(FL_FOREGROUND_COLOR); - ampenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + ampenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); ampenv->when(FL_WHEN_RELEASE); o->init(pars->AmpEnvelope); ampenv->end(); @@ -404,7 +404,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { filterstages->step(1); filterstages->textsize(10); filterstages->callback((Fl_Callback*)cb_filterstages); - filterstages->align(FL_ALIGN_TOP); + filterstages->align(Fl_Align(FL_ALIGN_TOP)); o->value(pars->Pnumstages); } // Fl_Counter* filterstages { Fl_Choice* o = magtype = new Fl_Choice(585, 340, 65, 15, "Mag.Type"); @@ -413,7 +413,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { magtype->labelsize(10); magtype->textsize(11); magtype->callback((Fl_Callback*)cb_magtype); - magtype->align(FL_ALIGN_TOP); + magtype->align(Fl_Align(FL_ALIGN_TOP)); magtype->menu(menu_magtype); o->value(pars->Phmagtype); } // Fl_Choice* magtype @@ -423,7 +423,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { start->labelsize(10); start->textsize(11); start->callback((Fl_Callback*)cb_start); - start->align(FL_ALIGN_TOP); + start->align(Fl_Align(FL_ALIGN_TOP)); start->menu(menu_start); o->value(pars->Pstart); } // Fl_Choice* start @@ -433,7 +433,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { freqsettingsui->box(FL_THIN_UP_FRAME); freqsettingsui->labeltype(FL_EMBOSSED_LABEL); freqsettingsui->labelfont(1); - freqsettingsui->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + freqsettingsui->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = freqenvelopegroup = new EnvelopeUI(445, 65, 205, 70, "SUBsynth - Frequency Envelope"); freqenvelopegroup->box(FL_FLAT_BOX); freqenvelopegroup->color((Fl_Color)51); @@ -442,7 +442,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { freqenvelopegroup->labelfont(0); freqenvelopegroup->labelsize(14); freqenvelopegroup->labelcolor(FL_FOREGROUND_COLOR); - freqenvelopegroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + freqenvelopegroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); freqenvelopegroup->when(FL_WHEN_RELEASE); o->init(pars->FreqEnvelope); if (pars->PFreqEnvelopeEnabled==0) o->deactivate(); @@ -465,7 +465,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { octave->textfont(1); octave->textsize(11); octave->callback((Fl_Callback*)cb_octave); - octave->align(FL_ALIGN_TOP); + octave->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->PCoarseDetune/1024;if (k>=8) k-=16; o->value(k); } // Fl_Counter* octave @@ -478,7 +478,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { coarsedet->textfont(1); coarsedet->textsize(11); coarsedet->callback((Fl_Callback*)cb_coarsedet); - coarsedet->align(FL_ALIGN_TOP); + coarsedet->align(Fl_Align(FL_ALIGN_TOP)); int k=pars->PCoarseDetune%1024;if (k>=512) k-=1024; o->value(k); o->lstep(10); @@ -501,7 +501,7 @@ Fl_Double_Window* SUBnoteUI::make_window() { detunevalueoutput->textfont(1); detunevalueoutput->textsize(10); detunevalueoutput->callback((Fl_Callback*)cb_detunevalueoutput); - detunevalueoutput->align(FL_ALIGN_TOP_LEFT); + detunevalueoutput->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(getdetune(pars->PDetuneType,0,pars->PDetune)); } // Fl_Value_Output* detunevalueoutput { Fl_Check_Button* o = hz440 = new Fl_Check_Button(555, 45, 50, 15, "440Hz"); @@ -525,7 +525,7 @@ cy)"); fixedfreqetdial->maximum(127); fixedfreqetdial->step(1); fixedfreqetdial->callback((Fl_Callback*)cb_fixedfreqetdial); - fixedfreqetdial->align(FL_ALIGN_RIGHT); + fixedfreqetdial->align(Fl_Align(FL_ALIGN_RIGHT)); fixedfreqetdial->when(FL_WHEN_CHANGED); o->value(pars->PfixedfreqET); if (pars->Pfixedfreq==0) o->deactivate(); @@ -536,7 +536,7 @@ cy)"); detunetype->textfont(1); detunetype->textsize(10); detunetype->callback((Fl_Callback*)cb_detunetype); - detunetype->align(FL_ALIGN_TOP_LEFT); + detunetype->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents"); o->value(pars->PDetuneType-1); } // Fl_Choice* detunetype @@ -561,7 +561,7 @@ cy)"); bandwidthsettingsui->box(FL_THIN_UP_FRAME); bandwidthsettingsui->labeltype(FL_EMBOSSED_LABEL); bandwidthsettingsui->labelfont(1); - bandwidthsettingsui->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + bandwidthsettingsui->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = bandwidthenvelopegroup = new EnvelopeUI(225, 65, 205, 70, "SUBsynth - BandWidth Envelope"); bandwidthenvelopegroup->box(FL_FLAT_BOX); bandwidthenvelopegroup->color((Fl_Color)51); @@ -570,7 +570,7 @@ cy)"); bandwidthenvelopegroup->labelfont(0); bandwidthenvelopegroup->labelsize(14); bandwidthenvelopegroup->labelcolor(FL_FOREGROUND_COLOR); - bandwidthenvelopegroup->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + bandwidthenvelopegroup->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); bandwidthenvelopegroup->when(FL_WHEN_RELEASE); o->init(pars->BandWidthEnvelope); if (pars->PBandWidthEnvelopeEnabled==0) o->deactivate(); @@ -590,7 +590,7 @@ cy)"); bandwidth->maximum(127); bandwidth->step(1); bandwidth->callback((Fl_Callback*)cb_bandwidth); - bandwidth->align(FL_ALIGN_TOP); + bandwidth->align(Fl_Align(FL_ALIGN_TOP)); o->value(pars->Pbandwidth); } // Fl_Value_Slider* bandwidth { Fl_Value_Slider* o = bwidthscale = new Fl_Value_Slider(345, 40, 90, 15, "B.Width Scale"); @@ -602,7 +602,7 @@ cy)"); bwidthscale->maximum(63); bwidthscale->step(1); bwidthscale->callback((Fl_Callback*)cb_bwidthscale); - bwidthscale->align(FL_ALIGN_TOP); + bwidthscale->align(Fl_Align(FL_ALIGN_TOP)); o->value(pars->Pbwscale-64); } // Fl_Value_Slider* bwidthscale bandwidthsettingsui->end(); @@ -612,7 +612,7 @@ cy)"); globalfiltergroup->labeltype(FL_EMBOSSED_LABEL); globalfiltergroup->labelfont(1); globalfiltergroup->labelsize(13); - globalfiltergroup->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); + globalfiltergroup->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE)); { EnvelopeUI* o = filterenv = new EnvelopeUI(445, 250, 275, 70, "SUBsynth - Filter Envelope"); filterenv->box(FL_FLAT_BOX); filterenv->color((Fl_Color)51); @@ -621,7 +621,7 @@ cy)"); filterenv->labelfont(0); filterenv->labelsize(14); filterenv->labelcolor(FL_FOREGROUND_COLOR); - filterenv->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterenv->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterenv->when(FL_WHEN_RELEASE); o->init(pars->GlobalFilterEnvelope); filterenv->end(); @@ -634,7 +634,7 @@ cy)"); filterui->labelfont(0); filterui->labelsize(14); filterui->labelcolor(FL_FOREGROUND_COLOR); - filterui->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + filterui->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE)); filterui->when(FL_WHEN_RELEASE); o->init(pars->GlobalFilter,&pars->PGlobalFilterVelocityScale,&pars->PGlobalFilterVelocityScaleFunction); filterui->end(); diff --git a/plugins/zynaddsubfx/src/UI/SUBnoteUI.h b/plugins/zynaddsubfx/src/UI/SUBnoteUI.h index b8bdfff60..569e69d3a 100644 --- a/plugins/zynaddsubfx/src/UI/SUBnoteUI.h +++ b/plugins/zynaddsubfx/src/UI/SUBnoteUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef SUBnoteUI_h #define SUBnoteUI_h diff --git a/plugins/zynaddsubfx/src/UI/SeqUI.cc b/plugins/zynaddsubfx/src/UI/SeqUI.cc index 84c1b2e61..5e66aea3b 100644 --- a/plugins/zynaddsubfx/src/UI/SeqUI.cc +++ b/plugins/zynaddsubfx/src/UI/SeqUI.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "SeqUI.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -51,7 +51,7 @@ Fl_Double_Window* SeqUI::make_window() { playbutton->labelfont(1); playbutton->labelsize(13); playbutton->callback((Fl_Callback*)cb_playbutton); - playbutton->align(FL_ALIGN_BOTTOM); + playbutton->align(Fl_Align(FL_ALIGN_BOTTOM)); } // Fl_Button* playbutton { stopbutton_play = new Fl_Button(175, 29, 30, 31, "Stop"); stopbutton_play->tooltip("Stop Playing"); @@ -60,14 +60,14 @@ Fl_Double_Window* SeqUI::make_window() { stopbutton_play->labelfont(1); stopbutton_play->labelsize(13); stopbutton_play->callback((Fl_Callback*)cb_stopbutton_play); - stopbutton_play->align(FL_ALIGN_BOTTOM); + stopbutton_play->align(Fl_Align(FL_ALIGN_BOTTOM)); stopbutton_play->deactivate(); } // Fl_Button* stopbutton_play o->end(); } // Fl_Group* o { Fl_Button* o = new Fl_Button(20, 25, 75, 55, "Open test.mid"); o->callback((Fl_Callback*)cb_Open); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Button* o { Fl_Value_Slider* o = new Fl_Value_Slider(15, 105, 190, 20, "Play speed"); o->type(5); @@ -80,7 +80,7 @@ Fl_Double_Window* SeqUI::make_window() { { Fl_Box* o = new Fl_Box(25, 155, 225, 90, "This is not finished"); o->labelfont(1); o->labelsize(22); - o->align(FL_ALIGN_WRAP); + o->align(Fl_Align(FL_ALIGN_WRAP)); } // Fl_Box* o seqwin->end(); } // Fl_Double_Window* seqwin diff --git a/plugins/zynaddsubfx/src/UI/SeqUI.h b/plugins/zynaddsubfx/src/UI/SeqUI.h index 67dbdf42a..0cdad0544 100644 --- a/plugins/zynaddsubfx/src/UI/SeqUI.h +++ b/plugins/zynaddsubfx/src/UI/SeqUI.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef SeqUI_h #define SeqUI_h diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc index e32a7cd8e..4fc68517d 100644 --- a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc +++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "VirKeyboard.h" //Copyright (c) 2002-2005 Nasca Octavian Paul @@ -336,7 +336,7 @@ Fl_Double_Window* VirKeyboard::make_window() { virkeys->labelfont(0); virkeys->labelsize(14); virkeys->labelcolor(FL_FOREGROUND_COLOR); - virkeys->align(FL_ALIGN_CENTER); + virkeys->align(Fl_Align(FL_ALIGN_CENTER)); virkeys->when(FL_WHEN_RELEASE); o->init(master); } // VirKeys* virkeys @@ -350,7 +350,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_qwer); - o->align(FL_ALIGN_LEFT); + o->align(Fl_Align(FL_ALIGN_LEFT)); o->when(FL_WHEN_RELEASE_ALWAYS); o->value(virkeys->keyoct1); } // Fl_Counter* o @@ -364,7 +364,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_zxcv); - o->align(FL_ALIGN_LEFT); + o->align(Fl_Align(FL_ALIGN_LEFT)); o->when(FL_WHEN_RELEASE_ALWAYS); o->value(virkeys->keyoct2); } // Fl_Counter* o @@ -377,7 +377,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vel); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->value(virkeys->midivel); } // Fl_Value_Slider* o { Fl_Counter* o = new Fl_Counter(255, 100, 55, 20, "Oct."); @@ -390,7 +390,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->textfont(1); o->textsize(11); o->callback((Fl_Callback*)cb_Oct); - o->align(FL_ALIGN_LEFT); + o->align(Fl_Align(FL_ALIGN_LEFT)); o->when(FL_WHEN_RELEASE_ALWAYS); o->value(virkeys->midioct); } // Fl_Counter* o @@ -410,7 +410,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->value(64); o->textsize(7); o->callback((Fl_Callback*)cb_Cval); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); } // Fl_Value_Slider* o { Fl_Choice* o = new Fl_Choice(435, 105, 100, 15, "Controller"); o->down_box(FL_BORDER_BOX); @@ -418,7 +418,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->textfont(1); o->textsize(10); o->callback((Fl_Callback*)cb_Controller); - o->align(FL_ALIGN_TOP_LEFT); + o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->when(FL_WHEN_RELEASE_ALWAYS); o->menu(menu_Controller); midictl=C_filtercutoff;o->value(7); @@ -431,7 +431,7 @@ Fl_Double_Window* VirKeyboard::make_window() { pitchwheelroller->maximum(8192); pitchwheelroller->step(64); pitchwheelroller->callback((Fl_Callback*)cb_pitchwheelroller); - pitchwheelroller->align(FL_ALIGN_TOP); + pitchwheelroller->align(Fl_Align(FL_ALIGN_TOP)); pitchwheelroller->when(3); } // Fl_Roller* pitchwheelroller { Fl_Button* o = new Fl_Button(625, 110, 20, 15, "R"); @@ -452,7 +452,7 @@ Fl_Double_Window* VirKeyboard::make_window() { o->maximum(127); o->step(1); o->callback((Fl_Callback*)cb_Vrnd); - o->align(129); + o->align(Fl_Align(129)); o->when(FL_WHEN_CHANGED); o->value(virkeys->rndvelocity); } // WidgetPDial* o @@ -463,7 +463,7 @@ Fl_Double_Window* VirKeyboard::make_window() { partrcv->textfont(1); partrcv->textsize(10); partrcv->callback((Fl_Callback*)cb_partrcv); - partrcv->align(FL_ALIGN_TOP_LEFT); + partrcv->align(Fl_Align(FL_ALIGN_TOP_LEFT)); char nrstr[10]; for(int i=0;iadd(nrstr); else o->add("Drum10");}; o->value(virkeys->midich); } // Fl_Choice* partrcv diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.h b/plugins/zynaddsubfx/src/UI/VirKeyboard.h index e57d3dcca..bfcec5b53 100644 --- a/plugins/zynaddsubfx/src/UI/VirKeyboard.h +++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef VirKeyboard_h #define VirKeyboard_h diff --git a/plugins/zynaddsubfx/src/UI/WidgetPDial.cc b/plugins/zynaddsubfx/src/UI/WidgetPDial.cc index 4e2b96d06..bd1d43653 100644 --- a/plugins/zynaddsubfx/src/UI/WidgetPDial.cc +++ b/plugins/zynaddsubfx/src/UI/WidgetPDial.cc @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #include "WidgetPDial.h" //Copyright (c) 2003-2005 Nasca Octavian Paul diff --git a/plugins/zynaddsubfx/src/UI/WidgetPDial.h b/plugins/zynaddsubfx/src/UI/WidgetPDial.h index c602a8bac..7f9759c1e 100644 --- a/plugins/zynaddsubfx/src/UI/WidgetPDial.h +++ b/plugins/zynaddsubfx/src/UI/WidgetPDial.h @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0109 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef WidgetPDial_h #define WidgetPDial_h