Move channel mixing out of EngineMaster and into an auto-generated Ch…

…annelMixer class.
mixxxdj · Jul 17, 2013 · 63b8411 · 63b8411
1 parent 32993f4
commit 63b8411
Show file tree

Hide file tree

Showing 5 changed files with 2,294 additions and 171 deletions.
diff --git a/build/depends.py b/build/depends.py
@@ -489,6 +489,7 @@ def sources(self, build):
                    "engine/enginemicrophone.cpp",
                    "engine/enginedeck.cpp",
                    "engine/enginepassthrough.cpp",
+                   "engine/channelmixer_autogen.cpp",
 
                    "engine/enginecontrol.cpp",
                    "engine/ratecontrol.cpp",
@@ -735,7 +736,7 @@ def sources(self, build):
                    "util/timer.cpp",
                    "util/performancetimer.cpp",
                    "util/version.cpp",
-                   "util/rlimit.cpp", 
+                   "util/rlimit.cpp",
 
                    # Add the QRC file which compiles in some extra resources
                    # (prefs icons, etc.)

diff --git a/src/engine/channelmixer.h b/src/engine/channelmixer.h
@@ -0,0 +1,18 @@
+#ifndef CHANNELMIXER_H
+#define CHANNELMIXER_H
+
+#include "defs.h"
+#include "engine/enginemaster.h"
+
+class ChannelMixer {
+  public:
+    static void mixChannels(const QList<EngineMaster::ChannelInfo*>& channels,
+                            const EngineMaster::GainCalculator& gainCalculator,
+                            unsigned int channelBitvector,
+                            unsigned int maxChannels,
+                            QList<CSAMPLE>* channelGainCache,
+                            CSAMPLE* pOutput,
+                            unsigned int iBufferSize);
+};
+
+#endif /* CHANNELMIXER_H */