From 4b73a5ac358fba374828b2cae0b2bd3936da076c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 5 Nov 2014 16:22:06 +0100 Subject: [PATCH] Modify injected audio stream to send the ignore penumbra option --- libraries/audio/src/AudioInjector.cpp | 2 ++ libraries/audio/src/InjectedAudioStream.cpp | 4 +++- libraries/networking/src/PacketHeaders.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index 31c135fd58..b4b5ad5ffb 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -100,6 +100,8 @@ void AudioInjector::injectAudio() { quint8 volume = MAX_INJECTOR_VOLUME * _options.getVolume(); packetStream << volume; + packetStream << _options.ignorePenumbra(); + QElapsedTimer timer; timer.start(); int nextFrame = 0; diff --git a/libraries/audio/src/InjectedAudioStream.cpp b/libraries/audio/src/InjectedAudioStream.cpp index 873b32cc40..2811e857db 100644 --- a/libraries/audio/src/InjectedAudioStream.cpp +++ b/libraries/audio/src/InjectedAudioStream.cpp @@ -63,7 +63,9 @@ int InjectedAudioStream::parseStreamProperties(PacketType type, quint8 attenuationByte = 0; packetStream >> attenuationByte; _attenuationRatio = attenuationByte / (float)MAX_INJECTOR_VOLUME; - + + packetStream >> _ignorePenumbra; + int numAudioBytes = packetAfterSeqNum.size() - packetStream.device()->pos(); numAudioSamples = numAudioBytes / sizeof(int16_t); diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp index 73671295df..b5cf84ee28 100644 --- a/libraries/networking/src/PacketHeaders.cpp +++ b/libraries/networking/src/PacketHeaders.cpp @@ -54,6 +54,8 @@ PacketVersion versionForPacketType(PacketType type) { return 4; case PacketTypeMixedAudio: return 1; + case PacketTypeInjectAudio: + return 1; case PacketTypeAvatarData: return 3; case PacketTypeAvatarIdentity: