From 00998ba75ea6726f1ce9ec5ac46068d231440d00 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 15:42:37 -0700 Subject: [PATCH] some fixes for new audio injector setup --- audio-mixer/src/main.cpp | 3 ++- libraries/audio/src/AudioInjector.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index eddff06541..6593876d0b 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -291,10 +291,11 @@ int main(int argc, const char* argv[]) { for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { if (agent->getLinkedData()) { + AudioRingBuffer* ringBuffer = (AudioRingBuffer*) agent->getLinkedData(); if (memcmp(ringBuffer->getStreamIdentifier(), packetData + 1, - sizeof(STREAM_IDENTIFIER_NUM_BYTES) == 0)) { + STREAM_IDENTIFIER_NUM_BYTES) == 0) { // this is the matching stream, assign to matchingInjector and stop looking matchingInjector = &*agent; break; diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index 6cc7ccd792..a0f68e299b 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -69,8 +69,9 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination timeval startTime; - // one byte for header, 3 positional floats, 1 bearing float, 1 attenuation modifier byte - int leadingBytes = 1 + (sizeof(float) * 4) + 1; + // calculate the number of bytes required for additional data + int leadingBytes = sizeof(PACKET_HEADER) + sizeof(_streamIdentifier) + + sizeof(_position) + sizeof(_bearing) + sizeof(_volume); unsigned char dataPacket[BUFFER_LENGTH_BYTES + leadingBytes]; dataPacket[0] = PACKET_HEADER_INJECT_AUDIO;