6 files changed, 15 insertions, 15 deletions
diff --git a/src/engine/sidechain/enginerecord.cpp b/src/engine/sidechain/enginerecord.cpp
index 7a626bca8d..8d00f090a2 100644
--- a/src/engine/sidechain/enginerecord.cpp
+++ b/src/engine/sidechain/enginerecord.cpp
@@ -17,7 +17,7 @@
 
 #include "engine/sidechain/enginerecord.h"
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobject.h"
 #include "controlobjectslave.h"
 #include "encoder/encoder.h"
@@ -37,7 +37,7 @@
 
 const int kMetaDataLifeTimeout = 16;
 
-EngineRecord::EngineRecord(ConfigObject<ConfigValue>* _config)
+EngineRecord::EngineRecord(UserSettingsPointer _config)
         : m_pConfig(_config),
           m_pEncoder(NULL),
           m_pSndfile(NULL),
diff --git a/src/engine/sidechain/enginerecord.h b/src/engine/sidechain/enginerecord.h
index d67623a232..0810bf1330 100644
--- a/src/engine/sidechain/enginerecord.h
+++ b/src/engine/sidechain/enginerecord.h
@@ -28,7 +28,7 @@
 #endif
 #include <sndfile.h>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "encoder/encodercallback.h"
 #include "engine/sidechain/sidechainworker.h"
 #include "trackinfoobject.h"
@@ -40,13 +40,13 @@ class Encoder;
 class EngineRecord : public QObject, public EncoderCallback, public SideChainWorker {
     Q_OBJECT
   public:
-    EngineRecord(ConfigObject<ConfigValue>* _config);
+    EngineRecord(UserSettingsPointer _config);
     virtual ~EngineRecord();
 
     void process(const CSAMPLE* pBuffer, const int iBufferSize);
     void shutdown() {}
 
-    // writes compressed audio to file 
+    // writes compressed audio to file
     void write(unsigned char *header, unsigned char *body, int headerLen, int bodyLen);
     // creates or opens an audio file
     bool openFile();
@@ -73,7 +73,7 @@ class EngineRecord : public QObject, public EncoderCallback, public SideChainWor
 
     void writeCueLine();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     Encoder* m_pEncoder;
     QByteArray m_OGGquality;
     QByteArray m_MP3quality;
diff --git a/src/engine/sidechain/engineshoutcast.cpp b/src/engine/sidechain/engineshoutcast.cpp
index f9f6c27ac2..b179e97034 100644
--- a/src/engine/sidechain/engineshoutcast.cpp
+++ b/src/engine/sidechain/engineshoutcast.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #include "engine/sidechain/engineshoutcast.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "mixer/playerinfo.h"
 #include "encoder/encoder.h"
 #include "encoder/encodermp3.h"
@@ -44,7 +44,7 @@ static const int kMaxNetworkCache = 491520;  // 10 s mp3 @ 192 kbit/s
 static const int kMaxShoutFailures = 3;
 
 
-EngineShoutcast::EngineShoutcast(ConfigObject<ConfigValue>* _config)
+EngineShoutcast::EngineShoutcast(UserSettingsPointer _config)
         : m_pTextCodec(NULL),
           m_pMetaData(),
           m_pShout(NULL),
diff --git a/src/engine/sidechain/engineshoutcast.h b/src/engine/sidechain/engineshoutcast.h
index 56d9de6969..91b5c89bb5 100644
--- a/src/engine/sidechain/engineshoutcast.h
+++ b/src/engine/sidechain/engineshoutcast.h
@@ -26,7 +26,7 @@
 #include <QMutex>
 #include <QSemaphore>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobject.h"
 #include "controlobjectslave.h"
 #include "encoder/encodercallback.h"
@@ -56,7 +56,7 @@ class EngineShoutcast :
         STATUSCO_FAILURE = 3 // Happens when disconnected by an error
     };
 
-    EngineShoutcast(ConfigObject<ConfigValue>* _config);
+    EngineShoutcast(UserSettingsPointer _config);
     virtual ~EngineShoutcast();
 
     // This is called by the Engine implementation for each sample. Encode and
@@ -126,7 +126,7 @@ class EngineShoutcast :
     int m_iMetaDataLife;
     long m_iShoutStatus;
     long m_iShoutFailures;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     Encoder* m_encoder;
     ControlPushButton* m_pShoutcastEnabled;
     ControlObjectSlave* m_pMasterSamplerate;
diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp
index 498300710d..85ae0e06ae 100644
--- a/src/engine/sidechain/enginesidechain.cpp
+++ b/src/engine/sidechain/enginesidechain.cpp
@@ -36,7 +36,7 @@
 
 #define SIDECHAIN_BUFFER_SIZE 65536
 
-EngineSideChain::EngineSideChain(ConfigObject<ConfigValue>* pConfig)
+EngineSideChain::EngineSideChain(UserSettingsPointer pConfig)
         : m_pConfig(pConfig),
           m_bStopThread(false),
           m_sampleFifo(SIDECHAIN_BUFFER_SIZE),
diff --git a/src/engine/sidechain/enginesidechain.h b/src/engine/sidechain/enginesidechain.h
index 8391ea87e1..af65873f70 100644
--- a/src/engine/sidechain/enginesidechain.h
+++ b/src/engine/sidechain/enginesidechain.h
@@ -22,7 +22,7 @@
 #include <QWaitCondition>
 #include <QList>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "engine/sidechain/sidechainworker.h"
 #include "util/fifo.h"
 #include "util/types.h"
@@ -30,7 +30,7 @@
 class EngineSideChain : public QThread {
     Q_OBJECT
   public:
-    EngineSideChain(ConfigObject<ConfigValue>* pConfig);
+    EngineSideChain(UserSettingsPointer pConfig);
     virtual ~EngineSideChain();
 
     // Not thread-safe, wait-free. Submit buffer of samples to the sidechain for
@@ -44,7 +44,7 @@ class EngineSideChain : public QThread {
   private:
     void run();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     // Indicates that the thread should exit.
     volatile bool m_bStopThread;