1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-04 14:19:30 +02:00

EQ Tweaks for Independence

Added:
- Independent Help pages
- Independent Curves

Also tweaked for the new namings
This commit is contained in:
James Crook 2019-08-23 18:41:26 +01:00
parent 8031bf7c14
commit a1f0a70ddd
3 changed files with 15 additions and 9 deletions

View File

@ -303,9 +303,9 @@ EffectEqualization::~EffectEqualization()
ComponentInterfaceSymbol EffectEqualization::GetSymbol() ComponentInterfaceSymbol EffectEqualization::GetSymbol()
{ {
if( mOptions == kEqOptionGraphic ) if( mOptions == kEqOptionGraphic )
return GRAPHICEQ_PLUGIN_SYMBOL; return EQ_GRAPHIC_PLUGIN_SYMBOL;
if( mOptions == kEqOptionCurve ) if( mOptions == kEqOptionCurve )
return FILTERCURVE_PLUGIN_SYMBOL; return EQ_CURVES_PLUGIN_SYMBOL;
return EQUALIZATION_PLUGIN_SYMBOL; return EQUALIZATION_PLUGIN_SYMBOL;
} }
@ -316,6 +316,11 @@ wxString EffectEqualization::GetDescription()
wxString EffectEqualization::ManualPage() wxString EffectEqualization::ManualPage()
{ {
if( mOptions == kEqOptionGraphic )
return wxT("EQ Graphic");
if( mOptions == kEqOptionCurve )
return wxT("EQ Curves");
return wxT("Equalization"); return wxT("Equalization");
} }
@ -651,7 +656,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
{ {
wxWindow *const parent = S.GetParent(); wxWindow *const parent = S.GetParent();
LoadCurves(); //LoadCurves();
auto trackList = inputTracks(); auto trackList = inputTracks();
const auto t = trackList const auto t = trackList
@ -1033,6 +1038,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
szrV->Show(szr1, true); szrV->Show(szr1, true);
mUIParent->SetSizeHints(mUIParent->GetBestSize()); mUIParent->SetSizeHints(mUIParent->GetBestSize());
} }
ForceRecalc();
return; return;
} }

View File

@ -24,10 +24,10 @@
#define EQUALIZATION_PLUGIN_SYMBOL \ #define EQUALIZATION_PLUGIN_SYMBOL \
ComponentInterfaceSymbol{ XO("Equalization") } ComponentInterfaceSymbol{ XO("Equalization") }
#define GRAPHICEQ_PLUGIN_SYMBOL \ #define EQ_GRAPHIC_PLUGIN_SYMBOL \
ComponentInterfaceSymbol{ wxT("Graphic EQ"), XO("Graphic EQ") } ComponentInterfaceSymbol{ wxT("EQ Graphic"), XO("EQ Graphic") }
#define FILTERCURVE_PLUGIN_SYMBOL \ #define EQ_CURVES_PLUGIN_SYMBOL \
ComponentInterfaceSymbol{ wxT("Filter Curve"), XO("Filter Curve") } ComponentInterfaceSymbol{ wxT("EQ Curves"), XO("EQ Curves") }
// Flags to specialise the UI // Flags to specialise the UI
const int kEqOptionGraphic =1; const int kEqOptionGraphic =1;

View File

@ -120,8 +120,8 @@
EFFECT( EQUALIZATION, EffectEqualization, (kEqLegacy) ) \ EFFECT( EQUALIZATION, EffectEqualization, (kEqLegacy) ) \
EFFECT( FADEIN, EffectFade, (true) ) \ EFFECT( FADEIN, EffectFade, (true) ) \
EFFECT( FADEOUT, EffectFade, (false) ) \ EFFECT( FADEOUT, EffectFade, (false) ) \
EFFECT( FILTERCURVE, EffectEqualization, (kEqOptionCurve) ) \ EFFECT( EQ_CURVES, EffectEqualization, (kEqOptionCurve) ) \
EFFECT( GRAPHICEQ, EffectEqualization, (kEqOptionGraphic) ) \ EFFECT( EQ_GRAPHIC, EffectEqualization, (kEqOptionGraphic) ) \
EFFECT( INVERT, EffectInvert, () ) \ EFFECT( INVERT, EffectInvert, () ) \
EFFECT( NORMALIZE, EffectNormalize, () ) \ EFFECT( NORMALIZE, EffectNormalize, () ) \
EFFECT( PHASER, EffectPhaser, () ) \ EFFECT( PHASER, EffectPhaser, () ) \