diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-07-28 20:53:23 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-07-28 20:53:23 +0200 |
| commit | 04cf45949056cfffd7b31dec340df1a7ef47b429 (patch) | |
| tree | faced67f585785b3ecb27e912370a35d3e5432d6 /src/engine/enginebuffer.cpp | |
| parent | f1353f2e3c4ba8318f292364a9e10d7baf09e308 (diff) | |
| parent | ad8c35631e2fe7671897a82aa3c5dab1c3efd151 (diff) | |
Merge remote-tracking branch 'upstream/2.1'
Diffstat (limited to 'src/engine/enginebuffer.cpp')
| -rw-r--r-- | src/engine/enginebuffer.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index 6c3cbd6c07..79d0aa95be 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -1171,8 +1171,15 @@ void EngineBuffer::processSeek(bool paused) { position = m_filepos_play; adjustingPhase = true; break; + case SEEK_STANDARD: + if (m_pQuantize->toBool()) { + seekType |= SEEK_PHASE; + } + // new position was already set above + break; case SEEK_EXACT: - case SEEK_STANDARD: // = SEEK_EXACT | SEEK_PHASE + case SEEK_EXACT_PHASE: // artificial state = SEEK_EXACT | SEEK_PHASE + case SEEK_STANDARD_PHASE: // artificial state = SEEK_STANDARD | SEEK_PHASE // new position was already set above break; default: @@ -1180,7 +1187,7 @@ void EngineBuffer::processSeek(bool paused) { return; } - if (!paused && ((seekType & SEEK_PHASE) || m_pQuantize->toBool())) { + if (!paused && (seekType & SEEK_PHASE)) { position = m_pBpmControl->getNearestPositionInPhase(position, true, true); } if (position != m_filepos_play) { |