From ea35af8ea19268e2e609d2fb4ebef0ee59195cd0 Mon Sep 17 00:00:00 2001
From: Avery King <avery98@pm.me>
Date: Fri, 3 Jan 2025 18:22:36 -0800
Subject: [PATCH] Further MIDI build option fixes

- Properly disable lib-note-track when MIDI is disabled
- Fix includes of NoteTrack.h when MIDI is disabled.

Signed-off-by: Avery King <avery98@pm.me>
---
 libraries/lib-builtin-effects/CMakeLists.txt     | 2 +-
 libraries/lib-builtin-effects/SoundTouchBase.cpp | 5 ++++-
 libraries/lib-nyquist-effects/CMakeLists.txt     | 3 ++-
 libraries/lib-nyquist-effects/NyquistBase.cpp    | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/lib-builtin-effects/CMakeLists.txt b/libraries/lib-builtin-effects/CMakeLists.txt
index 2ee16921e..377c4478a 100644
--- a/libraries/lib-builtin-effects/CMakeLists.txt
+++ b/libraries/lib-builtin-effects/CMakeLists.txt
@@ -94,7 +94,7 @@ set( LIBRARIES
    lib-dynamic-range-processor-interface
    lib-wave-track-fft-interface
    lib-label-track-interface
-   lib-note-track-interface
+   $<$<BOOL:${USE_MIDI}>:lib-note-track-interface>
    $<$<BOOL:${USE_SBSMS}>:sbsms::sbsms>
    $<$<BOOL:${USE_SOUNDTOUCH}>:SoundTouch::SoundTouch>
 )
diff --git a/libraries/lib-builtin-effects/SoundTouchBase.cpp b/libraries/lib-builtin-effects/SoundTouchBase.cpp
index 8bc7963df..9230b683e 100644
--- a/libraries/lib-builtin-effects/SoundTouchBase.cpp
+++ b/libraries/lib-builtin-effects/SoundTouchBase.cpp
@@ -24,9 +24,12 @@ effect that uses SoundTouch to do its processing (ChangeTempo
 #include "SyncLock.h"
 #include "WaveClip.h"
 #include "WaveTrack.h"
-#include "NoteTrack.h"
 #include "TimeWarper.h"
 
+#ifdef USE_MIDI
+#include "NoteTrack.h"
+#endif
+
 // Soundtouch defines these as well, which are also in generated configmac.h
 // and configunix.h, so get rid of them before including,
 // to avoid compiler warnings, and be sure to do this
diff --git a/libraries/lib-nyquist-effects/CMakeLists.txt b/libraries/lib-nyquist-effects/CMakeLists.txt
index 0f32b50bb..9e7e3661f 100644
--- a/libraries/lib-nyquist-effects/CMakeLists.txt
+++ b/libraries/lib-nyquist-effects/CMakeLists.txt
@@ -11,11 +11,12 @@ set( SOURCES
 set( LIBRARIES
    lib-effects-interface
    lib-label-track-interface
-   lib-note-track-interface
+   $<$<BOOL:${USE_MIDI}>:lib-note-track-interface>
    lib-time-track-interface
    lib-wave-track-settings
    nyquist
 )
+
 tenacity_library( lib-nyquist-effects "${SOURCES}" "${LIBRARIES}"
    "" ""
 )
diff --git a/libraries/lib-nyquist-effects/NyquistBase.cpp b/libraries/lib-nyquist-effects/NyquistBase.cpp
index f1036fcd8..ae5cc8a0d 100644
--- a/libraries/lib-nyquist-effects/NyquistBase.cpp
+++ b/libraries/lib-nyquist-effects/NyquistBase.cpp
@@ -14,7 +14,6 @@
 #include "FileNames.h"
 #include "LabelTrack.h"
 #include "Languages.h"
-#include "NoteTrack.h"
 #include "PlatformCompatibility.h"
 #include "PluginManager.h"
 #include "Prefs.h"
@@ -32,6 +31,10 @@
 #include "WaveTrack.h"
 #include "wxFileNameWrapper.h"
 
+#ifdef USE_MIDI
+#include "NoteTrack.h"
+#endif
+
 #include "nyquist/xlisp/xlisp.h"
 #include "nyx.h"