diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2013-07-12 00:15:38 +0200 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2013-07-12 00:15:38 +0200 |
commit | 8fd9cd1f5010fa4a9b224562c06ee6988541183e (patch) | |
tree | b948d96c622ea72cb665916ce882c7ac10acc6da /src/basetrackplayer.h | |
parent | a64f8df63d3bd8ef2df05f44efb9859a91dd56ae (diff) |
Changed some more ControlObjectThreadMain instances to
ControlObjectThread if no direct connection is used.
Diffstat (limited to 'src/basetrackplayer.h')
-rw-r--r-- | src/basetrackplayer.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/basetrackplayer.h b/src/basetrackplayer.h index 7514f02a79..816ec6fac4 100644 --- a/src/basetrackplayer.h +++ b/src/basetrackplayer.h @@ -10,7 +10,7 @@ class EngineMaster; class ControlObject; class ControlPotmeter; -class ControlObjectThreadMain; +class ControlObjectThread; class AnalyserQueue; class BaseTrackPlayer : public BasePlayer { @@ -52,14 +52,12 @@ class BaseTrackPlayer : public BasePlayer { ControlPotmeter* m_pWaveformZoom; ControlObject* m_pEndOfTrack; - ControlObjectThreadMain* m_pCuePoint; - ControlObjectThreadMain* m_pLoopInPoint; - ControlObjectThreadMain* m_pLoopOutPoint; - ControlObjectThreadMain* m_pPlayPosition; + ControlObjectThread* m_pLoopInPoint; + ControlObjectThread* m_pLoopOutPoint; ControlObject* m_pDuration; - ControlObjectThreadMain* m_pBPM; - ControlObjectThreadMain* m_pReplayGain; - ControlObjectThreadMain* m_pPlay; + ControlObjectThread* m_pBPM; + ControlObjectThread* m_pReplayGain; + ControlObjectThread* m_pPlay; EngineDeck* m_pChannel; }; |