Replace use of "slave" with "proxy" or "follower" everywhere.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mixer/playerinfo.h b/src/mixer/playerinfo.h
index 960477c953..a16537ba17 100644
--- a/src/mixer/playerinfo.h
+++ b/src/mixer/playerinfo.h
@@ -22,7 +22,7 @@
 #include <QMap>
 #include <QTimerEvent>
 
-#include "control/controlobjectslave.h"
+#include "control/controlproxy.h"
 #include "track/track.h"
 
 class PlayerInfo : public QObject {
@@ -53,10 +53,10 @@ class PlayerInfo : public QObject {
                       m_orientation(group, "orientation") {
             }
 
-            ControlObjectSlave m_play;
-            ControlObjectSlave m_pregain;
-            ControlObjectSlave m_volume;
-            ControlObjectSlave m_orientation;
+            ControlProxy m_play;
+            ControlProxy m_pregain;
+            ControlProxy m_volume;
+            ControlProxy m_orientation;
     };
 
     void clearControlCache();
@@ -69,7 +69,7 @@ class PlayerInfo : public QObject {
     virtual ~PlayerInfo();
 
     mutable QMutex m_mutex;
-    ControlObjectSlave* m_pCOxfader;
+    ControlProxy* m_pCOxfader;
     // QMap is faster than QHash for small count of elements < 50
     QMap<QString, TrackPointer> m_loadedTrackMap;
     int m_currentlyPlayingDeck;