diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 172438aff..7089ad6c4 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -303,9 +303,9 @@ EffectEqualization::~EffectEqualization() ComponentInterfaceSymbol EffectEqualization::GetSymbol() { if( mOptions == kEqOptionGraphic ) - return GRAPHICEQ_PLUGIN_SYMBOL; + return EQ_GRAPHIC_PLUGIN_SYMBOL; if( mOptions == kEqOptionCurve ) - return FILTERCURVE_PLUGIN_SYMBOL; + return EQ_CURVES_PLUGIN_SYMBOL; return EQUALIZATION_PLUGIN_SYMBOL; } @@ -316,6 +316,11 @@ wxString EffectEqualization::GetDescription() wxString EffectEqualization::ManualPage() { + + if( mOptions == kEqOptionGraphic ) + return wxT("EQ Graphic"); + if( mOptions == kEqOptionCurve ) + return wxT("EQ Curves"); return wxT("Equalization"); } @@ -651,7 +656,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S) { wxWindow *const parent = S.GetParent(); - LoadCurves(); + //LoadCurves(); auto trackList = inputTracks(); const auto t = trackList @@ -1033,6 +1038,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S) szrV->Show(szr1, true); mUIParent->SetSizeHints(mUIParent->GetBestSize()); } + ForceRecalc(); return; } diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index ad1037ff2..5fa4436f2 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -24,10 +24,10 @@ #define EQUALIZATION_PLUGIN_SYMBOL \ ComponentInterfaceSymbol{ XO("Equalization") } -#define GRAPHICEQ_PLUGIN_SYMBOL \ -ComponentInterfaceSymbol{ wxT("Graphic EQ"), XO("Graphic EQ") } -#define FILTERCURVE_PLUGIN_SYMBOL \ -ComponentInterfaceSymbol{ wxT("Filter Curve"), XO("Filter Curve") } +#define EQ_GRAPHIC_PLUGIN_SYMBOL \ +ComponentInterfaceSymbol{ wxT("EQ Graphic"), XO("EQ Graphic") } +#define EQ_CURVES_PLUGIN_SYMBOL \ +ComponentInterfaceSymbol{ wxT("EQ Curves"), XO("EQ Curves") } // Flags to specialise the UI const int kEqOptionGraphic =1; diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index 991ecf058..3db0834c2 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -120,8 +120,8 @@ EFFECT( EQUALIZATION, EffectEqualization, (kEqLegacy) ) \ EFFECT( FADEIN, EffectFade, (true) ) \ EFFECT( FADEOUT, EffectFade, (false) ) \ - EFFECT( FILTERCURVE, EffectEqualization, (kEqOptionCurve) ) \ - EFFECT( GRAPHICEQ, EffectEqualization, (kEqOptionGraphic) ) \ + EFFECT( EQ_CURVES, EffectEqualization, (kEqOptionCurve) ) \ + EFFECT( EQ_GRAPHIC, EffectEqualization, (kEqOptionGraphic) ) \ EFFECT( INVERT, EffectInvert, () ) \ EFFECT( NORMALIZE, EffectNormalize, () ) \ EFFECT( PHASER, EffectPhaser, () ) \