From 6fdc5df47b729743f8ee14048f27ab914cd0a484 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Jun 2014 11:50:36 -0700 Subject: [PATCH] bump silent audio frame version --- libraries/audio/src/PositionalAudioRingBuffer.cpp | 4 +--- libraries/networking/src/PacketHeaders.cpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp index 555c3d937d..94a88897e3 100644 --- a/libraries/audio/src/PositionalAudioRingBuffer.cpp +++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp @@ -55,9 +55,7 @@ int PositionalAudioRingBuffer::parseData(const QByteArray& packet) { readBytes += sizeof(int16_t); - if (numSilentSamples > 0) { - addSilentFrame(numSilentSamples); - } + addSilentFrame(numSilentSamples); } else { // there is audio data to read readBytes += writeData(packet.data() + readBytes, packet.size() - readBytes); diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp index 751c6f45b2..7278f1fbcb 100644 --- a/libraries/networking/src/PacketHeaders.cpp +++ b/libraries/networking/src/PacketHeaders.cpp @@ -49,6 +49,7 @@ PacketVersion versionForPacketType(PacketType type) { switch (type) { case PacketTypeMicrophoneAudioNoEcho: case PacketTypeMicrophoneAudioWithEcho: + case PacketTypeSilentAudioFrame: return 1; case PacketTypeAvatarData: return 3;