From b8cb433fa13b0127572a9b4e6dbe8a03c3d188d6 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 6 Nov 2018 13:20:03 -0800 Subject: [PATCH] Spelling --- assignment-client/src/audio/AudioMixerClientData.cpp | 10 +++++----- assignment-client/src/audio/AudioMixerClientData.h | 4 ++-- assignment-client/src/audio/AudioMixerSlave.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 0aee185088..3b47b058e7 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -305,14 +305,14 @@ void AudioMixerClientData::parseSoloRequest(QSharedPointer mess message->readPrimitive(&addToSolo); while (message->getBytesLeftToRead()) { - // parse out the UUID being solod from the packet - QUuid solodUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); + // parse out the UUID being soloed from the packet + QUuid soloedUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); if (addToSolo) { - _solodNodes.push_back(solodUUID); + _soloedNodes.push_back(soloedUUID); } else { - auto it = std::find(std::begin(_solodNodes), std::end(_solodNodes), solodUUID); - _solodNodes.erase(it); + auto it = std::find(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID); + _soloedNodes.erase(it); } } } diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h index dd5681c537..0232fe6bb6 100644 --- a/assignment-client/src/audio/AudioMixerClientData.h +++ b/assignment-client/src/audio/AudioMixerClientData.h @@ -152,7 +152,7 @@ public: const Node::IgnoredNodeIDs& getIgnoringNodeIDs() const { return _ignoringNodeIDs; } - const std::vector& getSolodNodes() const { return _solodNodes; } + const std::vector& getSoloedNodes() const { return _soloedNodes; } bool getHasReceivedFirstMix() const { return _hasReceivedFirstMix; } void setHasReceivedFirstMix(bool hasReceivedFirstMix) { _hasReceivedFirstMix = hasReceivedFirstMix; } @@ -213,7 +213,7 @@ private: std::atomic_bool _isIgnoreRadiusEnabled { false }; - std::vector _solodNodes; + std::vector _soloedNodes; bool _hasReceivedFirstMix { false }; }; diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp index 0308acc697..7a6ab9c3e2 100644 --- a/assignment-client/src/audio/AudioMixerSlave.cpp +++ b/assignment-client/src/audio/AudioMixerSlave.cpp @@ -272,8 +272,8 @@ bool shouldBeSkipped(MixableStream& stream, const Node& listener, return true; } - if (!listenerData.getSolodNodes().empty()) { - return !contains(listenerData.getSolodNodes(), stream.nodeStreamID.nodeID); + if (!listenerData.getSoloedNodes().empty()) { + return !contains(listenerData.getSoloedNodes(), stream.nodeStreamID.nodeID); } bool shouldCheckIgnoreBox = (listenerAudioStream.isIgnoreBoxEnabled() || @@ -314,7 +314,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) { memset(_mixSamples, 0, sizeof(_mixSamples)); bool isThrottling = _numToRetain != -1; - bool isSoloing = !listenerData->getSolodNodes().empty(); + bool isSoloing = !listenerData->getSoloedNodes().empty(); auto& streams = listenerData->getStreams();