diff options
Diffstat (limited to 'src/engine')
44 files changed, 76 insertions, 76 deletions
diff --git a/src/engine/bpmcontrol.cpp b/src/engine/bpmcontrol.cpp index 9868341eca..ee077ef325 100644 --- a/src/engine/bpmcontrol.cpp +++ b/src/engine/bpmcontrol.cpp @@ -21,7 +21,7 @@ const int filterLength = 5; const int kLocalBpmSpan = 4; BpmControl::BpmControl(QString group, - ConfigObject<ConfigValue>* _config) : + UserSettingsPointer _config) : EngineControl(group, _config), m_dPreviousSample(0), m_dSyncTargetBeatDistance(0.0), diff --git a/src/engine/bpmcontrol.h b/src/engine/bpmcontrol.h index ccac4db807..03fec69e00 100644 --- a/src/engine/bpmcontrol.h +++ b/src/engine/bpmcontrol.h @@ -19,7 +19,7 @@ class BpmControl : public EngineControl { Q_OBJECT public: - BpmControl(QString group, ConfigObject<ConfigValue>* _config); + BpmControl(QString group, UserSettingsPointer _config); virtual ~BpmControl(); double getBpm() const; diff --git a/src/engine/clockcontrol.cpp b/src/engine/clockcontrol.cpp index acf4b4e65c..817fb83a2e 100644 --- a/src/engine/clockcontrol.cpp +++ b/src/engine/clockcontrol.cpp @@ -1,12 +1,12 @@ #include "engine/clockcontrol.h" #include "controlobject.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "cachingreader.h" #include "engine/enginecontrol.h" #include "controlobjectslave.h" -ClockControl::ClockControl(QString group, ConfigObject<ConfigValue>* pConfig) +ClockControl::ClockControl(QString group, UserSettingsPointer pConfig) : EngineControl(group, pConfig) { m_pCOBeatActive = new ControlObject(ConfigKey(group, "beat_active")); m_pCOBeatActive->set(0.0); diff --git a/src/engine/clockcontrol.h b/src/engine/clockcontrol.h index abc41a863c..f9f0914449 100644 --- a/src/engine/clockcontrol.h +++ b/src/engine/clockcontrol.h @@ -1,7 +1,7 @@ #ifndef CLOCKCONTROL_H #define CLOCKCONTROL_H -#include "configobject.h" +#include "preferences/usersettings.h" #include "engine/enginecontrol.h" #include "trackinfoobject.h" @@ -14,7 +14,7 @@ class ClockControl: public EngineControl { Q_OBJECT public: ClockControl(QString group, - ConfigObject<ConfigValue>* pConfig); + UserSettingsPointer pConfig); virtual ~ClockControl(); diff --git a/src/engine/cuecontrol.cpp b/src/engine/cuecontrol.cpp index 6bf3317272..43f1b750bb 100644 --- a/src/engine/cuecontrol.cpp +++ b/src/engine/cuecontrol.cpp @@ -20,7 +20,7 @@ static const double CUE_MODE_NUMARK = 3.0; static const double CUE_MODE_MIXXX_NO_BLINK = 4.0; CueControl::CueControl(QString group, - ConfigObject<ConfigValue>* _config) : + UserSettingsPointer _config) : EngineControl(group, _config), m_bPreviewing(false), m_pPlayButton(ControlObject::getControl(ConfigKey(group, "play"))), diff --git a/src/engine/cuecontrol.h b/src/engine/cuecontrol.h index b4c2661218..bde1fc0acc 100644 --- a/src/engine/cuecontrol.h +++ b/src/engine/cuecontrol.h @@ -8,7 +8,7 @@ #include <QMutex> #include "engine/enginecontrol.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlobjectslave.h" #include "trackinfoobject.h" @@ -84,7 +84,7 @@ class CueControl : public EngineControl { Q_OBJECT public: CueControl(QString group, - ConfigObject<ConfigValue>* _config); + UserSettingsPointer _config); virtual ~CueControl(); virtual void hintReader(HintVector* pHintList); diff --git a/src/engine/engineaux.cpp b/src/engine/engineaux.cpp index f20d2da31e..c82df478e9 100644 --- a/src/engine/engineaux.cpp +++ b/src/engine/engineaux.cpp @@ -6,7 +6,7 @@ #include <QtDebug> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlaudiotaperpot.h" #include "effects/effectsmanager.h" #include "engine/effects/engineeffectsmanager.h" diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index b78052695e..ae17721113 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -3,7 +3,7 @@ #include <QtDebug> #include "cachingreader.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlindicator.h" #include "controllinpotmeter.h" #include "controlobjectslave.h" @@ -44,7 +44,7 @@ const double kLinearScalerElipsis = 1.00058; // 2^(0.01/12): changes < 1 cent allows a linear scaler const int kSamplesPerFrame = 2; // Engine buffer uses Stereo frames only -EngineBuffer::EngineBuffer(QString group, ConfigObject<ConfigValue>* _config, +EngineBuffer::EngineBuffer(QString group, UserSettingsPointer _config, EngineChannel* pChannel, EngineMaster* pMixingEngine) : m_group(group), m_pConfig(_config), diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h index 9b1ccad260..b86ab8f335 100644 --- a/src/engine/enginebuffer.h +++ b/src/engine/enginebuffer.h @@ -23,7 +23,7 @@ #include <gtest/gtest_prod.h> #include "cachingreader.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "control/controlvalue.h" #include "engine/engineobject.h" #include "engine/sync/syncable.h" @@ -116,7 +116,7 @@ class EngineBuffer : public EngineObject { KEYLOCK_ENGINE_COUNT, }; - EngineBuffer(QString _group, ConfigObject<ConfigValue>* _config, + EngineBuffer(QString _group, UserSettingsPointer _config, EngineChannel* pChannel, EngineMaster* pMixingEngine); virtual ~EngineBuffer(); @@ -242,7 +242,7 @@ class EngineBuffer : public EngineObject { // Holds the name of the control group QString m_group; - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; LoopingControl* m_pLoopingControl; FRIEND_TEST(LoopingControlTest, LoopHalveButton_HalvesLoop); diff --git a/src/engine/enginechannel.h b/src/engine/enginechannel.h index 6778d8070c..2f55e6faf5 100644 --- a/src/engine/enginechannel.h +++ b/src/engine/enginechannel.h @@ -20,7 +20,7 @@ #include "engine/engineobject.h" #include "engine/channelhandle.h" -#include "configobject.h" +#include "preferences/usersettings.h" class ControlObject; class EngineBuffer; diff --git a/src/engine/enginecontrol.cpp b/src/engine/enginecontrol.cpp index b299575cb9..c59fee026c 100644 --- a/src/engine/enginecontrol.cpp +++ b/src/engine/enginecontrol.cpp @@ -8,7 +8,7 @@ #include "mixer/playermanager.h" EngineControl::EngineControl(QString group, - ConfigObject<ConfigValue>* _config) + UserSettingsPointer _config) : m_group(group), m_pConfig(_config), m_pEngineMaster(NULL), @@ -81,7 +81,7 @@ QString EngineControl::getGroup() const { return m_group; } -ConfigObject<ConfigValue>* EngineControl::getConfig() { +UserSettingsPointer EngineControl::getConfig() { return m_pConfig; } diff --git a/src/engine/enginecontrol.h b/src/engine/enginecontrol.h index e76c00c95b..cff3fa6f0a 100644 --- a/src/engine/enginecontrol.h +++ b/src/engine/enginecontrol.h @@ -7,7 +7,7 @@ #include <QObject> #include <QList> -#include "configobject.h" +#include "preferences/usersettings.h" #include "trackinfoobject.h" #include "control/controlvalue.h" #include "engine/effects/groupfeaturestate.h" @@ -35,7 +35,7 @@ class EngineControl : public QObject { Q_OBJECT public: EngineControl(QString group, - ConfigObject<ConfigValue>* _config); + UserSettingsPointer _config); virtual ~EngineControl(); // Called by EngineBuffer::process every latency period. See the above @@ -91,12 +91,12 @@ class EngineControl : public QObject { void seekExact(double sample); EngineBuffer* pickSyncTarget(); - ConfigObject<ConfigValue>* getConfig(); + UserSettingsPointer getConfig(); EngineMaster* getEngineMaster(); EngineBuffer* getEngineBuffer(); QString m_group; - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; private: struct SampleOfTrack { diff --git a/src/engine/enginedeck.cpp b/src/engine/enginedeck.cpp index f605c2eee6..0322bcdb05 100644 --- a/src/engine/enginedeck.cpp +++ b/src/engine/enginedeck.cpp @@ -27,7 +27,7 @@ #include "util/sample.h" EngineDeck::EngineDeck(const ChannelHandleAndGroup& handle_group, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, EngineMaster* pMixingEngine, EffectsManager* pEffectsManager, EngineChannel::ChannelOrientation defaultOrientation) diff --git a/src/engine/enginedeck.h b/src/engine/enginedeck.h index 8d6e753614..2570f4d28c 100644 --- a/src/engine/enginedeck.h +++ b/src/engine/enginedeck.h @@ -18,7 +18,7 @@ #ifndef ENGINEDECK_H #define ENGINEDECK_H -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlobjectslave.h" #include "controlpushbutton.h" #include "engine/engineobject.h" @@ -39,7 +39,7 @@ class ControlPushButton; class EngineDeck : public EngineChannel, public AudioDestination { Q_OBJECT public: - EngineDeck(const ChannelHandleAndGroup& handle_group, ConfigObject<ConfigValue>* pConfig, + EngineDeck(const ChannelHandleAndGroup& handle_group, UserSettingsPointer pConfig, EngineMaster* pMixingEngine, EffectsManager* pEffectsManager, EngineChannel::ChannelOrientation defaultOrientation = CENTER); virtual ~EngineDeck(); @@ -75,7 +75,7 @@ class EngineDeck : public EngineChannel, public AudioDestination { void slotPassingToggle(double v); private: - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; EngineBuffer* m_pBuffer; EnginePregain* m_pPregain; EngineVuMeter* m_pVUMeter; diff --git a/src/engine/enginedelay.h b/src/engine/enginedelay.h index 34209de789..5195ee7ef4 100644 --- a/src/engine/enginedelay.h +++ b/src/engine/enginedelay.h @@ -18,7 +18,7 @@ #define ENGINEDELAY_H #include "engine/engineobject.h" -#include "configobject.h" +#include "preferences/usersettings.h" class ControlPotmeter; class ControlObjectSlave; diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp index d0381be74c..767133e4e5 100644 --- a/src/engine/enginemaster.cpp +++ b/src/engine/enginemaster.cpp @@ -4,7 +4,7 @@ #include <QList> #include <QPair> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlaudiotaperpot.h" #include "controlaudiotaperpot.h" #include "controlpotmeter.h" @@ -29,7 +29,7 @@ #include "util/timer.h" #include "util/trace.h" -EngineMaster::EngineMaster(ConfigObject<ConfigValue>* _config, +EngineMaster::EngineMaster(UserSettingsPointer _config, const char* group, EffectsManager* pEffectsManager, bool bEnableSidechain, diff --git a/src/engine/enginemaster.h b/src/engine/enginemaster.h index 6715600d88..66b6f2f381 100644 --- a/src/engine/enginemaster.h +++ b/src/engine/enginemaster.h @@ -53,7 +53,7 @@ static const int kPreallocatedChannels = 64; class EngineMaster : public QObject, public AudioSource { Q_OBJECT public: - EngineMaster(ConfigObject<ConfigValue>* pConfig, + EngineMaster(UserSettingsPointer pConfig, const char* pGroup, EffectsManager* pEffectsManager, bool bEnableSidechain, diff --git a/src/engine/enginemicrophone.cpp b/src/engine/enginemicrophone.cpp index 0cc88a8ad2..28dc049392 100644 --- a/src/engine/enginemicrophone.cpp +++ b/src/engine/enginemicrophone.cpp @@ -5,7 +5,7 @@ #include <QtDebug> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlaudiotaperpot.h" #include "effects/effectsmanager.h" #include "engine/effects/engineeffectsmanager.h" diff --git a/src/engine/enginepregain.cpp b/src/engine/enginepregain.cpp index 6d5ef4e676..bef8ccd793 100644 --- a/src/engine/enginepregain.cpp +++ b/src/engine/enginepregain.cpp @@ -2,7 +2,7 @@ #include <QtDebug> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlaudiotaperpot.h" #include "controlobject.h" #include "controlpotmeter.h" diff --git a/src/engine/enginetalkoverducking.cpp b/src/engine/enginetalkoverducking.cpp index 2a4689f72f..dae8fa1008 100644 --- a/src/engine/enginetalkoverducking.cpp +++ b/src/engine/enginetalkoverducking.cpp @@ -4,7 +4,7 @@ #define DUCK_THRESHOLD 0.1 EngineTalkoverDucking::EngineTalkoverDucking( - ConfigObject<ConfigValue>* pConfig, const char* group) + UserSettingsPointer pConfig, const char* group) : EngineSideChainCompressor(group), m_pConfig(pConfig), m_group(group) { diff --git a/src/engine/enginetalkoverducking.h b/src/engine/enginetalkoverducking.h index c1ba146092..218b9a1aad 100644 --- a/src/engine/enginetalkoverducking.h +++ b/src/engine/enginetalkoverducking.h @@ -15,7 +15,7 @@ class EngineTalkoverDucking : public QObject, public EngineSideChainCompressor { MANUAL, }; - EngineTalkoverDucking(ConfigObject<ConfigValue>* pConfig, const char* group); + EngineTalkoverDucking(UserSettingsPointer pConfig, const char* group); virtual ~EngineTalkoverDucking(); TalkoverDuckSetting getMode() const { @@ -30,7 +30,7 @@ class EngineTalkoverDucking : public QObject, public EngineSideChainCompressor { void slotDuckModeChanged(double); private: - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; const char* m_group; ControlObjectSlave* m_pMasterSampleRate; diff --git a/src/engine/keycontrol.cpp b/src/engine/keycontrol.cpp index 42c4e7b463..412eed3a73 100644 --- a/src/engine/keycontrol.cpp +++ b/src/engine/keycontrol.cpp @@ -13,7 +13,7 @@ static const double kLockOriginalKey = 0; static const double kLockCurrentKey = 1; KeyControl::KeyControl(QString group, - ConfigObject<ConfigValue>* pConfig) + UserSettingsPointer pConfig) : EngineControl(group, pConfig) { m_pitchRateInfo.pitchRatio = 1.0; m_pitchRateInfo.tempoRatio = 1.0; diff --git a/src/engine/keycontrol.h b/src/engine/keycontrol.h index 37d2a27a96..4d9ad1fad0 100644 --- a/src/engine/keycontrol.h +++ b/src/engine/keycontrol.h @@ -24,7 +24,7 @@ class KeyControl : public EngineControl { bool keylock; }; - KeyControl(QString group, ConfigObject<ConfigValue>* pConfig); + KeyControl(QString group, UserSettingsPointer pConfig); virtual ~KeyControl(); // Returns a struct, with the results of the last pitch and tempo calculations diff --git a/src/engine/loopingcontrol.cpp b/src/engine/loopingcontrol.cpp index a71288692e..3ae346c530 100644 --- a/src/engine/loopingcontrol.cpp +++ b/src/engine/loopingcontrol.cpp @@ -5,7 +5,7 @@ #include <QtDebug> #include "controlobject.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlpushbutton.h" #include "cachingreader.h" #include "engine/loopingcontrol.h" @@ -38,7 +38,7 @@ QList<double> LoopingControl::getBeatSizes() { } LoopingControl::LoopingControl(QString group, - ConfigObject<ConfigValue>* _config) + UserSettingsPointer _config) : EngineControl(group, _config) { m_bLoopingEnabled = false; m_bLoopRollActive = false; diff --git a/src/engine/loopingcontrol.h b/src/engine/loopingcontrol.h index 937d326135..f5e9081d73 100644 --- a/src/engine/loopingcontrol.h +++ b/src/engine/loopingcontrol.h @@ -7,7 +7,7 @@ #include <QObject> -#include "configobject.h" +#include "preferences/usersettings.h" #include "engine/enginecontrol.h" #include "trackinfoobject.h" #include "track/beats.h" @@ -26,7 +26,7 @@ class LoopingControl : public EngineControl { public: static QList<double> getBeatSizes(); - LoopingControl(QString group, ConfigObject<ConfigValue>* _config); + LoopingControl(QString group, UserSettingsPointer _config); virtual ~LoopingControl(); // process() updates the internal state of the LoopingControl to reflect the diff --git a/src/engine/quantizecontrol.cpp b/src/engine/quantizecontrol.cpp index b3fe74bf58..0184c47413 100644 --- a/src/engine/quantizecontrol.cpp +++ b/src/engine/quantizecontrol.cpp @@ -5,7 +5,7 @@ #include <QtDebug> #include "controlobject.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlpushbutton.h" #include "cachingreader.h" #include "engine/quantizecontrol.h" @@ -13,7 +13,7 @@ #include "util/assert.h" QuantizeControl::QuantizeControl(QString group, - ConfigObject<ConfigValue>* pConfig) + UserSettingsPointer pConfig) : EngineControl(group, pConfig) { // Turn quantize OFF by default. See Bug #898213 m_pCOQuantizeEnabled = new ControlPushButton(ConfigKey(group, "quantize"), true); diff --git a/src/engine/quantizecontrol.h b/src/engine/quantizecontrol.h index 9bb51ceac7..931e1b1756 100644 --- a/src/engine/quantizecontrol.h +++ b/src/engine/quantizecontrol.h @@ -3,7 +3,7 @@ #include <QObject> -#include "configobject.h" +#include "preferences/usersettings.h" #include "engine/enginecontrol.h" #include "trackinfoobject.h" @@ -15,7 +15,7 @@ class ControlPushButton; class QuantizeControl : public EngineControl { Q_OBJECT public: - QuantizeControl(QString group, ConfigObject<ConfigValue>* pConfig); + QuantizeControl(QString group, UserSettingsPointer pConfig); virtual ~QuantizeControl(); virtual void setCurrentSample(const double dCurrentSample, diff --git a/src/engine/ratecontrol.cpp b/src/engine/ratecontrol.cpp index 0d5755eef3..606553d942 100644 --- a/src/engine/ratecontrol.cpp +++ b/src/engine/ratecontrol.cpp @@ -31,7 +31,7 @@ const double RateControl::kPausedJogMultiplier = 18.0; enum RateControl::RATERAMP_MODE RateControl::m_eRateRampMode = RateControl::RATERAMP_STEP; RateControl::RateControl(QString group, - ConfigObject<ConfigValue>* _config) + UserSettingsPointer _config) : EngineControl(group, _config), m_pBpmControl(NULL), m_ePbCurrent(0), diff --git a/src/engine/ratecontrol.h b/src/engine/ratecontrol.h index d531432318..0bccf08bf6 100644 --- a/src/engine/ratecontrol.h +++ b/src/engine/ratecontrol.h @@ -6,7 +6,7 @@ #include <QObject> -#include "configobject.h" +#include "preferences/usersettings.h" #include "engine/enginecontrol.h" #include "engine/sync/syncable.h" @@ -31,7 +31,7 @@ class PositionScratchController; class RateControl : public EngineControl { Q_OBJECT public: - RateControl(QString group, ConfigObject<ConfigValue>* _config); + RateControl(QString group, UserSettingsPointer _config); virtual ~RateControl(); void setBpmControl(BpmControl* bpmcontrol); 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 _ |