diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-22 02:29:42 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-06-01 13:06:16 +0200 |
| commit | 0783a13514f35e679059076c9cabed708baa844a (patch) | |
| tree | fcc7426b890a5b095f8027a509d2c3f7c24ffd71 /src/engine/enginebuffer.cpp | |
| parent | 7586b02febde0c333dce33511a0ac97dba4e9efa (diff) | |
fix beatsync control syncing phase, an old regression since 2.0
Diffstat (limited to 'src/engine/enginebuffer.cpp')
| -rw-r--r-- | src/engine/enginebuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index 1218f017b6..42087bc248 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -658,7 +658,7 @@ void EngineBuffer::slotControlPlayRequest(double v) { bool verifiedPlay = updateIndicatorsAndModifyPlay(v > 0.0); if (!oldPlay && verifiedPlay) { - if (m_pQuantize->get() > 0.0 + if (m_pQuantize->toBool() #ifdef __VINYLCONTROL__ && m_pVinylControlControl && !m_pVinylControlControl->isEnabled() #endif @@ -900,7 +900,7 @@ void EngineBuffer::process(CSAMPLE* pOutput, const int iBufferSize) { // we need to sync phase or we'll be totally out of whack and the sync // adjuster will kick in and push the track back in to sync with the // master. - if (m_scratching_old && !is_scratching && m_pQuantize->get() > 0.0 + if (m_scratching_old && !is_scratching && m_pQuantize->toBool() && m_pSyncControl->getSyncMode() == SYNC_FOLLOWER && !paused) { // TODO() The resulting seek is processed in the following callback // That is to late @@ -1179,7 +1179,7 @@ void EngineBuffer::processSeek(bool paused) { return; } - if ((seekType & SEEK_PHASE) && !paused && m_pQuantize->toBool()) { + if (!paused && ((seekType & SEEK_PHASE) || m_pQuantize->toBool())) { position = m_pBpmControl->getNearestPositionInPhase(position, true, true); } if (position != m_filepos_play) { |