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

Simplify Leveller dialog.

Browse Source
This commit is contained in:
v.audacity 2013-06-22 00:49:13 +00:00
parent 0a41d21c21
commit 3f6856e07a
3 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/effects/ChangePitch.cpp
View File

@ -178,9 +178,9 @@ enum {
ID_TEXT_PERCENTCHANGE = 10001,
ID_SLIDER_PERCENTCHANGE,
ID_CHOICE_FROMPITCH,
ID_CHOICE_FROMOCTAVE,
ID_SPIN_FROMOCTAVE,
ID_CHOICE_TOPITCH,
ID_CHOICE_TOOCTAVE,
ID_SPIN_TOOCTAVE,
ID_TEXT_SEMITONESCHANGE,
ID_TEXT_FROMFREQUENCY,
ID_TEXT_TOFREQUENCY
@ -190,9 +190,9 @@ enum {
BEGIN_EVENT_TABLE(ChangePitchDialog, EffectDialog)
EVT_CHOICE(ID_CHOICE_FROMPITCH, ChangePitchDialog::OnChoice_FromPitch)
EVT_TEXT(ID_CHOICE_FROMOCTAVE, ChangePitchDialog::OnSpin_FromOctave)
EVT_TEXT(ID_SPIN_FROMOCTAVE, ChangePitchDialog::OnSpin_FromOctave)
EVT_CHOICE(ID_CHOICE_TOPITCH, ChangePitchDialog::OnChoice_ToPitch)
EVT_TEXT(ID_CHOICE_TOOCTAVE, ChangePitchDialog::OnSpin_ToOctave)
EVT_TEXT(ID_SPIN_TOOCTAVE, ChangePitchDialog::OnSpin_ToOctave)
EVT_TEXT(ID_TEXT_SEMITONESCHANGE, ChangePitchDialog::OnText_SemitonesChange)
@ -299,7 +299,7 @@ void ChangePitchDialog::PopulateOrExchange(ShuttleGui & S)
m_pChoice_FromPitch->SetName(_("From Pitch"));
m_pChoice_FromPitch->SetSizeHints(80, -1);
m_pSpin_FromOctave = S.Id(ID_CHOICE_FROMOCTAVE).AddSpinCtrl(wxT(""), m_nFromOctave, INT_MAX, INT_MIN);
m_pSpin_FromOctave = S.Id(ID_SPIN_FROMOCTAVE).AddSpinCtrl(wxT(""), m_nFromOctave, INT_MAX, INT_MIN);
m_pSpin_FromOctave->SetName(_("From Octave"));
m_pSpin_FromOctave->SetSizeHints(50, -1);
@ -308,7 +308,7 @@ void ChangePitchDialog::PopulateOrExchange(ShuttleGui & S)
m_pChoice_ToPitch->SetSizeHints(80, -1);
m_pSpin_ToOctave =
S.Id(ID_CHOICE_TOOCTAVE).AddSpinCtrl(wxT(""), m_nToOctave, INT_MAX, INT_MIN);
S.Id(ID_SPIN_TOOCTAVE).AddSpinCtrl(wxT(""), m_nToOctave, INT_MAX, INT_MIN);
m_pSpin_ToOctave->SetName(_("From Octave"));
m_pSpin_ToOctave->SetSizeHints(50, -1);
}

53
src/effects/Leveller.cpp
View File

@ -119,7 +119,7 @@ bool EffectLeveller::PromptUser()
{
LevellerDialog dlog(this, mParent);
dlog.mLevellerDbChoiceIndex = mLevellerDbChoiceIndex;
dlog.mLevellerNumPassesChoicIndex = mLevellerNumPasses-1;
dlog.mLevellerNumPassesChoiceIndex = mLevellerNumPasses-1;
dlog.TransferDataToWindow();
dlog.CentreOnParent();
@ -129,7 +129,7 @@ bool EffectLeveller::PromptUser()
return false;
}
mLevellerNumPasses = dlog.mLevellerNumPassesChoicIndex+1;
mLevellerNumPasses = dlog.mLevellerNumPassesChoiceIndex+1;
mLevellerDbChoiceIndex = dlog.mLevellerDbChoiceIndex;
mLevellerDbSilenceThreshold = Enums::Db2Signal[mLevellerDbChoiceIndex];
@ -197,7 +197,7 @@ LevellerDialog::LevellerDialog(EffectLeveller *effect, wxWindow *parent)
: EffectDialog(parent, _("Leveller"), PROCESS_EFFECT),
mEffect(effect)
{
mLevellerNumPassesChoicIndex = 0;//
mLevellerNumPassesChoiceIndex = 0;//
mLevellerDbChoiceIndex = 0;
Init();
}
@ -215,58 +215,39 @@ void LevellerDialog::PopulateOrExchange(ShuttleGui & S)
numPasses.Add(_("Heavier"));
numPasses.Add(_("Heaviest"));
S.AddSpace(0, 5);
S.SetBorder(5);
S.AddSpace(5);
S.StartStatic(_("Degree of Leveling"));
S.StartHorizontalLay();
{
S.StartHorizontalLay();
{
S.TieChoice(_("Degree of Leveling:"),
mLevellerNumPassesChoicIndex,
&numPasses);
}
S.EndHorizontalLay();
S.AddChoice(_("Degree of Leveling:"),
mLevellerNumPassesChoiceIndex,
&numPasses);
}
S.EndStatic();
S.EndHorizontalLay();
S.StartStatic(_("Noise Threshold (Hiss/Hum/Ambient Noise)"));
S.StartHorizontalLay();
{
S.StartHorizontalLay();
{
S.TieChoice(_("Threshold for Noise:"),
mLevellerDbChoiceIndex,
&db);
}
S.EndHorizontalLay();
S.AddChoice(_("Noise Threshold:"),
mLevellerDbChoiceIndex,
&db);
}
S.EndStatic();
S.EndHorizontalLay();
}
void LevellerDialog::OnPreview(wxCommandEvent &event)
{
TransferDataFromWindow();
// Save & restore parameters around Preview
// Save & restore parameters around Preview.
int oldLevellerDbChoiceIndex = mEffect->mLevellerDbChoiceIndex;
int oldLevellerNumPasses = mEffect->mLevellerNumPasses;
mEffect->mLevellerDbChoiceIndex = mLevellerDbChoiceIndex;
mEffect->mLevellerNumPasses = mLevellerNumPassesChoicIndex+1;
mEffect->mLevellerNumPasses = mLevellerNumPassesChoiceIndex+1;
mEffect->Preview();
mEffect->mLevellerDbChoiceIndex = oldLevellerDbChoiceIndex;
mEffect->mLevellerNumPasses = oldLevellerNumPasses;
}
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 0e9ab1c7-3cb3-4864-8f30-876218bea476

2
src/effects/Leveller.h
View File

@ -87,7 +87,7 @@ class LevellerDialog: public EffectDialog
public:
int mLevellerDbChoiceIndex;
int mLevellerNumPassesChoicIndex;
int mLevellerNumPassesChoiceIndex;
};
#endif