diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-09-24 22:04:20 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-09-24 22:04:20 +0200 |
| commit | c8eaed559201350c9d666b09f7593a684fd02789 (patch) | |
| tree | 3e802f48090cd6982727e86590f73cc5edb7d3f1 /src/engine | |
| parent | b076846183079e51fc70223c7b44bcc564b31380 (diff) | |
| parent | 400817e7280fd98102512c4739050e28129369cb (diff) | |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3
# Conflicts:
# src/engine/cuecontrol.cpp
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/controls/cuecontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index d9c5878bfc..b885589059 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -705,7 +705,7 @@ void CueControl::hotcueGoto(HotcueControl* pControl, double v) { lock.unlock(); if (pCue) { - int position = pCue->getPosition(); + double position = pCue->getPosition(); if (position != Cue::kNoPosition) { seekAbs(position); } @@ -726,7 +726,7 @@ void CueControl::hotcueGotoAndStop(HotcueControl* pControl, double v) { lock.unlock(); if (pCue) { - int position = pCue->getPosition(); + double position = pCue->getPosition(); if (position != Cue::kNoPosition) { m_pPlay->set(0.0); seekExact(position); @@ -749,7 +749,7 @@ void CueControl::hotcueGotoAndPlay(HotcueControl* pControl, double v) { lock.unlock(); if (pCue) { - int position = pCue->getPosition(); + double position = pCue->getPosition(); if (position != Cue::kNoPosition) { seekAbs(position); if (!isPlayingByPlayButton()) { |