summaryrefslogtreecommitdiffstats
path: root/src/broadcast
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/broadcast
parentcaee5a884aca657a2ee554f16254443fc6c54022 (diff)
Replace use of "slave" with "proxy" or "follower" everywhere.
Diffstat (limited to 'src/broadcast')
-rw-r--r--src/broadcast/broadcastmanager.cpp2
-rw-r--r--src/broadcast/broadcastmanager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp
index ba943c8da5..0e328e2eeb 100644
--- a/src/broadcast/broadcastmanager.cpp
+++ b/src/broadcast/broadcastmanager.cpp
@@ -16,7 +16,7 @@ BroadcastManager::BroadcastManager(UserSettingsPointer pConfig,
new EngineBroadcast(pConfig));
pNetworkStream->addWorker(m_pBroadcast);
}
- m_pBroadcastEnabled = new ControlObjectSlave(
+ m_pBroadcastEnabled = new ControlProxy(
BROADCAST_PREF_KEY, "enabled", this);
m_pBroadcastEnabled->connectValueChanged(SLOT(slotControlEnabled(double)));
}
diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h
index 072bd93e2b..092e11f03f 100644
--- a/src/broadcast/broadcastmanager.h
+++ b/src/broadcast/broadcastmanager.h
@@ -32,7 +32,7 @@ class BroadcastManager : public QObject {
private:
UserSettingsPointer m_pConfig;
QSharedPointer<EngineBroadcast> m_pBroadcast;
- ControlObjectSlave* m_pBroadcastEnabled;
+ ControlProxy* m_pBroadcastEnabled;
};
#endif /* BROADCAST_BROADCASTMANAGER_H */