summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-01-05 11:18:12 +0100
committerGitHub <noreply@github.com>2021-01-05 11:18:12 +0100
commit725c4c1cc5620680d26d384429223b833f174fca (patch)
tree5d2bc4c0f02b0f3cb79809dd010fa7df6a8e9502
parent9e43434a115a12728a9c065e687e72da7ea7eff0 (diff)
parentab8a2a165a39fd3141a71e7c245c0cc5ac2683b7 (diff)
Merge pull request #3523 from uklotzde/cuefix
Cue: Fix conversion from samples to millis
-rw-r--r--src/track/cue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/track/cue.cpp b/src/track/cue.cpp
index c0ac41b11d..f6d671be31 100644
--- a/src/track/cue.cpp
+++ b/src/track/cue.cpp
@@ -15,7 +15,7 @@ inline std::optional<double> positionSamplesToMillis(
double positionSamples,
mixxx::audio::SampleRate sampleRate) {
VERIFY_OR_DEBUG_ASSERT(sampleRate.isValid()) {
- return Cue::kNoPosition;
+ return std::nullopt;
}
if (positionSamples == Cue::kNoPosition) {
return std::nullopt;