Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00
Code Issues Releases Wiki Activity

Remove extra controls from Graph EQ and Filter Curves effects

Browse Source
This commit is contained in:
James Crook 2019-04-01 19:14:37 +01:00
parent ddda350330
commit d1ce307974
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/effects/Equalization.cpp
View File

@ -765,16 +765,16 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// ROWS 4: // ROWS 4:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
S.AddSpace(5, 5); S.AddSpace(5, 5);
S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); if( mOptions == kEqLegacy )
{ {
S.AddPrompt(_("&EQ Type:")); S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
} {
S.EndHorizontalLay(); S.AddPrompt(_("&EQ Type:"));
}
S.EndHorizontalLay();
if( mOptions == kEqLegacy ){
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1); S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
{ {
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1); S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
@ -854,34 +854,33 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// ROW 5: // ROW 5:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
if( mOptions == kEqLegacy ){
S.AddSpace(5, 5); S.AddSpace(5, 5);
S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
{
S.AddPrompt(_("&Select Curve:"));
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
{
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
{ {
wxArrayStringEx curves; S.AddPrompt(_("&Select Curve:"));
for (size_t i = 0, cnt = mCurves.size(); i < cnt; i++) }
{ S.EndHorizontalLay();
curves.push_back(mCurves[ i ].Name);
} S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
{
mCurve = S.Id(ID_Curve).AddChoice( {}, curves ); S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
mCurve->SetName(_("Select Curve")); {
wxArrayStringEx curves;
for (size_t i = 0, cnt = mCurves.size(); i < cnt; i++)
{
curves.push_back(mCurves[ i ].Name);
}
mCurve = S.Id(ID_Curve).AddChoice( {}, curves );
mCurve->SetName(_("Select Curve"));
}
S.EndHorizontalLay();
} }
S.EndHorizontalLay(); S.EndHorizontalLay();
}
S.EndHorizontalLay();
if( mOptions == kEqLegacy )
S.Id(ID_Manage).AddButton(_("S&ave/Manage Curves...")); S.Id(ID_Manage).AddButton(_("S&ave/Manage Curves..."));
}
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1); S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
{ {
@ -2156,22 +2155,27 @@ void EffectEqualization::LayoutEQSliders()
void EffectEqualization::UpdateCurves() void EffectEqualization::UpdateCurves()
{ {
// Reload the curve names // Reload the curve names
mCurve->Clear(); if( mCurve )
mCurve->Clear();
bool selectedCurveExists = false; bool selectedCurveExists = false;
for (size_t i = 0, cnt = mCurves.size(); i < cnt; i++) for (size_t i = 0, cnt = mCurves.size(); i < cnt; i++)
{ {
if (mCurveName == mCurves[ i ].Name) if (mCurveName == mCurves[ i ].Name)
selectedCurveExists = true; selectedCurveExists = true;
mCurve->Append(mCurves[ i ].Name); if( mCurve )
mCurve->Append(mCurves[ i ].Name);
} }
// In rare circumstances, mCurveName may not exist (bug 1891) // In rare circumstances, mCurveName may not exist (bug 1891)
if (!selectedCurveExists) if (!selectedCurveExists)
mCurveName = mCurves[ (int)mCurves.size() - 1 ].Name; mCurveName = mCurves[ (int)mCurves.size() - 1 ].Name;
mCurve->SetStringSelection(mCurveName); if( mCurve )
mCurve->SetStringSelection(mCurveName);
// Allow the control to resize // Allow the control to resize
mCurve->SetSizeHints(-1, -1); if( mCurve )
mCurve->SetSizeHints(-1, -1);
// Set initial curve // Set initial curve
setCurve( mCurveName ); setCurve( mCurveName );