Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:29:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Actually fix the behavior...

Browse source
This commit is contained in:
Zach Fox 2017-01-06 14:20:25 -08:00
parent dec41f67cc
commit afa6d54ac4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixerSlave.cpp
View file

@ -214,7 +214,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& node) {
bool getsAnyIgnored = nodeData->getRequestsDomainListData() && node->getCanKick(); bool getsAnyIgnored = nodeData->getRequestsDomainListData() && node->getCanKick();
if (otherData if (otherData
&& !node->isIgnoringNodeWithID(otherNode->getUUID()) && (!node->isIgnoringNodeWithID(otherNode->getUUID()) || (otherData->getRequestsDomainListData() && otherNode->getCanKick()))
&& (!otherNode->isIgnoringNodeWithID(node->getUUID()) || getsAnyIgnored)) { && (!otherNode->isIgnoringNodeWithID(node->getUUID()) || getsAnyIgnored)) {
// check to see if we're ignoring in radius // check to see if we're ignoring in radius
@ -256,7 +256,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& node) {
auto otherNodeStream = streamPair.second; auto otherNodeStream = streamPair.second;
bool isSelfWithEcho = ((*otherNode == *node) && (otherNodeStream->shouldLoopbackForNode())); bool isSelfWithEcho = ((*otherNode == *node) && (otherNodeStream->shouldLoopbackForNode()));
// Add all audio streams that should be added to the mix // Add all audio streams that should be added to the mix
if (isSelfWithEcho || (!isSelfWithEcho && !insideIgnoreRadius && getsAnyIgnored)) { if (isSelfWithEcho || (!isSelfWithEcho && !insideIgnoreRadius)) {
addStreamToMix(*nodeData, otherNode->getUUID(), *nodeAudioStream, *otherNodeStream); addStreamToMix(*nodeData, otherNode->getUUID(), *nodeAudioStream, *otherNodeStream);
} }
} }