summaryrefslogtreecommitdiffstats
path: root/src/engine/enginemaster.h
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2015-08-23 22:55:30 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2015-08-23 22:56:53 +0200
commit54cd59bff2a1d1fd7468af3c2e36d1a783035924 (patch)
treecf864a8cf9c5d34c6e3df7dfc89b736d5f2c1797 /src/engine/enginemaster.h
parentec2efcea330d0c2cc3501e424e4f5de10213a550 (diff)
Added Sidechain stream to SoundMamager
Diffstat (limited to 'src/engine/enginemaster.h')
-rw-r--r--src/engine/enginemaster.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/engine/enginemaster.h b/src/engine/enginemaster.h
index 212160032a..c963172060 100644
--- a/src/engine/enginemaster.h
+++ b/src/engine/enginemaster.h
@@ -129,9 +129,10 @@ class EngineMaster : public QObject, public AudioSource {
const CSAMPLE* getOutputBusBuffer(unsigned int i) const;
const CSAMPLE* getDeckBuffer(unsigned int i) const;
const CSAMPLE* getChannelBuffer(QString name) const;
+ const CSAMPLE* getSidechainBuffer() const;
EngineSideChain* getSideChain() const {
- return m_pSideChain;
+ return m_pEngineSideChain;
}
struct ChannelInfo {
@@ -291,6 +292,8 @@ class EngineMaster : public QObject, public AudioSource {
CSAMPLE* m_pHead;
CSAMPLE* m_pTalkover;
+ CSAMPLE** m_ppSidechain; // points to master or to talkover buffer
+
EngineWorkerScheduler* m_pWorkerScheduler;
EngineSync* m_pMasterSync;
@@ -308,7 +311,7 @@ class EngineMaster : public QObject, public AudioSource {
EngineDelay* m_pHeadDelay;
EngineVuMeter* m_pVumeter;
- EngineSideChain* m_pSideChain;
+ EngineSideChain* m_pEngineSideChain;
ControlPotmeter* m_pCrossfader;
ControlPotmeter* m_pHeadMix;