FxMixer, ValueBuffer, etc. fixes

include/FxMixer.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _FX_MIXER_H
-#define _FX_MIXER_H
+#ifndef FX_MIXER_H
+#define FX_MIXER_H
 
 #include "Model.h"
 #include "Mixer.h"

include/MixHelpers.h

@@ -22,11 +22,12 @@
  *
  */
 
-#ifndef _MIX_HELPERS_H
-#define _MIX_HELPERS_H
+#ifndef MIX_HELPERS_H
+#define MIX_HELPERS_H
 
 #include "lmms_basics.h"
 
+class ValueBuffer;
 namespace MixHelpers
 {
 
@@ -39,6 +40,12 @@ void add( sampleFrame* dst, const sampleFrame* src, int frames );
 /*! \brief Add samples from src multiplied by coeffSrc to dst */
 void addMultiplied( sampleFrame* dst, const sampleFrame* src, float coeffSrc, int frames );
 
+/*! \brief Add samples from src multiplied by coeffSrc and coeffSrcBuf to dst */
+void addMultipliedByBuffer( sampleFrame* dst, const sampleFrame* src, float coeffSrc, ValueBuffer * coeffSrcBuf, int frames );
+
+/*! \brief Add samples from src multiplied by coeffSrc and coeffSrcBuf to dst */
+void addMultipliedByBuffers( sampleFrame* dst, const sampleFrame* src, ValueBuffer * coeffSrcBuf1, ValueBuffer * coeffSrcBuf2, int frames );
+
 
 /*! \brief Add samples from src multiplied by coeffSrcLeft/coeffSrcRight to dst */
 void addMultipliedStereo( sampleFrame* dst, const sampleFrame* src, float coeffSrcLeft, float coeffSrcRight, int frames );

include/ValueBuffer.h

@@ -26,6 +26,7 @@
 #ifndef VALUE_BUFFER_H
 #define VALUE_BUFFER_H
 
+#include <QtGlobal>
 #include "interpolation.h"
 #include <string.h>