Fix conflicts

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;