Merge pull request #14328 from roxanneskelly/Case19373

Case 19373 - Lowering volume on another user in PAL mutes them
This commit is contained in:
Jeff Clinton 2018-11-08 12:07:20 -08:00 committed by GitHub
commit cc7ce83f28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -202,7 +202,7 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
}
}
void AudioMixerClientData::setGainForAvatar(QUuid nodeID, uint8_t gain) {
void AudioMixerClientData::setGainForAvatar(QUuid nodeID, float gain) {
auto it = std::find_if(_streams.active.cbegin(), _streams.active.cend(), [nodeID](const MixableStream& mixableStream){
return mixableStream.nodeStreamID.nodeID == nodeID && mixableStream.nodeStreamID.streamID.isNull();
});

View file

@ -172,7 +172,7 @@ private:
void optionallyReplicatePacket(ReceivedMessage& packet, const Node& node);
void setGainForAvatar(QUuid nodeID, uint8_t gain);
void setGainForAvatar(QUuid nodeID, float gain);
bool containsValidPosition(ReceivedMessage& message) const;