1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-12 22:57:43 +02:00

Reposition effects presets in audacity.cfg that were previously claimed by CleanSpeech. Still a lot of work to do!

This commit is contained in:
martynshaw99 2011-06-14 23:48:58 +00:00
parent b1f7a0f890
commit 65fb8f4ff8
3 changed files with 34 additions and 34 deletions

View File

@ -72,13 +72,13 @@ bool EffectDtmf::Init()
mIsSelection = true; mIsSelection = true;
} else { } else {
// retrieve last used values // retrieve last used values
gPrefs->Read(wxT("/CsPresets/DtmfGen_SequenceDuration"), &mDuration, 1L); gPrefs->Read(wxT("/Effects/DtmfGen/SequenceDuration"), &mDuration, 1L);
mIsSelection = false; mIsSelection = false;
} }
/// \todo this code shouldn't be using /CsPresets - need to review its use /// \todo this code shouldn't be using /CsPresets - need to review its use
gPrefs->Read(wxT("/CsPresets/DtmfGen_String"), &dtmfString, wxT("audacity")); gPrefs->Read(wxT("/Effects/DtmfGen/String"), &dtmfString, wxT("audacity"));
gPrefs->Read(wxT("/CsPresets/DtmfGen_DutyCycle"), &dtmfDutyCycle, 550L); gPrefs->Read(wxT("/Effects/DtmfGen/DutyCycle"), &dtmfDutyCycle, 550L);
gPrefs->Read(wxT("/CsPresets/DtmfGen_Amplitude"), &dtmfAmplitude, 0.8f); gPrefs->Read(wxT("/Effects/DtmfGen/Amplitude"), &dtmfAmplitude, 0.8f);
dtmfNTones = wxStrlen(dtmfString); dtmfNTones = wxStrlen(dtmfString);
@ -374,11 +374,11 @@ void EffectDtmf::Success()
when user explicitely setup a value when user explicitely setup a value
*/ */
if (mT1 == mT0) if (mT1 == mT0)
gPrefs->Write(wxT("/CsPresets/DtmfGen_SequenceDuration"), mDuration); gPrefs->Write(wxT("/Effects/DtmfGen/SequenceDuration"), mDuration);
gPrefs->Write(wxT("/CsPresets/DtmfGen_String"), dtmfString); gPrefs->Write(wxT("/Effects/DtmfGen/String"), dtmfString);
gPrefs->Write(wxT("/CsPresets/DtmfGen_DutyCycle"), dtmfDutyCycle); gPrefs->Write(wxT("/Effects/DtmfGen/DutyCycle"), dtmfDutyCycle);
gPrefs->Write(wxT("/CsPresets/DtmfGen_Amplitude"), dtmfAmplitude); gPrefs->Write(wxT("/Effects/DtmfGen/Amplitude"), dtmfAmplitude);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

View File

@ -194,27 +194,27 @@ static wxString interpChoiceStrings[NUM_INTERP_CHOICES];
void EffectEqualization::ReadPrefs() void EffectEqualization::ReadPrefs()
{ {
gPrefs->Read(wxT("/CsPresets/EQFilterLength"), gPrefs->Read(wxT("/Effects/Equalization/FilterLength"),
&mM, 4001); &mM, 4001);
if ((mM < 21) || (mM > 8191)) { // corrupted Prefs? if ((mM < 21) || (mM > 8191)) { // corrupted Prefs?
mM = 4001; //default mM = 4001; //default
gPrefs->Write(wxT("/CsPresets/EQFilterLength"), mM); gPrefs->Write(wxT("/Effects/Equalization/FilterLength"), mM);
} }
gPrefs->Read(wxT("/CsPresets/EQCurveName"), &mCurveName, wxT("unnamed")); gPrefs->Read(wxT("/Effects/Equalization/CurveName"), &mCurveName, wxT("unnamed"));
gPrefs->Read(wxT("/CsPresets/EQLin"), &mLin, false); gPrefs->Read(wxT("/Effects/Equalization/Lin"), &mLin, false);
gPrefs->Read(wxT("/CsPresets/EQdBMin"), &mdBMin, -30.0); gPrefs->Read(wxT("/Effects/Equalization/dBMin"), &mdBMin, -30.0);
if ((mdBMin < -120) || (mdBMin > -10)) { // corrupted Prefs? if ((mdBMin < -120) || (mdBMin > -10)) { // corrupted Prefs?
mdBMin = -30; //default mdBMin = -30; //default
gPrefs->Write(wxT("/CsPresets/EQFilterLength"), mdBMin); gPrefs->Write(wxT("/Effects/Equalization/FilterLength"), mdBMin);
} }
gPrefs->Read(wxT("/CsPresets/EQdBMax"), &mdBMax, 30.); gPrefs->Read(wxT("/Effects/Equalization/dBMax"), &mdBMax, 30.);
if ((mdBMax < 0) || (mdBMax > 60)) { // corrupted Prefs? if ((mdBMax < 0) || (mdBMax > 60)) { // corrupted Prefs?
mdBMax = 30; //default mdBMax = 30; //default
gPrefs->Write(wxT("/CsPresets/EQFilterLength"), mdBMax); gPrefs->Write(wxT("/Effects/Equalization/FilterLength"), mdBMax);
} }
gPrefs->Read(wxT("/CsPresets/EQDrawMode"), &mDrawMode, true); gPrefs->Read(wxT("/Effects/Equalization/DrawMode"), &mDrawMode, true);
gPrefs->Read(wxT("/CsPresets/EQInterp"), &mInterp, 0); gPrefs->Read(wxT("/Effects/Equalization/Interp"), &mInterp, 0);
gPrefs->Read(wxT("/CsPresets/EQDrawGrid"), &mDrawGrid, true); gPrefs->Read(wxT("/Effects/Equalization/DrawGrid"), &mDrawGrid, true);
} }
EffectEqualization::EffectEqualization() EffectEqualization::EffectEqualization()
@ -303,14 +303,14 @@ bool EffectEqualization::PromptUser()
if (!mEditingBatchParams) if (!mEditingBatchParams)
{ {
gPrefs->Write(wxT("/CsPresets/EQFilterLength"),mM); gPrefs->Write(wxT("/Effects/Equalization/FilterLength"),mM);
gPrefs->Write(wxT("/CsPresets/EQCurveName"),mCurveName); gPrefs->Write(wxT("/Effects/Equalization/CurveName"),mCurveName);
gPrefs->Write(wxT("/CsPresets/EQLin"),mLin); gPrefs->Write(wxT("/Effects/Equalization/Lin"),mLin);
gPrefs->Write(wxT("/CsPresets/EQdBMin"),mdBMin); gPrefs->Write(wxT("/Effects/Equalization/dBMin"),mdBMin);
gPrefs->Write(wxT("/CsPresets/EQdBMax"),mdBMax); gPrefs->Write(wxT("/Effects/Equalization/dBMax"),mdBMax);
gPrefs->Write(wxT("/CsPresets/EQDrawMode"),mDrawMode); gPrefs->Write(wxT("/Effects/Equalization/DrawMode"),mDrawMode);
gPrefs->Write(wxT("/CsPresets/EQInterp"), mInterp); gPrefs->Write(wxT("/Effects/Equalization/Interp"), mInterp);
gPrefs->Write(wxT("/CsPresets/EQDrawGrid"), mDrawGrid); gPrefs->Write(wxT("/Effects/Equalization/DrawGrid"), mDrawGrid);
} }
return true; return true;

View File

@ -32,7 +32,7 @@
bool EffectNoise::Init() bool EffectNoise::Init()
{ {
gPrefs->Read(wxT("/CsPresets/NoiseGen_Duration"), &mDuration, 1L); gPrefs->Read(wxT("/Effects/Noise/Duration"), &mDuration, 1L);
return true; return true;
} }
@ -57,12 +57,12 @@ bool EffectNoise::PromptUser()
mDuration = mT1 - mT0; mDuration = mT1 - mT0;
dlog.nIsSelection = true; dlog.nIsSelection = true;
} else { } else {
gPrefs->Read(wxT("/CsPresets/NoiseGen_Duration"), &mDuration, 1L); gPrefs->Read(wxT("/Effects/Noise/Duration"), &mDuration, 1L);
dlog.nIsSelection = false; dlog.nIsSelection = false;
} }
gPrefs->Read(wxT("/CsPresets/NoiseGen_Type"), &noiseType, 0L); gPrefs->Read(wxT("/Effects/Noise/Type"), &noiseType, 0L);
gPrefs->Read(wxT("/CsPresets/NoiseGen_Amp"), &noiseAmplitude, 0.8f); gPrefs->Read(wxT("/Effects/Noise/Amplitude"), &noiseAmplitude, 0.8f);
// Initialize dialog locals // Initialize dialog locals
dlog.nDuration = mDuration; dlog.nDuration = mDuration;
@ -157,10 +157,10 @@ void EffectNoise::Success()
when user explicitely setup a value when user explicitely setup a value
*/ */
if (mT1 == mT0) if (mT1 == mT0)
gPrefs->Write(wxT("/CsPresets/NoiseGen_Duration"), mDuration); gPrefs->Write(wxT("/Effects/Noise/Duration"), mDuration);
gPrefs->Write(wxT("/CsPresets/NoiseGen_Type"), noiseType); gPrefs->Write(wxT("/Effects/Noise/Type"), noiseType);
gPrefs->Write(wxT("/CsPresets/NoiseGen_Amp"), noiseAmplitude); gPrefs->Write(wxT("/Effects/Noise/Amplitude"), noiseAmplitude);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------