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

Fix duplication of Nyquist Prompt.

Browse Source 
Now just one Nyquist Prompt, and it's in the tools menu.
This commit is contained in:
James Crook 2018-08-03 16:00:53 +01:00
parent ecd09a19de
commit 1192914460
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Menus.cpp
View File

@ -1792,6 +1792,7 @@ void AudacityProject::PopulateEffectsMenu(CommandManager* c,
// Move Nyquist prompt into nyquist group. // Move Nyquist prompt into nyquist group.
&& (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Effects Prompt")) && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Effects Prompt"))
&& (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Tools Prompt")) && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Tools Prompt"))
&& (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Prompt"))
#endif #endif
) )
defplugs.push_back(plug); defplugs.push_back(plug);

3
src/effects/nyquist/LoadNyquist.cpp
View File

@ -175,12 +175,15 @@ bool NyquistEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
wxArrayString files; wxArrayString files;
wxString ignoredErrMsg; wxString ignoredErrMsg;
#if 0
if (!pm.IsPluginRegistered(NYQUIST_EFFECTS_PROMPT_ID)) if (!pm.IsPluginRegistered(NYQUIST_EFFECTS_PROMPT_ID))
{ {
// No checking of error ? // No checking of error ?
DiscoverPluginsAtPath(NYQUIST_EFFECTS_PROMPT_ID, ignoredErrMsg, DiscoverPluginsAtPath(NYQUIST_EFFECTS_PROMPT_ID, ignoredErrMsg,
PluginManagerInterface::DefaultRegistrationCallback); PluginManagerInterface::DefaultRegistrationCallback);
} }
#endif
if (!pm.IsPluginRegistered(NYQUIST_TOOLS_PROMPT_ID)) if (!pm.IsPluginRegistered(NYQUIST_TOOLS_PROMPT_ID))
{ {
// No checking of error ? // No checking of error ?

4
src/effects/nyquist/Nyquist.cpp
View File

@ -166,7 +166,7 @@ NyquistEffect::NyquistEffect(const wxString &fName)
// Interactive Nyquist (for general tools) // Interactive Nyquist (for general tools)
if (fName == NYQUIST_TOOLS_PROMPT_ID) { if (fName == NYQUIST_TOOLS_PROMPT_ID) {
mName = XO("Nyquist Tools Prompt"); mName = XO("Nyquist Prompt");
mType = EffectTypeTool; mType = EffectTypeTool;
mIsTool = true; mIsTool = true;
mPromptName = mName; mPromptName = mName;
@ -212,7 +212,7 @@ IdentInterfaceSymbol NyquistEffect::GetSymbol()
{ {
if (mIsPrompt) if (mIsPrompt)
return (mType == EffectTypeTool) ? return (mType == EffectTypeTool) ?
XO("Nyquist Tools Prompt") : XO("Nyquist Prompt") :
XO("Nyquist Effects Prompt"); XO("Nyquist Effects Prompt");
return mName; return mName;

4
src/effects/nyquist/Nyquist.h
View File

@ -35,7 +35,7 @@
#define NYQUISTEFFECTS_FAMILY ( IdentInterfaceSymbol{ XO("Nyquist") } ) #define NYQUISTEFFECTS_FAMILY ( IdentInterfaceSymbol{ XO("Nyquist") } )
#define NYQUIST_EFFECTS_PROMPT_ID wxT("Nyquist Effects Prompt") #define NYQUIST_EFFECTS_PROMPT_ID wxT("Nyquist Effects Prompt")
#define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Tools Prompt") #define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Prompt")
#define NYQUIST_WORKER_ID wxT("Nyquist Worker") #define NYQUIST_WORKER_ID wxT("Nyquist Worker")
enum NyqControlType enum NyqControlType
@ -221,7 +221,7 @@ private:
bool mIsSpectral; bool mIsSpectral;
bool mIsTool; bool mIsTool;
/** True if the code to execute is obtained interactively from the user via /** True if the code to execute is obtained interactively from the user via
* the "Nyquist Effect Prompt", or "Nyquist Tools Prompt", false for all other effects (lisp code read from * the "Nyquist Effect Prompt", or "Nyquist Prompt", false for all other effects (lisp code read from
* files) * files)
*/ */
bool mIsPrompt; bool mIsPrompt;