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

further constraints regarding bug 309, from off-list discussion with Steve

Browse Source
This commit is contained in:
v.audacity 2013-05-22 04:32:43 +00:00
parent 11eee65d25
commit 3f2c9d0c1d
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/effects/ChangePitch.cpp
View File

@ -562,10 +562,10 @@ void ChangePitchDialog::OnText_SemitonesChange(wxCommandEvent & WXUNUSED(event))
// If m_SemitonesChange is a big enough negative, we can go to or below 0 freq. // If m_SemitonesChange is a big enough negative, we can go to or below 0 freq.
// If m_SemitonesChange is a big enough positive, we can go to 1.#INF (Windows) or inf (Linux). // If m_SemitonesChange is a big enough positive, we can go to 1.#INF (Windows) or inf (Linux).
// Prevent processing with either. // But practically, these are best limits for Soundtouch.
bool bWantEnable = (m_ToFrequency > 0.0) && (m_ToFrequency <= DBL_MAX); bool bIsGoodValue = (m_SemitonesChange > -80.0) && (m_SemitonesChange <= 60.0);
this->FindWindow(wxID_OK)->Enable(bWantEnable); this->FindWindow(wxID_OK)->Enable(bIsGoodValue);
this->FindWindow(ID_EFFECT_PREVIEW)->Enable(bWantEnable); this->FindWindow(ID_EFFECT_PREVIEW)->Enable(bIsGoodValue);
} }
} }
@ -581,7 +581,7 @@ void ChangePitchDialog::OnText_FromFrequency(wxCommandEvent & WXUNUSED(event))
// Empty string causes unpredictable results with ToDouble() and later calculations. // Empty string causes unpredictable results with ToDouble() and later calculations.
// Non-positive frequency makes no sense, but user might still be editing, // Non-positive frequency makes no sense, but user might still be editing,
// so it's not an error, but we do not want to update the values/controls. // so it's not an error, but we do not want to update the values/controls.
if (str.IsEmpty() || (newDouble <= 0.0) ) if (str.IsEmpty() || (newDouble <= 0.0) || (newDouble > DBL_MAX))
{ {
this->FindWindow(wxID_OK)->Disable(); this->FindWindow(wxID_OK)->Disable();
this->FindWindow(ID_EFFECT_PREVIEW)->Disable(); this->FindWindow(ID_EFFECT_PREVIEW)->Disable();
@ -598,9 +598,10 @@ void ChangePitchDialog::OnText_FromFrequency(wxCommandEvent & WXUNUSED(event))
this->Update_Text_ToFrequency(); this->Update_Text_ToFrequency();
m_bLoopDetect = false; m_bLoopDetect = false;
// Success. Make sure OK is enabled, in case we disabled it above during editing. // Success. Make sure OK and Preview are enabled, in case we disabled above during editing.
this->FindWindow(wxID_OK)->Enable(); this->FindWindow(wxID_OK)->Enable();
} this->FindWindow(ID_EFFECT_PREVIEW)->Enable();
}
} }
void ChangePitchDialog::OnText_ToFrequency(wxCommandEvent & WXUNUSED(event)) void ChangePitchDialog::OnText_ToFrequency(wxCommandEvent & WXUNUSED(event))
@ -636,11 +637,16 @@ void ChangePitchDialog::OnText_ToFrequency(wxCommandEvent & WXUNUSED(event))
this->Update_Slider_PercentChange(); this->Update_Slider_PercentChange();
m_bLoopDetect = false; m_bLoopDetect = false;
// Success. Make sure OK is enabled, in case we disabled it above during editing. // Success. Make sure OK and Preview are enabled, in case we disabled above during editing.
this->FindWindow(wxID_OK)->Enable(); this->FindWindow(wxID_OK)->Enable();
this->FindWindow(ID_EFFECT_PREVIEW)->Enable();
} }
} }
// m_PercentChange -100% makes no sense and Soundtouch is not reasonable above 3000%.
#define PERCENT_CHANGE_BEYOND_MIN -100.0
#define PERCENT_CHANGE_MAX 3000.0
void ChangePitchDialog::OnText_PercentChange(wxCommandEvent & WXUNUSED(event)) void ChangePitchDialog::OnText_PercentChange(wxCommandEvent & WXUNUSED(event))
{ {
if (m_bLoopDetect) if (m_bLoopDetect)
@ -648,18 +654,14 @@ void ChangePitchDialog::OnText_PercentChange(wxCommandEvent & WXUNUSED(event))
if (m_pTextCtrl_PercentChange) { if (m_pTextCtrl_PercentChange) {
wxString str = m_pTextCtrl_PercentChange->GetValue(); wxString str = m_pTextCtrl_PercentChange->GetValue();
if (str.IsEmpty())
{
this->FindWindow(wxID_OK)->Disable();
return;
}
double newValue = 0; double newValue = 0;
str.ToDouble(&newValue); str.ToDouble(&newValue);
// Zero and negative frequency makes no sense, but user might still be editing, // User might still be editing, so out of bounds is not an error,
// so it's not an error, but we do not want to update the values/controls. // but we do not want to update the values/controls.
if (newValue <= -100.0) if (str.IsEmpty() || (newValue <= PERCENT_CHANGE_BEYOND_MIN) || (newValue > PERCENT_CHANGE_MAX))
{ {
this->FindWindow(wxID_OK)->Disable(); this->FindWindow(wxID_OK)->Disable();
this->FindWindow(ID_EFFECT_PREVIEW)->Disable();
return; return;
} }
m_PercentChange = newValue; m_PercentChange = newValue;
@ -675,7 +677,9 @@ void ChangePitchDialog::OnText_PercentChange(wxCommandEvent & WXUNUSED(event))
this->Update_Slider_PercentChange(); this->Update_Slider_PercentChange();
m_bLoopDetect = false; m_bLoopDetect = false;
this->FindWindow(wxID_OK)->Enable(m_PercentChange > -100.0); // Success. Make sure OK and Preview are enabled, in case we disabled above during editing.
this->FindWindow(wxID_OK)->Enable();
this->FindWindow(ID_EFFECT_PREVIEW)->Enable();
} }
} }
@ -759,7 +763,10 @@ void ChangePitchDialog::Update_Text_PercentChange()
else else
str = wxT(""); str = wxT("");
m_pTextCtrl_PercentChange->SetValue(str); m_pTextCtrl_PercentChange->SetValue(str);
FindWindow(wxID_OK)->Enable(m_PercentChange > -100.0);
bool bIsGoodValue = (m_PercentChange > PERCENT_CHANGE_BEYOND_MIN) && (m_PercentChange <= PERCENT_CHANGE_MAX);
this->FindWindow(wxID_OK)->Enable(bIsGoodValue);
this->FindWindow(ID_EFFECT_PREVIEW)->Enable(bIsGoodValue);
} }
} }