From 65fb8f4ff8ddf5a199c57a5459126edc7c223aeb Mon Sep 17 00:00:00 2001 From: martynshaw99 Date: Tue, 14 Jun 2011 23:48:58 +0000 Subject: [PATCH] Reposition effects presets in audacity.cfg that were previously claimed by CleanSpeech. Still a lot of work to do! --- src/effects/DtmfGen.cpp | 16 +++++++-------- src/effects/Equalization.cpp | 38 ++++++++++++++++++------------------ src/effects/Noise.cpp | 14 ++++++------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 15bf515a5..996c95ec7 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -72,13 +72,13 @@ bool EffectDtmf::Init() mIsSelection = true; } else { // retrieve last used values - gPrefs->Read(wxT("/CsPresets/DtmfGen_SequenceDuration"), &mDuration, 1L); + gPrefs->Read(wxT("/Effects/DtmfGen/SequenceDuration"), &mDuration, 1L); mIsSelection = false; } /// \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("/CsPresets/DtmfGen_DutyCycle"), &dtmfDutyCycle, 550L); - gPrefs->Read(wxT("/CsPresets/DtmfGen_Amplitude"), &dtmfAmplitude, 0.8f); + gPrefs->Read(wxT("/Effects/DtmfGen/String"), &dtmfString, wxT("audacity")); + gPrefs->Read(wxT("/Effects/DtmfGen/DutyCycle"), &dtmfDutyCycle, 550L); + gPrefs->Read(wxT("/Effects/DtmfGen/Amplitude"), &dtmfAmplitude, 0.8f); dtmfNTones = wxStrlen(dtmfString); @@ -374,11 +374,11 @@ void EffectDtmf::Success() when user explicitely setup a value */ 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("/CsPresets/DtmfGen_DutyCycle"), dtmfDutyCycle); - gPrefs->Write(wxT("/CsPresets/DtmfGen_Amplitude"), dtmfAmplitude); + gPrefs->Write(wxT("/Effects/DtmfGen/String"), dtmfString); + gPrefs->Write(wxT("/Effects/DtmfGen/DutyCycle"), dtmfDutyCycle); + gPrefs->Write(wxT("/Effects/DtmfGen/Amplitude"), dtmfAmplitude); } //---------------------------------------------------------------------------- diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 129bb163c..3595ce8f6 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -194,27 +194,27 @@ static wxString interpChoiceStrings[NUM_INTERP_CHOICES]; void EffectEqualization::ReadPrefs() { - gPrefs->Read(wxT("/CsPresets/EQFilterLength"), + gPrefs->Read(wxT("/Effects/Equalization/FilterLength"), &mM, 4001); if ((mM < 21) || (mM > 8191)) { // corrupted Prefs? 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("/CsPresets/EQLin"), &mLin, false); - gPrefs->Read(wxT("/CsPresets/EQdBMin"), &mdBMin, -30.0); + gPrefs->Read(wxT("/Effects/Equalization/CurveName"), &mCurveName, wxT("unnamed")); + gPrefs->Read(wxT("/Effects/Equalization/Lin"), &mLin, false); + gPrefs->Read(wxT("/Effects/Equalization/dBMin"), &mdBMin, -30.0); if ((mdBMin < -120) || (mdBMin > -10)) { // corrupted Prefs? 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? 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("/CsPresets/EQInterp"), &mInterp, 0); - gPrefs->Read(wxT("/CsPresets/EQDrawGrid"), &mDrawGrid, true); + gPrefs->Read(wxT("/Effects/Equalization/DrawMode"), &mDrawMode, true); + gPrefs->Read(wxT("/Effects/Equalization/Interp"), &mInterp, 0); + gPrefs->Read(wxT("/Effects/Equalization/DrawGrid"), &mDrawGrid, true); } EffectEqualization::EffectEqualization() @@ -303,14 +303,14 @@ bool EffectEqualization::PromptUser() if (!mEditingBatchParams) { - gPrefs->Write(wxT("/CsPresets/EQFilterLength"),mM); - gPrefs->Write(wxT("/CsPresets/EQCurveName"),mCurveName); - gPrefs->Write(wxT("/CsPresets/EQLin"),mLin); - gPrefs->Write(wxT("/CsPresets/EQdBMin"),mdBMin); - gPrefs->Write(wxT("/CsPresets/EQdBMax"),mdBMax); - gPrefs->Write(wxT("/CsPresets/EQDrawMode"),mDrawMode); - gPrefs->Write(wxT("/CsPresets/EQInterp"), mInterp); - gPrefs->Write(wxT("/CsPresets/EQDrawGrid"), mDrawGrid); + gPrefs->Write(wxT("/Effects/Equalization/FilterLength"),mM); + gPrefs->Write(wxT("/Effects/Equalization/CurveName"),mCurveName); + gPrefs->Write(wxT("/Effects/Equalization/Lin"),mLin); + gPrefs->Write(wxT("/Effects/Equalization/dBMin"),mdBMin); + gPrefs->Write(wxT("/Effects/Equalization/dBMax"),mdBMax); + gPrefs->Write(wxT("/Effects/Equalization/DrawMode"),mDrawMode); + gPrefs->Write(wxT("/Effects/Equalization/Interp"), mInterp); + gPrefs->Write(wxT("/Effects/Equalization/DrawGrid"), mDrawGrid); } return true; diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 9dd7cf986..2871c8bcd 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -32,7 +32,7 @@ bool EffectNoise::Init() { - gPrefs->Read(wxT("/CsPresets/NoiseGen_Duration"), &mDuration, 1L); + gPrefs->Read(wxT("/Effects/Noise/Duration"), &mDuration, 1L); return true; } @@ -57,12 +57,12 @@ bool EffectNoise::PromptUser() mDuration = mT1 - mT0; dlog.nIsSelection = true; } else { - gPrefs->Read(wxT("/CsPresets/NoiseGen_Duration"), &mDuration, 1L); + gPrefs->Read(wxT("/Effects/Noise/Duration"), &mDuration, 1L); dlog.nIsSelection = false; } - gPrefs->Read(wxT("/CsPresets/NoiseGen_Type"), &noiseType, 0L); - gPrefs->Read(wxT("/CsPresets/NoiseGen_Amp"), &noiseAmplitude, 0.8f); + gPrefs->Read(wxT("/Effects/Noise/Type"), &noiseType, 0L); + gPrefs->Read(wxT("/Effects/Noise/Amplitude"), &noiseAmplitude, 0.8f); // Initialize dialog locals dlog.nDuration = mDuration; @@ -157,10 +157,10 @@ void EffectNoise::Success() when user explicitely setup a value */ 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("/CsPresets/NoiseGen_Amp"), noiseAmplitude); + gPrefs->Write(wxT("/Effects/Noise/Type"), noiseType); + gPrefs->Write(wxT("/Effects/Noise/Amplitude"), noiseAmplitude); } //----------------------------------------------------------------------------