From 814ed57a6883ddb31ccb9cef27f6ce047e1e64e9 Mon Sep 17 00:00:00 2001 From: lllucius Date: Mon, 8 Dec 2014 03:11:20 +0000 Subject: [PATCH] Better resolution than r13716 The hairbrained "solution" I came up with in r13716 "worked" but it was simply unnecessary and this is what I should have just done to begin with. The previous "solution" actually caused some display issues in the menus. --- src/effects/ChangePitch.h | 2 +- src/effects/ChangeSpeed.h | 2 +- src/effects/ChangeTempo.h | 2 +- src/effects/ClickRemoval.h | 2 +- src/effects/DtmfGen.h | 2 +- src/effects/Effect.cpp | 25 +------------------------ src/effects/Fade.h | 4 ++-- src/effects/FindClipping.h | 2 +- src/effects/NoiseReduction.cpp | 2 +- src/effects/NoiseRemoval.h | 2 +- src/effects/StereoToMono.h | 2 +- src/effects/TimeScale.h | 2 +- src/effects/TruncSilence.h | 2 +- 13 files changed, 14 insertions(+), 37 deletions(-) diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 71d5d09e9..cfb33e071 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -42,7 +42,7 @@ class EffectChangePitch : public EffectSoundTouch } virtual wxString GetEffectIdentifier() { - return wxString(wxT("ChangePitch")); + return wxString(wxT("Change Pitch")); } virtual wxString GetEffectAction() { diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 9ca654cdc..e5ab4af96 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -40,7 +40,7 @@ class EffectChangeSpeed : public Effect } virtual wxString GetEffectIdentifier() { - return wxString(wxT("ChangeSpeed")); + return wxString(wxT("Change Speed")); } virtual wxString GetEffectAction() { diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index c2db0d275..6a213cc21 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -42,7 +42,7 @@ class EffectChangeTempo : public EffectSoundTouch { } virtual wxString GetEffectIdentifier() { - return wxString(wxT("ChangeTempo")); + return wxString(wxT("Change Tempo")); } virtual wxString GetEffectAction() { diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index 44391ee6e..f6cbc62fe 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -49,7 +49,7 @@ public: } virtual wxString GetEffectIdentifier() { - return wxString(wxT("ClickRemoval")); + return wxString(wxT("Click Removal")); } virtual wxString GetEffectAction() { diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index 5eb5ce7f9..9175bcb08 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -48,7 +48,7 @@ class EffectDtmf : public Generator { } virtual wxString GetEffectIdentifier() { - return wxString(wxT("DTMFTone")); + return wxString(wxT("DTMF Tones")); } virtual wxString GetEffectDescription() { diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 4c3eb9d88..9a5c35fb5 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -175,30 +175,7 @@ wxString Effect::GetName() return mClient->GetName(); } - // Break up identifier into words based on caps - // - // EffectManager::GetEffectIdentifier() CamelCases identifiers based on - // blank delimited words. But not all legacy effects have blank delimted - // words and were manually CamelCased. So use that to break up the ident - // into words - // - // This is only temporary and will go away when the legacy effects - // get converted. - // - wxString ident = GetEffectIdentifier(); - wxString name; - - for (size_t i = 0, cnt = ident.Len(); i < cnt; i++) - { - wxChar c = ident.GetChar(i); - if (wxIsupper(c) && i != 0) - { - name += wxT(' '); - } - name += c; - } - - return name; + return GetEffectIdentifier(); } wxString Effect::GetVendor() diff --git a/src/effects/Fade.h b/src/effects/Fade.h index e1ef0459e..ccb561a9a 100644 --- a/src/effects/Fade.h +++ b/src/effects/Fade.h @@ -31,7 +31,7 @@ class EffectFadeIn: public EffectSimpleMono { } virtual wxString GetEffectIdentifier() { - return wxString(wxT("FadeIn")); + return wxString(wxT("Fade In")); } virtual wxString GetEffectAction() { @@ -65,7 +65,7 @@ class EffectFadeOut:public EffectSimpleMono { } virtual wxString GetEffectIdentifier() { - return wxString(wxT("FadeOut")); + return wxString(wxT("Fade Out")); } virtual wxString GetEffectAction() { diff --git a/src/effects/FindClipping.h b/src/effects/FindClipping.h index 19855a731..5d4a942ec 100644 --- a/src/effects/FindClipping.h +++ b/src/effects/FindClipping.h @@ -46,7 +46,7 @@ class EffectFindClipping:public Effect virtual wxString GetEffectIdentifier() { - return wxString(wxT("FindClipping")); + return wxString(wxT("Find Clipping")); } virtual wxString GetEffectAction() diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 5a49e2b4f..c60462cd3 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -432,7 +432,7 @@ std::set EffectNoiseReduction::GetEffectCategories() wxString EffectNoiseReduction::GetEffectIdentifier() { - return wxString(wxT("NoiseReduction")); + return wxString(wxT("Noise Reduction")); } wxString EffectNoiseReduction::GetEffectAction() diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 6b16ead87..b4c4c5190 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -44,7 +44,7 @@ public: } virtual wxString GetEffectIdentifier() { - return wxString(wxT("NoiseRemoval")); + return wxString(wxT("Noise Removal")); } virtual wxString GetEffectAction() { diff --git a/src/effects/StereoToMono.h b/src/effects/StereoToMono.h index 907e0586d..603e79275 100644 --- a/src/effects/StereoToMono.h +++ b/src/effects/StereoToMono.h @@ -31,7 +31,7 @@ public: // Used internally, users will not see this. Do not translate. virtual wxString GetEffectIdentifier() { - return wxT("StereoToMono"); + return wxT("Stereo To Mono"); } virtual wxString GetEffectAction() { diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 5bce205ee..26cbc2d41 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -40,7 +40,7 @@ class EffectTimeScale : public EffectSBSMS { } virtual wxString GetEffectIdentifier() { - return wxString(wxT("TimeScale")); + return wxString(wxT("Time Scale")); } virtual wxString GetEffectAction() { diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index 854a0a668..e0db36c6b 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -44,7 +44,7 @@ public: } virtual wxString GetEffectIdentifier() { - return wxString(wxT("TruncateSilence")); + return wxString(wxT("Truncate Silence")); } virtual wxString GetEffectAction() {