summaryrefslogtreecommitdiffstats
path: root/src/engine/controls/clockcontrol.cpp
diff options
context:
space:
mode:
authorJavier Vilarroig <javier.vilarroig@gmail.com>2020-05-04 18:30:11 +0200
committerJavier Vilarroig <javier.vilarroig@gmail.com>2020-05-04 18:30:11 +0200
commitf64c99b9b949b05dfc3b370b83d2c5ce3ffac7a8 (patch)
treed6fbc4a26fa1fcb5b57d557b923deef482d51fc4 /src/engine/controls/clockcontrol.cpp
parent41f68693c2360a18552e01943041f26cd9a4102c (diff)
Move Beats et al. to mixxx namespace
Diffstat (limited to 'src/engine/controls/clockcontrol.cpp')
-rw-r--r--src/engine/controls/clockcontrol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/controls/clockcontrol.cpp b/src/engine/controls/clockcontrol.cpp
index 14b1ef02c8..b560de06d9 100644
--- a/src/engine/controls/clockcontrol.cpp
+++ b/src/engine/controls/clockcontrol.cpp
@@ -19,14 +19,14 @@ ClockControl::~ClockControl() {
// called from an engine worker thread
void ClockControl::trackLoaded(TrackPointer pNewTrack) {
- BeatsPointer pBeats;
+ mixxx::BeatsPointer pBeats;
if (pNewTrack) {
pBeats = pNewTrack->getBeats();
}
trackBeatsUpdated(pBeats);
}
-void ClockControl::trackBeatsUpdated(BeatsPointer pBeats) {
+void ClockControl::trackBeatsUpdated(mixxx::BeatsPointer pBeats) {
// Clear on-beat control
m_pCOBeatActive->set(0.0);
m_pBeats = pBeats;
@@ -45,7 +45,7 @@ void ClockControl::process(const double dRate,
// by the rate.
const double blinkIntervalSamples = 2.0 * samplerate * (1.0 * dRate) * blinkSeconds;
- BeatsPointer pBeats = m_pBeats;
+ mixxx::BeatsPointer pBeats = m_pBeats;
if (pBeats) {
double closestBeat = pBeats->findClosestBeat(currentSample);
double distanceToClosestBeat = fabs(currentSample - closestBeat);