diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2021-02-26 01:44:21 +0100 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2021-02-26 01:44:21 +0100 |
commit | b8a766b8c6cd99f00c6b62b1ce1a81633c5b94f1 (patch) | |
tree | 486431039c0dd876dc1ba3ca98f811fcd20d0452 /src/engine/enginebuffer.h | |
parent | 7bc3bddf4cb84175cdf15db940bbbfb5e8ea3088 (diff) | |
parent | 593278332e523644b8bc0104bbc6888329e31c94 (diff) |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# src/engine/enginebuffer.cpp
Diffstat (limited to 'src/engine/enginebuffer.h')
-rw-r--r-- | src/engine/enginebuffer.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h index eb7b21957e..8b35807c6b 100644 --- a/src/engine/enginebuffer.h +++ b/src/engine/enginebuffer.h @@ -4,6 +4,7 @@ #include <QAtomicInt> #include <QMutex> +#include <cfloat> #include "control/controlvalue.h" #include "engine/cachingreader/cachingreader.h" @@ -47,15 +48,6 @@ class EngineWorkerScheduler; class VisualPlayPosition; class EngineMaster; -// Length of audio beat marks in samples -const int audioBeatMarkLen = 40; - -// Temporary buffer length -const int kiTempLength = 200000; - -// Rate at which the playpos slider is updated -const int kiPlaypositionUpdateRate = 15; // updates per second - class EngineBuffer : public EngineObject { Q_OBJECT private: @@ -89,6 +81,11 @@ class EngineBuffer : public EngineObject { KEYLOCK_ENGINE_COUNT, }; + // This value is used to make sure the initial seek after loading a track is + // not omitted. Therefore this value must be different for 0.0 or any likely + // value for the main cue + static constexpr double kInitalSamplePosition = -DBL_MAX; + EngineBuffer(const QString& group, UserSettingsPointer pConfig, EngineChannel* pChannel, EngineMaster* pMixingEngine); virtual ~EngineBuffer(); |