diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
| commit | 5c0261a9c3cf23cc164f259a131f59f25b87cb03 (patch) | |
| tree | 01f8f05f48c56bbf7a6570f17ab9ca60849ed34b /src/engine/sync/synccontrol.h | |
| parent | dd5de6b1ab592910e1f06f1b66fe170da94cf271 (diff) | |
| parent | 1f6d795252d0454962d1ae4dd284d100e6f4180f (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
CHANGELOG.md
LICENSE
build/wix/LICENSE.rtf
src/defs_version.h
src/engine/controls/ratecontrol.cpp
Diffstat (limited to 'src/engine/sync/synccontrol.h')
| -rw-r--r-- | src/engine/sync/synccontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h index 8c72e87442..63155d285b 100644 --- a/src/engine/sync/synccontrol.h +++ b/src/engine/sync/synccontrol.h @@ -113,7 +113,7 @@ class SyncControl : public EngineControl, public Syncable { // multiplier changes and we need to recalculate the target distance. double m_unmultipliedTargetBeatDistance; double m_beatDistance; - double m_prevLocalBpm; + ControlValueAtomic<double> m_prevLocalBpm; QScopedPointer<ControlPushButton> m_pSyncMode; QScopedPointer<ControlPushButton> m_pSyncMasterEnabled; |