Skip to content

Commit

Permalink
FIX(client): Prevent local muted users from triggering attenuation
Browse files Browse the repository at this point in the history
When 'while others users talk' attenuation is enabled, unmuted users
still trigger attenuation even if they are locally muted.

The fix is don't add local muted users' audio source to the mixing
for the audio output

Fixes #6247
  • Loading branch information
jlallas384 committed Apr 14, 2024
1 parent fd0a73a commit a11489f
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/mumble/AudioOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,13 @@ bool AudioOutput::mix(void *outbuff, unsigned int frameCount) {
if (!buffer->prepareSampleBuffer(frameCount)) {
qlDel.append(buffer);
} else {
qlMix.append(buffer);

const ClientUser *user = it.key();
if (user && user->bPrioritySpeaker) {
prioritySpeakerActive = true;

if (user && !user->bLocalMute) {
qlMix.append(buffer);
if (user->bPrioritySpeaker) {
prioritySpeakerActive = true;
}
}
}
++it;
Expand Down

0 comments on commit a11489f

Please sign in to comment.