From 5088610403d3a91e525d9c7a0933b8633c95a27c Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 6 Aug 2021 13:32:21 +0200 Subject: [PATCH] EngineSync: Rebname local leader bpm variables (leftover from #3921) --- src/engine/sync/enginesync.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp index 6b90ab05661..51349cdbe02 100644 --- a/src/engine/sync/enginesync.cpp +++ b/src/engine/sync/enginesync.cpp @@ -409,23 +409,23 @@ void EngineSync::requestBpmUpdate(Syncable* pSyncable, mixxx::Bpm bpm) { kLogger.trace() << "EngineSync::requestBpmUpdate" << pSyncable->getGroup() << bpm; } - mixxx::Bpm mbaseBpm; - mixxx::Bpm mbpm; + mixxx::Bpm leaderBaseBpm; + mixxx::Bpm leaderBpm; double beatDistance = 0.0; if (m_pLeaderSyncable) { - mbaseBpm = m_pLeaderSyncable->getBaseBpm(); - mbpm = m_pLeaderSyncable->getBpm(); + leaderBaseBpm = m_pLeaderSyncable->getBaseBpm(); + leaderBpm = m_pLeaderSyncable->getBpm(); beatDistance = m_pLeaderSyncable->getBeatDistance(); } - if (mbaseBpm.isValid()) { + if (leaderBaseBpm.isValid()) { // update from current leader pSyncable->updateLeaderBeatDistance(beatDistance); - pSyncable->updateLeaderBpm(mbpm); + pSyncable->updateLeaderBpm(leaderBaseBpm); } else { // There is no leader, adopt this bpm as leader value pSyncable->updateLeaderBeatDistance(0.0); - pSyncable->updateLeaderBpm(bpm); + pSyncable->updateLeaderBpm(leaderBpm); } }