nyquist support in a module; application need not link libnyquist

Paul-Licameli · Apr 11, 2024 · 0ae04be · 0ae04be
1 parent a74de13
commit 0ae04be
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 47 deletions.
diff --git a/libraries/lib-module-manager/ModuleSettings.cpp b/libraries/lib-module-manager/ModuleSettings.cpp
@@ -93,6 +93,7 @@ static const std::unordered_set<wxString> &autoEnabledModules()
       "mod-vst",
       "mod-vst3",
       "mod-effect-classes",
+      "mod-nyquist",
    };
    return modules;
 }

diff --git a/modules/nyquist/CMakeLists.txt b/modules/nyquist/CMakeLists.txt
@@ -3,6 +3,7 @@
 # The list of modules is ordered so that each module occurs after any others
 # that it depends on
 set( MODULES
+   mod-nyquist
 )
 
 if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )

diff --git a/modules/nyquist/mod-nyq-bench/CMakeLists.txt b/modules/nyquist/mod-nyq-bench/CMakeLists.txt
@@ -14,7 +14,7 @@ set( DEFINES
 )
 set( LIBRARIES
    PRIVATE
-      Audacity
+      mod-nyquist-interface
 )
 audacity_module( ${TARGET} "${SOURCES}" "${LIBRARIES}"
    "${DEFINES}" "" )

diff --git a/modules/nyquist/mod-nyq-bench/NyqBench.cpp b/modules/nyquist/mod-nyq-bench/NyqBench.cpp
@@ -32,7 +32,7 @@
 #include "ShuttleGui.h"
 #include "effects/EffectManager.h"
 #include "effects/EffectUI.h"
-#include "effects/nyquist/Nyquist.h"
+#include "Nyquist.h"
 #include "../images/AudacityLogo.xpm"
 #include "CommandContext.h"
 #include "AudacityMessageBox.h"

diff --git a/modules/nyquist/mod-nyq-bench/NyqBench.h b/modules/nyquist/mod-nyq-bench/NyqBench.h
@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include "CommandManager.h"
-#include "effects/nyquist/Nyquist.h"
+#include "Nyquist.h"
 
 class wxFileName;
 

diff --git a/modules/nyquist/mod-nyquist/CMakeLists.txt b/modules/nyquist/mod-nyquist/CMakeLists.txt
@@ -0,0 +1,21 @@
+#[[
+Interface to the Nyquist library, which can implement effects, generators,
+analyzers, and tools invoking macro commands
+]]
+
+set( SOURCES
+   LoadNyquist.cpp
+   LoadNyquist.h
+   Nyquist.cpp
+   Nyquist.h
+)
+set( LIBRARIES
+   Audacity
+   libnyquist
+)
+
+# Third party libraries used only by this module
+set(EXTRA_CLUSTER_NODES "${LIBRARIES}" PARENT_SCOPE)
+
+audacity_module( mod-nyquist "${SOURCES}" "${LIBRARIES}"
+   "" "" )
diff --git a/src/effects/nyquist/LoadNyquist.cpp → modules/nyquist/mod-nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp → modules/nyquist/mod-nyquist/LoadNyquist.cpp
@@ -8,8 +8,6 @@
 
 **********************************************************************/
 
-
-
 #include "LoadNyquist.h"
 
 #include <wx/log.h>
@@ -271,3 +269,6 @@ bool NyquistEffectsModule::CheckPluginExist(const PluginPath& path) const
 // ============================================================================
 // NyquistEffectsModule implementation
 // ============================================================================
+
+#include "ModuleConstants.h"
+DEFINE_MODULE_ENTRIES
diff --git a/src/effects/nyquist/LoadNyquist.h → modules/nyquist/mod-nyquist/LoadNyquist.h b/src/effects/nyquist/LoadNyquist.h → modules/nyquist/mod-nyquist/LoadNyquist.h
diff --git a/src/effects/nyquist/Nyquist.cpp → modules/nyquist/mod-nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp → modules/nyquist/mod-nyquist/Nyquist.cpp
@@ -24,7 +24,6 @@ effects from this one class.
 
 *//*******************************************************************/
 
-
 #include "Nyquist.h"
 #include "EffectOutputTracks.h"
 
@@ -51,17 +50,17 @@ effects from this one class.
 #include <wx/numformatter.h>
 #include <wx/stdpaths.h>
 
-#include "../../LabelTrack.h"
+#include "LabelTrack.h"
 #include "NoteTrack.h"
-#include "../../ShuttleGetDefinition.h"
-#include "../../prefs/GUIPrefs.h"
-#include "../../prefs/SpectrogramSettings.h"
-#include "../../tracks/playabletrack/wavetrack/ui/WaveChannelView.h"
-#include "../../tracks/playabletrack/wavetrack/ui/WaveChannelViewConstants.h"
-#include "../../widgets/NumericTextCtrl.h"
-#include "../../widgets/valnum.h"
-#include "../EffectEditor.h"
-#include "../EffectManager.h"
+#include "ShuttleGetDefinition.h"
+#include "prefs/GUIPrefs.h"
+#include "prefs/SpectrogramSettings.h"
+#include "tracks/playabletrack/wavetrack/ui/WaveChannelView.h"
+#include "tracks/playabletrack/wavetrack/ui/WaveChannelViewConstants.h"
+#include "widgets/NumericTextCtrl.h"
+#include "widgets/valnum.h"
+#include "effects/EffectEditor.h"
+#include "effects/EffectManager.h"
 #include "AudacityMessageBox.h"
 #include "BasicUI.h"
 #include "FileNames.h"
@@ -3500,7 +3499,7 @@ void NyquistOutputDialog::OnOk(wxCommandEvent & /* event */)
 }
 
 // Registration of extra functions in XLisp.
-#include "../../../lib-src/libnyquist/nyquist/xlisp/xlisp.h"
+#include "nyquist/xlisp/xlisp.h"
 
 static LVAL gettext()
 {
@@ -3583,8 +3582,18 @@ void * nyq_reformat_aud_do_response(const wxString & Str) {
    return (void *)dst;
 }
 
-#include "../../commands/ScriptCommandRelay.h"
+#include "commands/ScriptCommandRelay.h"
+
+
+static void * ExecForLisp( char * pIn )
+{
+   wxString Str1(pIn);
+   wxString Str2;
+
+   ExecFromMain(&Str1, &Str2);
 
+   return nyq_reformat_aud_do_response(Str2);
+}
 
 /* xlc_aud_do -- interface to C routine aud_do */
 /**/

diff --git a/src/effects/nyquist/Nyquist.h → modules/nyquist/mod-nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h → modules/nyquist/mod-nyquist/Nyquist.h
@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_EFFECT_NYQUIST__
 #define __AUDACITY_EFFECT_NYQUIST__
 
-#include "../StatefulEffect.h"
+#include "effects/StatefulEffect.h"
 #include "FileNames.h"
 #include "SampleCount.h"
 #include "wxPanelWrapper.h"
@@ -73,7 +73,7 @@ struct NyquistSettings {
    // Other fields, to do
 };
 
-class AUDACITY_DLL_API NyquistEffect final
+class NyquistEffect final
    : public EffectWithSettings<NyquistSettings, StatefulEffect>
 {
 public:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -334,15 +334,6 @@ list( APPEND SOURCES
       effects/TwoPassSimpleMono.cpp
       effects/TwoPassSimpleMono.h
 
-      # Nyquist Effects
-
-      $<$<BOOL:${USE_NYQUIST}>:
-         effects/nyquist/LoadNyquist.cpp
-         effects/nyquist/LoadNyquist.h
-         effects/nyquist/Nyquist.cpp
-         effects/nyquist/Nyquist.h
-      >
-
       # Export
 
       export/ExportAudioDialog.cpp
@@ -820,7 +811,6 @@ set( LIBRARIES
    PUBLIC
       ${CMAKE_REQUIRED_LIBRARIES}
       ZLIB::ZLIB
-      $<$<BOOL:${USE_NYQUIST}>:libnyquist>
       $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:PkgConfig::GLIB>
       $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD,CYGWIN>:PkgConfig::GTK>
       $<$<TARGET_EXISTS:Threads::Threads>:Threads::Threads>

diff --git a/src/commands/ScriptCommandRelay.cpp b/src/commands/ScriptCommandRelay.cpp
@@ -70,7 +70,7 @@ static int ExecFromWorker(wxString *pIn, wxString *pOut)
 }
 
 /// Executes a command on the main (GUI) thread.
-static int ExecFromMain(wxString *pIn, wxString *pOut)
+int ExecFromMain(wxString *pIn, wxString *pOut)
 {
    return ExecCommand(pIn, pOut, true);
 }
@@ -90,15 +90,3 @@ void ScriptCommandRelay::StartScriptServer(tpRegScriptServerFunc scriptFn)
 
    std::thread(server, scriptFn).detach();
 }
-
-#if USE_NYQUIST
-void * ExecForLisp( char * pIn )
-{
-   wxString Str1(pIn);
-   wxString Str2;
-
-   ExecFromMain(&Str1, &Str2);
-
-   return nyq_reformat_aud_do_response(Str2);
-}
-#endif
diff --git a/src/commands/ScriptCommandRelay.h b/src/commands/ScriptCommandRelay.h
@@ -31,9 +31,6 @@ class AUDACITY_DLL_API ScriptCommandRelay
    static void StartScriptServer(tpRegScriptServerFunc scriptFn);
 };
 
-// The void * return is actually a Lisp LVAL and will be cast to such as needed.
-extern void * ExecForLisp( char * pIn );
-extern void * nyq_make_opaque_string( int size, unsigned char *src );
-extern void * nyq_reformat_aud_do_response(const wxString & Str);
+AUDACITY_DLL_API int ExecFromMain(wxString *pIn, wxString *pOut);
 
 #endif /* End of include guard: __SCRIPT_COMMAND_RELAY__ */