Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 18:08:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix upstream filter check, audio interest set

Browse source
This commit is contained in:
Stephen Birarda 2017-06-20 16:45:28 -07:00
parent 6da5a63152
commit d05996c13d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AudioMixer.cpp
View file

@ -391,7 +391,7 @@ void AudioMixer::start() {
// prepare the NodeList // prepare the NodeList
nodeList->addSetOfNodeTypesToNodeInterestSet({ nodeList->addSetOfNodeTypesToNodeInterestSet({
NodeType::Agent, NodeType::EntityScriptServer, NodeType::Agent, NodeType::EntityScriptServer,
NodeType::UpstreamAudioMixer, NodeType::UpstreamAvatarMixer NodeType::UpstreamAudioMixer, NodeType::DownstreamAudioMixer
}); });
nodeList->linkedDataCreateCallback = [&](Node* node) { getOrCreateClientData(node); }; nodeList->linkedDataCreateCallback = [&](Node* node) { getOrCreateClientData(node); };

3
libraries/networking/src/LimitedNodeList.cpp
View file

@ -264,8 +264,7 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
NodeType_t sendingNodeType { NodeType::Unassigned }; NodeType_t sendingNodeType { NodeType::Unassigned };
eachNodeBreakable([&packet, &sendingNodeType](const SharedNodePointer& node){ eachNodeBreakable([&packet, &sendingNodeType](const SharedNodePointer& node){
if (node->getType() == NodeType::upstreamType(node->getType()) if (NodeType::isUpstream(node->getType()) && node->getPublicSocket() == packet.getSenderSockAddr()) {
&& node->getPublicSocket() == packet.getSenderSockAddr()) {
sendingNodeType = node->getType(); sendingNodeType = node->getType();
return false; return false;
} else { } else {