Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 01:55:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Ken Cooke 2019-03-22 17:58:17 -07:00
parent e8ddee280d
commit e671a124c3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,11 +200,11 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
if (avatarUUID.isNull()) { if (avatarUUID.isNull()) {
// set the MASTER avatar gain // set the MASTER avatar gain
setMasterAvatarGain(gain); setMasterAvatarGain(gain);
qCDebug(audio) << "Setting MASTER avatar gain for " << uuid << " to " << gain; qCDebug(audio) << "Setting MASTER avatar gain for" << uuid << "to" << gain;
} else { } else {
// set the per-source avatar gain // set the per-source avatar gain
setGainForAvatar(avatarUUID, gain); setGainForAvatar(avatarUUID, gain);
qCDebug(audio) << "Setting avatar gain adjustment for hrtf[" << uuid << "][" << avatarUUID << "] to " << gain; qCDebug(audio) << "Setting avatar gain adjustment for hrtf[" << uuid << "][" << avatarUUID << "] to" << gain;
} }
} }
@ -216,7 +216,7 @@ void AudioMixerClientData::parseInjectorGainSet(ReceivedMessage& message, const
float gain = unpackFloatGainFromByte(packedGain); float gain = unpackFloatGainFromByte(packedGain);
setMasterInjectorGain(gain); setMasterInjectorGain(gain);
qCDebug(audio) << "Setting MASTER injector gain for " << uuid << " to " << gain; qCDebug(audio) << "Setting MASTER injector gain for" << uuid << "to" << gain;
} }
void AudioMixerClientData::setGainForAvatar(QUuid nodeID, float gain) { void AudioMixerClientData::setGainForAvatar(QUuid nodeID, float gain) {

4
interface/src/scripting/Audio.cpp
View file

@ -401,13 +401,13 @@ void Audio::setReverbOptions(const AudioEffectOptions* options) {
void Audio::setAvatarGain(float gain) { void Audio::setAvatarGain(float gain) {
withWriteLock([&] { withWriteLock([&] {
// ask the NodeList to set the master avatar gain // ask the NodeList to set the master avatar gain
DependencyManager::get<NodeList>()->setAvatarGain("", gain); DependencyManager::get<NodeList>()->setAvatarGain(QUuid(), gain);
}); });
} }
float Audio::getAvatarGain() { float Audio::getAvatarGain() {
return resultWithReadLock<float>([&] { return resultWithReadLock<float>([&] {
return DependencyManager::get<NodeList>()->getAvatarGain(""); return DependencyManager::get<NodeList>()->getAvatarGain(QUuid());
}); });
} }