Merge pull request #3922 from anatoly-os/popping_noise_30_fix

fix #275544: popping noise
musescore · Sep 5, 2018 · 0e6e208 · 0e6e208
2 parents 116c82f + ab9bf85
commit 0e6e208
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 484 deletions.
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
@@ -44,7 +44,8 @@ add_library (fluid STATIC
       ${fluidUi}
       fluidgui.cpp
       dsp.cpp fluid.cpp voice.cpp chan.cpp sfont.cpp
-      conv.cpp gen.cpp mod.cpp tuning.cpp
+      conv.cpp gen.cpp mod.cpp
+      conv.h fluid.h fluidgui.h gen.h sfont.h voice.h
       ${SF3_SRC}
       ${INCS}
       )

diff --git a/fluid/fluid.cpp b/fluid/fluid.cpp
@@ -401,7 +401,9 @@ void Fluid::update_presets()
 void Fluid::process(unsigned len, float* out, float* effect1, float* effect2)
       {
       if (mutex.tryLock()) {
-            for (Voice* v : activeVoices)
+            //we have to copy voices array for proper output sound processing in for loop
+            auto tempVoices = activeVoices;
+            for (Voice* v : tempVoices)
                   v->write(len, out, effect1, effect2);
             mutex.unlock();
             }