use COS in some more classes

2 files changed, 7 insertions, 8 deletions

diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index ede86f44d9..3b829ae0a6 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -9,6 +9,7 @@
 #include "engine/sidechain/enginesidechain.h"
 #include "engine/sidechain/enginerecord.h"
 #include "controlpushbutton.h"
+#include "controlobjectslave.h"
 #include "engine/enginemaster.h"
 
 RecordingManager::RecordingManager(ConfigObject<ConfigValue>* pConfig, EngineMaster* pEngine)
@@ -26,7 +27,7 @@ RecordingManager::RecordingManager(ConfigObject<ConfigValue>* pConfig, EngineMas
     connect(m_pToggleRecording, SIGNAL(valueChanged(double)),
             this, SLOT(slotToggleRecording(double)));
     m_recReadyCO = new ControlObject(ConfigKey(RECORDING_PREF_KEY, "status"));
-    m_recReady = new ControlObjectThread(m_recReadyCO->getKey());
+    m_recReady = new ControlObjectSlave(m_recReadyCO->getKey(), this);
 
     m_split_size = getFileSplitSize();
 
@@ -45,11 +46,9 @@ RecordingManager::RecordingManager(ConfigObject<ConfigValue>* pConfig, EngineMas
     }
 }
 
-RecordingManager::~RecordingManager()
-{
+RecordingManager::~RecordingManager() {
     qDebug() << "Delete RecordingManager";
 
-    delete m_recReady;
     delete m_recReadyCO;
     delete m_pToggleRecording;
 }
@@ -110,13 +109,13 @@ void RecordingManager::startRecording(bool generateFileName) {
         m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), new_base_filename +".cue");
         m_recordingFile = QFileInfo(m_recordingLocation).fileName();
     }
-    m_recReady->slotSet(RECORD_READY);
+    m_recReady->set(RECORD_READY);
 }
 
 void RecordingManager::stopRecording()
 {
     qDebug() << "Recording stopped";
-    m_recReady->slotSet(RECORD_OFF);
+    m_recReady->set(RECORD_OFF);
     m_recordingFile = "";
     m_recordingLocation = "";
     m_iNumberOfBytesRecorded = 0;
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index 93b1ffdefd..5a5f759b88 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -7,7 +7,6 @@
 
 #include "configobject.h"
 #include "controlobject.h"
-#include "controlobjectthread.h"
 #include "recording/defs_recording.h"
 
 //
@@ -23,6 +22,7 @@
 
 class EngineMaster;
 class ControlPushButton;
+class ControlObjectSlave;
 
 class RecordingManager : public QObject
 {
@@ -65,7 +65,7 @@ class RecordingManager : public QObject
 
   private:
     QString formatDateTimeForFilename(QDateTime dateTime) const;
-    ControlObjectThread* m_recReady;
+    ControlObjectSlave* m_recReady;
     ControlObject* m_recReadyCO;
     ControlPushButton* m_pToggleRecording;