Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 06:51:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Spelling

Browse source
This commit is contained in:
Clement 2018-11-06 13:20:03 -08:00
parent beb575a88d
commit b8cb433fa1
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -305,14 +305,14 @@ void AudioMixerClientData::parseSoloRequest(QSharedPointer<ReceivedMessage> 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);
}
}
}

4
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -152,7 +152,7 @@ public:
const Node::IgnoredNodeIDs& getIgnoringNodeIDs() const { return _ignoringNodeIDs; }
const std::vector<QUuid>& getSolodNodes() const { return _solodNodes; }
const std::vector<QUuid>& 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<QUuid> _solodNodes;
std::vector<QUuid> _soloedNodes;
bool _hasReceivedFirstMix { false };
};

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

@ -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();