Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

This commit is contained in:
Andrzej Kapolka 2014-06-06 11:49:51 -07:00
commit 4fbd0823f0

View file

@ -55,7 +55,9 @@ int PositionalAudioRingBuffer::parseData(const QByteArray& packet) {
readBytes += sizeof(int16_t);
addSilentFrame(numSilentSamples);
if (numSilentSamples > 0) {
addSilentFrame(numSilentSamples);
}
} else {
// there is audio data to read
readBytes += writeData(packet.data() + readBytes, packet.size() - readBytes);