From 1c70e09178c6901e8314d5e9fd1111a6b5cc728b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Oct 2013 11:58:52 -0700 Subject: [PATCH] repairs to audio exchange for new UUID setup --- assignment-client/src/audio/AudioMixer.cpp | 5 +++++ libraries/audio/src/PositionalAudioRingBuffer.cpp | 3 ++- libraries/avatars/src/AvatarData.cpp | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index f172ec57a8..c5aa4345fb 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -364,6 +364,11 @@ void AudioMixer::run() { nodeAddress, nodeAddress); + // temp activation of public socket before server ping/reply is setup + if (!avatarNode->getActiveSocket()) { + avatarNode->activatePublicSocket(); + } + nodeList->updateNodeWithData(nodeAddress, packetData, receivedBytes); if (std::isnan(((PositionalAudioRingBuffer *)avatarNode->getLinkedData())->getOrientation().x)) { diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp index 21f6ac2dc5..4e0c906d3b 100644 --- a/libraries/audio/src/PositionalAudioRingBuffer.cpp +++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp @@ -10,6 +10,7 @@ #include #include +#include #include "PositionalAudioRingBuffer.h" @@ -27,7 +28,7 @@ PositionalAudioRingBuffer::~PositionalAudioRingBuffer() { int PositionalAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { unsigned char* currentBuffer = sourceBuffer + numBytesForPacketHeader(sourceBuffer); - currentBuffer += sizeof(uint16_t); // the source ID + currentBuffer += NUM_BYTES_RFC4122_UUID; // the source ID currentBuffer += parsePositionalData(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); currentBuffer += parseAudioSamples(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index e3872ae2b3..4fbd5c5c78 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -224,9 +224,6 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { unsigned char* startPosition = sourceBuffer; - // push past the node ID - sourceBuffer += sizeof(uint16_t); - // UUID _uuid = QUuid::fromRfc4122(QByteArray((char*) sourceBuffer, NUM_BYTES_RFC4122_UUID)); sourceBuffer += NUM_BYTES_RFC4122_UUID;