Fix for bug #981

src/effects/EffectManager.cpp

@@ -65,10 +65,22 @@ EffectManager::~EffectManager()
 
 // Here solely for the purpose of Nyquist Workbench until
 // a better solution is devised.
-void EffectManager::RegisterEffect(Effect *f)
+const PluginID & EffectManager::RegisterEffect(Effect *f)
 {
-   // This will go away after all effects have been converted
-   mEffects[PluginManager::Get().RegisterPlugin(f)] = f;
+   const PluginID & ID = PluginManager::Get().RegisterPlugin(f);
+
+   mEffects[ID] = f;
+
+   return ID;
+}
+
+// Here solely for the purpose of Nyquist Workbench until
+// a better solution is devised.
+void EffectManager::UnregisterEffect(const PluginID & ID)
+{
+   PluginID id = ID;
+   PluginManager::Get().UnregisterPlugin(id);
+   mEffects.erase(id);
 }
 
 bool EffectManager::DoEffect(const PluginID & ID,

src/effects/EffectManager.h

@@ -56,10 +56,11 @@ public:
    EffectManager();
    virtual ~EffectManager();
 
-   /** Register an effect so it can be executed. */
+   /** (Un)Register an effect so it can be executed. */
    // Here solely for the purpose of Nyquist Workbench until
    // a better solution is devised.
-   void RegisterEffect(Effect *f);
+   const PluginID & RegisterEffect(Effect *f);
+   void UnregisterEffect(const PluginID & ID);
 
    /** Run an effect given the plugin ID */
    // Returns true on success.  Will only operate on tracks that

src/effects/nyquist/Nyquist.cpp

@@ -150,11 +150,6 @@ NyquistEffect::~NyquistEffect()
 {
 }
 
-void NyquistEffect::RedirectOutput()
-{
-   wxFAIL_MSG(XO("JKC: This function used to exist.  Have a look in SVN and see if you can find it") );
-}
-
 // IdentInterface implementation
 
 wxString NyquistEffect::GetPath()
@@ -1180,6 +1175,12 @@ wxArrayString NyquistEffect::ParseChoice(const NyqControl & ctrl)
 
    return choices;
 }
+
+void NyquistEffect::RedirectOutput()
+{
+   mRedirectOutput = true;
+}
+
 void NyquistEffect::SetCommand(wxString cmd)
 {
    mExternal = true;