summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-01-10 17:03:11 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2021-01-10 17:05:50 +0100
commitb0ebf7b7bfd3c2139c3b91d11a74ed97b490c556 (patch)
treeee7c2ef2041efba7eead4f44c6573684bef43be2 /src
parent39465acc94e51acbdff636f63264a4cc4023531a (diff)
Stop when hitting cue while plaing in DENON mode, fixes a regression since #3344
Diffstat (limited to 'src')
-rw-r--r--src/engine/controls/cuecontrol.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index fe1eb01982..38a07d4ad2 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -1090,21 +1090,16 @@ void CueControl::cueCDJ(double value) {
seekAbs(m_pCuePoint->get());
} else if (freely_playing || trackAt == TrackAt::End) {
// Jump to cue when playing or when at end position
-
- // Just in case.
- m_bPreviewing = false;
m_pPlay->set(0.0);
-
// Need to unlock before emitting any signals to prevent deadlock.
lock.unlock();
-
seekAbs(m_pCuePoint->get());
} else if (trackAt == TrackAt::Cue) {
- // pause at cue point
+ // paused at cue point
m_bPreviewing = true;
m_pPlay->set(1.0);
} else {
- // Pause not at cue point and not at end position
+ // Paused not at cue point and not at end position
cueSet(value);
// If quantize is enabled, jump to the cue point since it's not
@@ -1156,10 +1151,11 @@ void CueControl::cueDenon(double value) {
lock.unlock();
seekAbs(m_pCuePoint->get());
} else if (!playing && trackAt == TrackAt::Cue) {
- // pause at cue point
+ // paused at cue point
m_bPreviewing = true;
m_pPlay->set(1.0);
} else {
+ m_pPlay->set(0.0);
// Need to unlock before emitting any signals to prevent deadlock.
lock.unlock();
seekAbs(m_pCuePoint->get());