Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SyncLock: Fix issues with single-playing syncables. #4155

Merged
merged 6 commits into from
Oct 12, 2021
Merged

SyncLock: Fix issues with single-playing syncables. #4155

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fa53ae
SyncLock: Fix issues with single-playing syncables.
ywwg Jul 27, 2021
9db6b76
Merge branch 'main' into synclock-audiblephase
ywwg Jul 29, 2021
3f85a88
Sync Lock: fix comment
ywwg Jul 29, 2021
d4c1e88
Merge branch 'main' into synclock-audiblephase
ywwg Aug 1, 2021
6aa8168
Merge branch 'main' into synclock-audiblephase
ywwg Aug 8, 2021
6513451
Merge branch 'main' into synclock-audiblephase
ywwg Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/engine/sync/enginesync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,10 @@ void EngineSync::notifyPlayingAudible(Syncable* pSyncable, bool playingAudible)
} else {
Syncable* pOnlyPlayer = getUniquePlayingSyncedDeck();
if (pOnlyPlayer) {
// Even if we didn't change leader, if there is only one player (us), then we should
// update the beat distance.
// Even if we didn't change leader, if there is only one player, then we should
// reinit leader params.
pOnlyPlayer->notifyUniquePlaying();
updateLeaderBeatDistance(pOnlyPlayer, pOnlyPlayer->getBeatDistance());
reinitLeaderParams(pOnlyPlayer);
}
}
}
Expand Down Expand Up @@ -448,6 +448,9 @@ void EngineSync::notifyBeatDistanceChanged(Syncable* pSyncable, double beatDista
<< pSyncable->getGroup() << beatDistance;
}
if (pSyncable != m_pInternalClock) {
if (getUniquePlayingSyncedDeck() == pSyncable) {
updateLeaderBeatDistance(pSyncable, beatDistance);
}
return;
}

Expand Down