From dee27e052f332ae3711bc7a9d5ad2ab40de2e0b9 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 23 Jun 2019 08:09:58 -0400
Subject: [PATCH] Free Nyquist.cpp from cycles...

... Very easily, just by demoting two macros from Nyquist.h to Effect.h.

The graph improvement is worth this bit of preprocessor namespace pollution.
---
 src/effects/Effect.cpp        | 1 -
 src/effects/Effect.h          | 9 +++++++++
 src/effects/nyquist/Nyquist.h | 8 --------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 0e23425f9..2f06c9db1 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -68,7 +68,6 @@ greater use in future.
 #include "../widgets/ProgressDialog.h"
 #include "../ondemand/ODManager.h"
 #include "TimeWarper.h"
-#include "nyquist/Nyquist.h"
 #include "../widgets/HelpSystem.h"
 #include "../widgets/LinkingHtmlWindow.h"
 #include "../widgets/NumericTextCtrl.h"
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index 5bffba41c..1307706e8 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -51,6 +51,15 @@ class TrackList;
 class TrackFactory;
 class WaveTrack;
 
+/* i18n-hint: "Nyquist" is an embedded interpreted programming language in
+ Audacity, named in honor of the Swedish-American Harry Nyquist (or Nyqvist).
+ In the translations of this and other strings, you may transliterate the
+ name into another alphabet.  */
+#define NYQUISTEFFECTS_FAMILY ( EffectFamilySymbol{ XO("Nyquist") } )
+
+#define NYQUIST_PROMPT_ID wxT("Nyquist Prompt")
+#define NYQUIST_WORKER_ID wxT("Nyquist Worker")
+
 // TODO:  Apr-06-2015
 // TODO:  Much more cleanup of old methods and variables is needed, but
 // TODO:  can't be done until after all effects are using the NEW API.
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index cf54f3abd..b68c91941 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -21,14 +21,6 @@ class wxCheckBox;
 class wxTextCtrl;
 
 #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0")
-/* i18n-hint: "Nyquist" is an embedded interpreted programming language in
- Audacity, named in honor of the Swedish-American Harry Nyquist (or Nyqvist).
- In the translations of this and other strings, you may transliterate the
- name into another alphabet.  */
-#define NYQUISTEFFECTS_FAMILY ( EffectFamilySymbol{ XO("Nyquist") } )
-
-#define NYQUIST_PROMPT_ID wxT("Nyquist Prompt")
-#define NYQUIST_WORKER_ID wxT("Nyquist Worker")
 
 enum NyqControlType
 {