From 3b3465ea05e76dc9accf09b02bff54937ff44cef Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 12 Jun 2017 14:59:45 -0700 Subject: [PATCH] Add isUpstream to Node --- assignment-client/src/audio/AudioMixerSlave.cpp | 4 ++++ libraries/networking/src/Node.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp index d01d961e33..2d800c3561 100644 --- a/assignment-client/src/audio/AudioMixerSlave.cpp +++ b/assignment-client/src/audio/AudioMixerSlave.cpp @@ -74,6 +74,10 @@ void AudioMixerSlave::mix(const SharedNodePointer& node) { return; } + if (node->isUpstream()) { + return; + } + // check that the stream is valid auto avatarStream = data->getAvatarAudioStream(); if (avatarStream == nullptr) { diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index 2ae0ab82e9..6d74cf4a26 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -51,6 +51,9 @@ public: bool isReplicated() const { return _isReplicated; } void setIsReplicated(bool isReplicated) { _isReplicated = isReplicated; } + bool isUpstream() const { return _isUpstream; } + void setIsUpstream(bool isUpstream) { _isUpstream = isUpstream; } + const QUuid& getConnectionSecret() const { return _connectionSecret; } void setConnectionSecret(const QUuid& connectionSecret) { _connectionSecret = connectionSecret; } @@ -101,6 +104,7 @@ private: MovingPercentile _clockSkewMovingPercentile; NodePermissions _permissions; bool _isReplicated { false }; + bool _isUpstream { false }; tbb::concurrent_unordered_set _ignoredNodeIDSet; mutable QReadWriteLock _ignoredNodeIDSetLock;