diff options
author | Nicu Badescu <badescunicu@yahoo.com> | 2014-09-05 00:28:43 +0300 |
---|---|---|
committer | Nicu Badescu <badescunicu@yahoo.com> | 2014-09-05 00:28:43 +0300 |
commit | 94b4013222577d91557acaf3253337503133d577 (patch) | |
tree | bf6f2b59dac4515a7d9a24767b6d8bbb805900d4 /src/engine/enginedeck.h | |
parent | b04311f6f47c34165484992c022abcb24bfd4f31 (diff) | |
parent | 84540f12bda682e078c21141a2ab3e515710a12c (diff) |
Fix conflicts
Diffstat (limited to 'src/engine/enginedeck.h')
-rw-r--r-- | src/engine/enginedeck.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/engine/enginedeck.h b/src/engine/enginedeck.h index ea075659ab..2fb1641c67 100644 --- a/src/engine/enginedeck.h +++ b/src/engine/enginedeck.h @@ -18,11 +18,12 @@ #ifndef ENGINEDECK_H #define ENGINEDECK_H -#include "util/circularbuffer.h" +#include "configobject.h" +#include "controlobjectslave.h" #include "controlpushbutton.h" #include "engine/engineobject.h" #include "engine/enginechannel.h" -#include "configobject.h" +#include "util/circularbuffer.h" #include "soundmanagerutil.h" @@ -46,6 +47,7 @@ class EngineDeck : public EngineChannel, public AudioDestination { virtual ~EngineDeck(); virtual void process(CSAMPLE* pOutput, const int iBufferSize); + virtual void postProcess(const int iBufferSize); // TODO(XXX) This hack needs to be removed. virtual EngineBuffer* getEngineBuffer(); @@ -81,6 +83,7 @@ class EngineDeck : public EngineChannel, public AudioDestination { EngineVinylSoundEmu* m_pVinylSoundEmu; EngineVuMeter* m_pVUMeter; EngineEffectsManager* m_pEngineEffectsManager; + ControlObjectSlave* m_pSampleRate; // Begin vinyl passthrough fields ControlPushButton* m_pPassing; |