From 8f7a3f3567f9845b0de36474ab6411a50343960c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 14:07:34 -0700 Subject: [PATCH] use packet version helpers for PACKET_TYPE_INJECT_AUDIO --- audio-mixer/src/InjectedAudioRingBuffer.cpp | 2 +- injector/src/main.cpp | 7 ++++--- libraries/audio/src/AudioInjector.cpp | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/audio-mixer/src/InjectedAudioRingBuffer.cpp b/audio-mixer/src/InjectedAudioRingBuffer.cpp index 3309e79efc..7e93c7716c 100644 --- a/audio-mixer/src/InjectedAudioRingBuffer.cpp +++ b/audio-mixer/src/InjectedAudioRingBuffer.cpp @@ -21,7 +21,7 @@ InjectedAudioRingBuffer::InjectedAudioRingBuffer() : } int InjectedAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { - unsigned char* currentBuffer = sourceBuffer + sizeof(PACKET_TYPE_INJECT_AUDIO); + unsigned char* currentBuffer = sourceBuffer + numBytesForPacketHeader(sourceBuffer); // pull stream identifier from the packet memcpy(&_streamIdentifier, currentBuffer, sizeof(_streamIdentifier)); diff --git a/injector/src/main.cpp b/injector/src/main.cpp index 68c0938ab0..fe68c99a36 100644 --- a/injector/src/main.cpp +++ b/injector/src/main.cpp @@ -144,7 +144,8 @@ int main(int argc, char* argv[]) { nodeList->linkedDataCreateCallback = createAvatarDataForNode; timeval lastSend = {}; - unsigned char broadcastPacket = PACKET_TYPE_INJECT_AUDIO; + int numBytesPacketHeader = numBytesForPacketHeader((unsigned char*) &PACKET_TYPE_INJECT_AUDIO); + unsigned char* broadcastPacket = new unsigned char[numBytesPacketHeader]; timeval lastDomainServerCheckIn = {}; @@ -210,8 +211,8 @@ int main(int argc, char* argv[]) { // use the UDPSocket instance attached to our node list to ask avatar mixer for a list of avatars nodeList->getNodeSocket()->send(avatarMixer->getActiveSocket(), - &broadcastPacket, - sizeof(broadcastPacket)); + &broadcastPacket, + numBytesPacketHeader); } } else { if (!injector.isInjectingAudio() && (::shouldLoopAudio || !::hasInjectedAudioOnce)) { diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index 44a8257e4a..b1d5839acd 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -70,7 +70,7 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination timeval startTime; // calculate the number of bytes required for additional data - int leadingBytes = sizeof(PACKET_TYPE) + int leadingBytes = numBytesForPacketHeader((unsigned char*) &PACKET_TYPE_INJECT_AUDIO) + sizeof(_streamIdentifier) + sizeof(_position) + sizeof(_orientation) @@ -79,8 +79,7 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination unsigned char dataPacket[(BUFFER_LENGTH_SAMPLES_PER_CHANNEL * sizeof(int16_t)) + leadingBytes]; - dataPacket[0] = PACKET_TYPE_INJECT_AUDIO; - unsigned char *currentPacketPtr = dataPacket + sizeof(PACKET_TYPE_INJECT_AUDIO); + unsigned char *currentPacketPtr = dataPacket + populateTypeAndVersion(dataPacket, PACKET_TYPE_INJECT_AUDIO); // copy the identifier for this injector memcpy(currentPacketPtr, &_streamIdentifier, sizeof(_streamIdentifier));