Update cmake for latest libnyquist

LabSound · Feb 26, 2018 · 49e0d79 · 49e0d79
1 parent 602dd86
commit 49e0d79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmake/libnyquist.cmake b/cmake/libnyquist.cmake
@@ -87,20 +87,16 @@ set(      third_nyquist_src
     "${LABSOUND_ROOT}/third_party/libnyquist/src/WavPackDecoder.cpp"
     "${LABSOUND_ROOT}/third_party/libnyquist/src/WavPackDependencies.c"
 )
-file(GLOB third_musepack_dec "${LABSOUND_ROOT}/third_party/libnyquist/third_party/musepack/libmpcdec/*")
-file(GLOB third_musepack_enc "${LABSOUND_ROOT}/third_party/libnyquist/third_party/musepack/libmpcenc/*")
-file(GLOB third_wavpack      "${LABSOUND_ROOT}/third_party/libnyquist/third_party/wavpack/src/*")
-file(GLOB third_modplug      "${LABSOUND_ROOT}/third_party/libnyquist/third_party/libmodplug/src/*")
 
 add_library(libnyquist STATIC
-    ${third_nyquist_h} ${third_nyquist_src}
-    ${third_musepack_dec} ${third_musepack_enc}
-    ${third_wavpack} ${third_modplug})
+    ${third_nyquist_h} ${third_nyquist_src})
 
 _set_CxxVer(libnyquist)
 _set_compile_options(libnyquist)
 
 if (WIN32)
+    target_compile_definitions(libnyquist PRIVATE MODPLUG_STATIC)
+
     _disable_warning(4244)
     _disable_warning(4018)
 endif()

diff --git a/src/core/AudioContext.cpp b/src/core/AudioContext.cpp
@@ -198,6 +198,8 @@ void AudioContext::update()
     const float graphTickDurationMs = frameSizeMs * 16; // = ~5.5ms
     const int graphTickDurationUs = graphTickDurationMs * 1000.f;  // = ~5550us
 
+    // graphKeepAlive keeps the thread alive momentarily (letting tail tasks
+    // finish) even updateThreadShouldRun has been signaled.
     while (updateThreadShouldRun || graphKeepAlive > 0)
     {
         // A `unique_lock` automatically acquires a lock on construction. The purpose of