zynaddsubfx

commit c43cbe89780902cd0cd242d81ac09405bba1bd57
parent 9d05fae274fa74cd84a73f679f46ed3e1969f939
Author: falkTX <[email protected]>
Date:   Sun, 14 Feb 2016 17:37:25 +0100

Merge branch 'dpf-plugin'

Diffstat:
M
src/Misc/CallbackRepeater.h
 | 
1
+
M
src/Misc/Part.cpp
 | 
5
++++-
M
src/Plugin/ZynAddSubFX/ZynAddSubFX.cpp
 | 
4
++--

3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Misc/CallbackRepeater.h b/src/Misc/CallbackRepeater.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <functional>
 #include <ctime>
 
diff --git a/src/Misc/Part.cpp b/src/Misc/Part.cpp
@@ -323,7 +323,7 @@ void Part::defaultsinstrument()
     Pdrummode = 0;
 
     for(int n = 0; n < NUM_KIT_ITEMS; ++n) {
-        kit[n].Penabled    = false;
+        //kit[n].Penabled    = false;
         kit[n].Pmuted      = false;
         kit[n].Pminkey     = 0;
         kit[n].Pmaxkey     = 127;
@@ -858,6 +858,9 @@ void Part::setkititemstatus(unsigned kititem, bool Penabled_)
         delete kkit.adpars;
         delete kkit.subpars;
         delete kkit.padpars;
+        kkit.adpars  = nullptr;
+        kkit.subpars = nullptr;
+        kkit.padpars = nullptr;
         kkit.Pname[0] = '\0';
 
         notePool.killAllNotes();
diff --git a/src/Plugin/ZynAddSubFX/ZynAddSubFX.cpp b/src/Plugin/ZynAddSubFX/ZynAddSubFX.cpp
@@ -333,8 +333,8 @@ protected:
         {
             //if (! isOffline())
             {
-                std::memset(outputs[0], 0, frames);
-                std::memset(outputs[1], 0, frames);
+                std::memset(outputs[0], 0, sizeof(float)*frames);
+                std::memset(outputs[1], 0, sizeof(float)*frames);
                 return;
             }