From cf66f880503e2fb38d1ee5bf2114c3680ce401b5 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 29 Jan 2018 23:00:59 -0500
Subject: [PATCH] Fix build of mod-nyq-bench

---
 lib-src/mod-nyq-bench/NyqBench.cpp | 15 +++++++++++----
 lib-src/mod-nyq-bench/NyqBench.h   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp
index b7df2d988..6d2017f4e 100755
--- a/lib-src/mod-nyq-bench/NyqBench.cpp
+++ b/lib-src/mod-nyq-bench/NyqBench.cpp
@@ -31,6 +31,7 @@
 #include "effects/EffectManager.h"
 #include "effects/nyquist/Nyquist.h"
 #include "../images/AudacityLogo.xpm"
+#include "widgets/ErrorDialog.h"
 
 #include "NyqBench.h"
 
@@ -138,6 +139,11 @@ extern "C"
 {
    static NyqBench *gBench = NULL;
 
+   static CommandHandlerObject &findme(AudacityProject&)
+   {
+      return *NyqBench::GetBench();
+   }
+
    #ifdef _MSC_VER
       #define DLL_API _declspec(dllexport)
    #else
@@ -185,8 +191,9 @@ extern "C"
             c->AddSeparator();
             c->SetDefaultFlags(AudioIONotBusyFlag, AudioIONotBusyFlag);
             c->AddItem(wxT("NyqBench"),
-                       _("&Nyquist Workbench..."),
-                       FNT(NyqBench, NyqBench::GetBench(), &NyqBench::ShowNyqBench));
+               _("&Nyquist Workbench..."),
+               findme,
+               static_cast<CommandFunctorPointer>(&NyqBench::ShowNyqBench));
 
             c->ClearCurrentMenu();
          }
@@ -1391,7 +1398,7 @@ void NyqBench::OnGo(wxCommandEvent & e)
       mRunning = true;
       UpdateWindowUI();
 
-      p->OnEffect(ID);
+      p->DoEffect(ID, 0);
 
       mRunning = false;
       UpdateWindowUI();
@@ -1767,7 +1774,7 @@ void NyqBench::LoadFile()
 // Connects Audacity menu item to an action in this dll.
 // Only one action implemented so far.
 //----------------------------------------------------------------------------
-void NyqBench::ShowNyqBench()
+void NyqBench::ShowNyqBench(const CommandContext &)
 {
    Show();
 }
diff --git a/lib-src/mod-nyq-bench/NyqBench.h b/lib-src/mod-nyq-bench/NyqBench.h
index 747176841..8a67a985d 100755
--- a/lib-src/mod-nyq-bench/NyqBench.h
+++ b/lib-src/mod-nyq-bench/NyqBench.h
@@ -111,7 +111,7 @@ class NyqBench:public wxFrame
 
    virtual bool Validate();
 
-   void ShowNyqBench();
+   void ShowNyqBench(const CommandContext&);
 
    static NyqBench *GetBench();