Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Rename EQ effects and lose 'extra knobs'

Browse Source 
Team agreed on new names, and to remove redundant controls that are (mostly) just confusing.  Also retired EQ effect.
This commit is contained in:
James Crook 2019-08-27 17:28:57 +01:00
parent c32b92c377
commit 45ddc8c413
4 changed files with 59 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/ScreenshotCommand.cpp
View File

@ -503,8 +503,8 @@ void ScreenshotCommand::CaptureEffects(
"Distortion...",
"Echo...",
//"Equalization...",
"EQ Graphic...",
"EQ Curves...",
"Filter Curve...",
"Graphic EQ...",
//"Fade In",
//"Fade Out",
//"Invert",

86
src/effects/Equalization.cpp
View File

@ -179,7 +179,7 @@ static const double kThirdOct[] =
// Define keys, defaults, minimums, and maximums for the effect parameters
//
// Name Type Key Def Min Max Scale
Param( FilterLength, int, wxT("FilterLength"), 4001, 21, 8191, 0 );
Param( FilterLength, int, wxT("FilterLength"), 8191, 21, 8191, 0 );
Param( CurveName, wxChar*, wxT("CurveName"), wxT("unnamed"), wxT(""), wxT(""), wxT(""));
Param( InterpLin, bool, wxT("InterpolateLin"), false, false, true, false );
Param( InterpMeth, int, wxT("InterpolationMethod"), 0, 0, 0, 0 );
@ -234,6 +234,7 @@ EffectEqualization::EffectEqualization(int Options)
mDraw = NULL;
mCurve = NULL;
mPanel = NULL;
mMSlider = NULL;
hFFT = GetFFT(windowSize);
@ -303,9 +304,9 @@ EffectEqualization::~EffectEqualization()
ComponentInterfaceSymbol EffectEqualization::GetSymbol()
{
if( mOptions == kEqOptionGraphic )
return EQ_GRAPHIC_PLUGIN_SYMBOL;
return GRAPHIC_EQ_PLUGIN_SYMBOL;
if( mOptions == kEqOptionCurve )
return EQ_CURVES_PLUGIN_SYMBOL;
return FILTER_CURVE_PLUGIN_SYMBOL;
return EQUALIZATION_PLUGIN_SYMBOL;
}
@ -318,9 +319,9 @@ wxString EffectEqualization::ManualPage()
{
if( mOptions == kEqOptionGraphic )
return wxT("EQ Graphic");
return wxT("Graphic EQ");
if( mOptions == kEqOptionCurve )
return wxT("EQ Curves");
return wxT("Filter Curve");
return wxT("Equalization");
}
@ -504,9 +505,9 @@ bool EffectEqualization::ValidateUI()
{
// PRL: This is unreachable. mDisallowCustom is always false.
Effect::MessageBox(_("To use this EQ curve in a macro, please choose a new name for it.\nChoose the 'Save/Manage Curves...' button and rename the 'unnamed' curve, then use that one."),
Effect::MessageBox(_("To use this filter curve in a macro, please choose a new name for it.\nChoose the 'Save/Manage Curves...' button and rename the 'unnamed' curve, then use that one."),
wxOK | wxCENTRE,
_("EQ Curve needs a different name"));
_("Filter Curve needs a different name"));
return false;
}
@ -948,34 +949,36 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
// Filter length grouping
// -------------------------------------------------------------------
S.StartHorizontalLay(wxEXPAND, 0);
{
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
if( mOptions == kEqLegacy ){
S.StartHorizontalLay(wxEXPAND, 0);
{
S.AddPrompt(_("Length of &Filter:"));
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
{
S.AddPrompt(_("Length of &Filter:"));
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxEXPAND, 1);
{
S.SetStyle(wxSL_HORIZONTAL);
mMSlider = S.Id(ID_Length).AddSlider( {}, (mM - 1) / 2, 4095, 10);
mMSlider->SetName(_("Length of Filter"));
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
{
wxString label;
label.Printf(wxT("%ld"), mM);
mMText = S.AddVariableText(label);
mMText->SetName(label); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
S.EndHorizontalLay();
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxEXPAND, 1);
{
S.SetStyle(wxSL_HORIZONTAL);
mMSlider = S.Id(ID_Length).AddSlider( {}, (mM - 1) / 2, 4095, 10);
mMSlider->SetName(_("Length of Filter"));
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
{
wxString label;
label.Printf(wxT("%ld"), mM);
mMText = S.AddVariableText(label);
mMText->SetName(label); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
S.EndHorizontalLay();
S.AddSpace(1, 1);
}
S.EndHorizontalLay();
S.AddSpace(1, 1);
S.AddSpace(5, 5);
@ -1123,7 +1126,8 @@ bool EffectEqualization::TransferDataToWindow()
mGridOnOff->SetValue( mDrawGrid ); // checks/unchecks the box on the interface
mMSlider->SetValue((mM - 1) / 2);
if( mMSlider )
mMSlider->SetValue((mM - 1) / 2);
mM = 0; // force refresh in TransferDataFromWindow()
mdBMinSlider->SetValue((int)mdBMin);
@ -1148,7 +1152,7 @@ bool EffectEqualization::TransferDataToWindow()
mDraw->SetValue(mDrawMode);
szrV->Show(szr1,mOptions != kEqOptionGraphic); // Graph
szrV->Show(szrG,!mDrawMode); // eq sliders
szrH->Show(szrI,!mDrawMode); // interpolation choice
szrH->Show(szrI,mOptions == kEqLegacy ); // interpolation choice
szrH->Show(szrL, mDrawMode); // linear freq checkbox
if( mGraphic)
mGraphic->SetValue(!mDrawMode);
@ -1206,15 +1210,21 @@ bool EffectEqualization::TransferDataFromWindow()
mPanel->Refresh(false);
}
size_t m = 2 * mMSlider->GetValue() + 1; // odd numbers only
size_t m = DEF_FilterLength; // m must be odd.
if (mMSlider )
m = 2* mMSlider->GetValue()+1;
wxASSERT( (m & 1) ==1 );
if (m != mM) {
mM = m;
ForceRecalc();
tip.Printf(wxT("%d"), (int)mM);
mMText->SetLabel(tip);
mMText->SetName(mMText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mMSlider->SetToolTip(tip);
if( mMSlider)
{
tip.Printf(wxT("%d"), (int)mM);
mMText->SetLabel(tip);
mMText->SetName(mMText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mMSlider->SetToolTip(tip);
}
}
return true;
@ -2401,7 +2411,7 @@ void EffectEqualization::UpdateGraphic()
}
szrV->Show(szrG,true); // eq sliders
szrH->Show(szrI,true); // interpolation choice
szrH->Show(szrI,mOptions == kEqLegacy ); // interpolation choice
szrH->Show(szrL,false); // linear freq checkbox
mUIParent->Layout();

8
src/effects/Equalization.h
View File

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

8
src/effects/LoadEffects.cpp
View File

@ -117,11 +117,10 @@
EFFECT( COMPRESSOR, EffectCompressor, () ) \
EFFECT( DISTORTION, EffectDistortion, () ) \
EFFECT( ECHO, EffectEcho, () ) \
EFFECT( EQUALIZATION, EffectEqualization, (kEqLegacy) ) \
EFFECT( FADEIN, EffectFade, (true) ) \
EFFECT( FADEOUT, EffectFade, (false) ) \
EFFECT( EQ_CURVES, EffectEqualization, (kEqOptionCurve) ) \
EFFECT( EQ_GRAPHIC, EffectEqualization, (kEqOptionGraphic) ) \
EFFECT( FILTER_CURVE, EffectEqualization, (kEqOptionCurve) ) \
EFFECT( GRAPHIC_EQ, EffectEqualization, (kEqOptionGraphic) ) \
EFFECT( INVERT, EffectInvert, () ) \
EFFECT( NORMALIZE, EffectNormalize, () ) \
EFFECT( PHASER, EffectPhaser, () ) \
@ -139,6 +138,9 @@
EFFECT( PAULSTRETCH, EffectPaulstretch, () ) \
SBSMS_EFFECTS
//EFFECT( EQUALIZATION, EffectEqualization, (kEqLegacy) ) \
//
// Define the list of effects that do not get autoregistered
//