mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-17 08:30:06 +02:00
Fix for bug #985
Was not able to reproduce the assert mentioned in the report though.
This commit is contained in:
parent
1992b0c7e3
commit
c816d2562d
36
src/effects/Equalization.cpp
Normal file → Executable file
36
src/effects/Equalization.cpp
Normal file → Executable file
@ -880,18 +880,7 @@ bool EffectEqualization::TransferDataToWindow()
|
|||||||
mdBMax = 0; // force refresh in TransferDataFromWindow()
|
mdBMax = 0; // force refresh in TransferDataFromWindow()
|
||||||
|
|
||||||
// Reload the curve names
|
// Reload the curve names
|
||||||
mCurve->Clear();
|
UpdateCurves();
|
||||||
for (size_t i = 0, cnt = mCurves.GetCount(); i < cnt; i++)
|
|
||||||
{
|
|
||||||
mCurve->Append(mCurves[ i ].Name);
|
|
||||||
}
|
|
||||||
mCurve->SetStringSelection(mCurveName);
|
|
||||||
|
|
||||||
// Allow the control to resize
|
|
||||||
mCurve->SetSizeHints(-1, -1);
|
|
||||||
|
|
||||||
// Set initial curve
|
|
||||||
setCurve( mCurveName );
|
|
||||||
|
|
||||||
// Set graphic interpolation mode
|
// Set graphic interpolation mode
|
||||||
mInterpChoice->SetSelection(mInterp);
|
mInterpChoice->SetSelection(mInterp);
|
||||||
@ -1847,6 +1836,23 @@ void EffectEqualization::LayoutEQSliders()
|
|||||||
mUIParent->RefreshRect(wxRect(szrG->GetPosition(), szrGSize));
|
mUIParent->RefreshRect(wxRect(szrG->GetPosition(), szrGSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EffectEqualization::UpdateCurves()
|
||||||
|
{
|
||||||
|
// Reload the curve names
|
||||||
|
mCurve->Clear();
|
||||||
|
for (size_t i = 0, cnt = mCurves.GetCount(); i < cnt; i++)
|
||||||
|
{
|
||||||
|
mCurve->Append(mCurves[ i ].Name);
|
||||||
|
}
|
||||||
|
mCurve->SetStringSelection(mCurveName);
|
||||||
|
|
||||||
|
// Allow the control to resize
|
||||||
|
mCurve->SetSizeHints(-1, -1);
|
||||||
|
|
||||||
|
// Set initial curve
|
||||||
|
setCurve( mCurveName );
|
||||||
|
}
|
||||||
|
|
||||||
void EffectEqualization::UpdateDraw()
|
void EffectEqualization::UpdateDraw()
|
||||||
{
|
{
|
||||||
int numPoints = mLogEnvelope->GetNumberOfPoints();
|
int numPoints = mLogEnvelope->GetNumberOfPoints();
|
||||||
@ -2416,6 +2422,12 @@ void EffectEqualization::OnManage(wxCommandEvent & WXUNUSED(event))
|
|||||||
{
|
{
|
||||||
EditCurvesDialog d(mUIParent, this, mCurve->GetSelection());
|
EditCurvesDialog d(mUIParent, this, mCurve->GetSelection());
|
||||||
d.ShowModal();
|
d.ShowModal();
|
||||||
|
|
||||||
|
// Reload the curve names
|
||||||
|
UpdateCurves();
|
||||||
|
|
||||||
|
// Allow control to resize
|
||||||
|
mUIParent->Layout();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EffectEqualization::OnClear(wxCommandEvent & WXUNUSED(event))
|
void EffectEqualization::OnClear(wxCommandEvent & WXUNUSED(event))
|
||||||
|
1
src/effects/Equalization.h
Normal file → Executable file
1
src/effects/Equalization.h
Normal file → Executable file
@ -150,6 +150,7 @@ private:
|
|||||||
XMLTagHandler *HandleXMLChild(const wxChar *tag);
|
XMLTagHandler *HandleXMLChild(const wxChar *tag);
|
||||||
void WriteXML(XMLWriter &xmlFile);
|
void WriteXML(XMLWriter &xmlFile);
|
||||||
|
|
||||||
|
void UpdateCurves();
|
||||||
void UpdateDraw();
|
void UpdateDraw();
|
||||||
|
|
||||||
void LayoutEQSliders();
|
void LayoutEQSliders();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user