diff options
author | Javier Vilarroig <javier.vilarroig@gmail.com> | 2020-05-04 18:30:11 +0200 |
---|---|---|
committer | Javier Vilarroig <javier.vilarroig@gmail.com> | 2020-05-04 18:30:11 +0200 |
commit | f64c99b9b949b05dfc3b370b83d2c5ce3ffac7a8 (patch) | |
tree | d6fbc4a26fa1fcb5b57d557b923deef482d51fc4 /src/engine/controls/loopingcontrol.cpp | |
parent | 41f68693c2360a18552e01943041f26cd9a4102c (diff) |
Move Beats et al. to mixxx namespace
Diffstat (limited to 'src/engine/controls/loopingcontrol.cpp')
-rw-r--r-- | src/engine/controls/loopingcontrol.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index 42757b7fc1..fbce5c8a8d 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -514,7 +514,7 @@ double LoopingControl::getSyncPositionInsideLoop(double dRequestedPlaypos, doubl void LoopingControl::setLoopInToCurrentPosition() { // set loop-in position - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; LoopSamples loopSamples = m_loopSamples.getValue(); double quantizedBeat = -1; double pos = m_currentSample.getValue(); @@ -616,7 +616,7 @@ void LoopingControl::slotLoopInGoto(double pressed) { } void LoopingControl::setLoopOutToCurrentPosition() { - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; LoopSamples loopSamples = m_loopSamples.getValue(); double quantizedBeat = -1; int pos = m_currentSample.getValue(); @@ -873,14 +873,14 @@ bool LoopingControl::isLoopingEnabled() { void LoopingControl::trackLoaded(TrackPointer pNewTrack) { m_pTrack = pNewTrack; - BeatsPointer pBeats; + mixxx::BeatsPointer pBeats; if (pNewTrack) { pBeats = pNewTrack->getBeats(); } trackBeatsUpdated(pBeats); } -void LoopingControl::trackBeatsUpdated(BeatsPointer pBeats) { +void LoopingControl::trackBeatsUpdated(mixxx::BeatsPointer pBeats) { clearActiveBeatLoop(); m_pBeats = pBeats; if (m_pBeats) { @@ -958,7 +958,7 @@ void LoopingControl::clearActiveBeatLoop() { } bool LoopingControl::currentLoopMatchesBeatloopSize() { - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; if (!pBeats) { return false; } @@ -974,7 +974,7 @@ bool LoopingControl::currentLoopMatchesBeatloopSize() { } double LoopingControl::findBeatloopSizeForLoop(double start, double end) const { - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; if (!pBeats) { return -1; } @@ -1032,7 +1032,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable } int samples = m_pTrackSamples->get(); - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; if (samples == 0 || !pBeats) { clearActiveBeatLoop(); m_pCOBeatLoopSize->setAndConfirm(beats); @@ -1198,7 +1198,7 @@ void LoopingControl::slotBeatLoopRollActivate(double pressed) { } void LoopingControl::slotBeatJump(double beats) { - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; if (!pBeats) { return; } @@ -1229,7 +1229,7 @@ void LoopingControl::slotBeatJumpBackward(double pressed) { } void LoopingControl::slotLoopMove(double beats) { - BeatsPointer pBeats = m_pBeats; + mixxx::BeatsPointer pBeats = m_pBeats; if (!pBeats || beats == 0) { return; } |