summaryrefslogtreecommitdiffstats
path: root/src/engine/clockcontrol.cpp
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2016-04-27 20:57:58 -0700
committerRJ Ryan <rryan@mixxx.org>2016-04-27 21:00:41 -0700
commite59916caf72a256bb28b1722759a629c5cc9cf81 (patch)
tree88bdffc1b577802ef69e7f423808491093919e58 /src/engine/clockcontrol.cpp
parentcaee5a884aca657a2ee554f16254443fc6c54022 (diff)
Replace use of "slave" with "proxy" or "follower" everywhere.
Diffstat (limited to 'src/engine/clockcontrol.cpp')
-rw-r--r--src/engine/clockcontrol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/clockcontrol.cpp b/src/engine/clockcontrol.cpp
index 82b574667b..6d0504493a 100644
--- a/src/engine/clockcontrol.cpp
+++ b/src/engine/clockcontrol.cpp
@@ -3,13 +3,13 @@
#include "control/controlobject.h"
#include "preferences/usersettings.h"
#include "engine/enginecontrol.h"
-#include "control/controlobjectslave.h"
+#include "control/controlproxy.h"
ClockControl::ClockControl(QString group, UserSettingsPointer pConfig)
: EngineControl(group, pConfig) {
m_pCOBeatActive = new ControlObject(ConfigKey(group, "beat_active"));
m_pCOBeatActive->set(0.0);
- m_pCOSampleRate = new ControlObjectSlave("[Master]","samplerate");
+ m_pCOSampleRate = new ControlProxy("[Master]","samplerate");
}
ClockControl::~ClockControl() {