summaryrefslogtreecommitdiffstats
path: root/src/vinylcontrol/vinylcontrolxwax.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/vinylcontrol/vinylcontrolxwax.cpp
parentcaee5a884aca657a2ee554f16254443fc6c54022 (diff)
Replace use of "slave" with "proxy" or "follower" everywhere.
Diffstat (limited to 'src/vinylcontrol/vinylcontrolxwax.cpp')
-rw-r--r--src/vinylcontrol/vinylcontrolxwax.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index dd5078b901..a18d71392d 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -24,7 +24,7 @@
#include "vinylcontrol/vinylcontrolxwax.h"
#include "util/timer.h"
-#include "control/controlobjectslave.h"
+#include "control/controlproxy.h"
#include "control/controlobject.h"
#include "util/math.h"
#include "util/defs.h"
@@ -426,7 +426,7 @@ void VinylControlXwax::analyzeSamples(CSAMPLE* pSamples, size_t nFrames) {
} else if (m_bTrackSelectMode) {
//qDebug() << "discontinuing select mode, selecting track";
if (m_pControlTrackLoader == NULL) {
- m_pControlTrackLoader = new ControlObjectSlave(
+ m_pControlTrackLoader = new ControlProxy(
m_group, "LoadSelectedTrack", this);
}
@@ -711,7 +711,7 @@ void VinylControlXwax::doTrackSelection(bool valid_pos, double pitch, double pos
if (m_pControlTrackSelector == NULL) {
// this isn't done in the constructor because this object
// doesn't seem to be created yet
- m_pControlTrackSelector = new ControlObjectSlave(
+ m_pControlTrackSelector = new ControlProxy(
"[Playlist]","SelectTrackKnob", this);
}