From 124fecf8c9eec2aec90573ab665143f5b1354609 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 1 Apr 2013 12:28:51 -0700 Subject: [PATCH] Revert "don't send or parse attenuation for now" This reverts commit 1767f2b052129d934fac9972eaf06ee67276f394. --- interface/src/Audio.cpp | 3 +++ shared/src/AudioRingBuffer.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 8aff6decb7..65c57296c5 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -158,6 +158,9 @@ int audioCallback (const void *inputBuffer, currentPacketPtr += sizeof(float); } + // tell the mixer not to add additional attenuation to our source + *(currentPacketPtr++) = 255; + // memcpy the corrected render yaw float correctedYaw = fmodf(data->linkedHead->getRenderYaw(), 360); diff --git a/shared/src/AudioRingBuffer.cpp b/shared/src/AudioRingBuffer.cpp index 73103f8a85..6dd18de520 100644 --- a/shared/src/AudioRingBuffer.cpp +++ b/shared/src/AudioRingBuffer.cpp @@ -117,6 +117,9 @@ void AudioRingBuffer::parseData(void *data, int size) { dataPtr += sizeof(float); } + unsigned int attenuationByte = *(dataPtr++); + attenuationRatio = attenuationByte / 255.0f; + memcpy(&bearing, dataPtr, sizeof(float)); dataPtr += sizeof(float);