From 487209e2703bf4e5c8bf0c376816f9c041b22310 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 5 Dec 2013 13:21:16 -0800 Subject: [PATCH] fix bandwidth meter for audio --- interface/src/Audio.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 4df3591b8f..e4f0677787 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -277,6 +277,9 @@ void Audio::handleAudioInput() { nodeList->getNodeSocket().writeDatagram(monoAudioDataPacket, BUFFER_LENGTH_BYTES_PER_CHANNEL + leadingBytes, audioMixer->getActiveSocket()->getAddress(), audioMixer->getActiveSocket()->getPort()); + + Application::getInstance()->getBandwidthMeter()->outputStream(BandwidthMeter::AUDIO) + .updateValue(BUFFER_LENGTH_BYTES_PER_CHANNEL + leadingBytes); } else { nodeList->pingPublicAndLocalSocketsForInactiveNode(audioMixer); } @@ -341,6 +344,7 @@ void Audio::handleAudioInput() { _outputDevice->write(stereoOutputBuffer); + // add output (@speakers) data just written to the scope QMetaObject::invokeMethod(_scope, "addStereoSamples", Qt::QueuedConnection, Q_ARG(QByteArray, stereoOutputBuffer), Q_ARG(bool, false)); @@ -391,8 +395,8 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) { _ringBuffer.parseData((unsigned char*) audioByteArray.data(), audioByteArray.size()); - Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AUDIO) - .updateValue(PACKET_LENGTH_BYTES + sizeof(PACKET_TYPE)); + Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AUDIO).updateValue(PACKET_LENGTH_BYTES + + sizeof(PACKET_TYPE)); _lastReceiveTime = currentReceiveTime; }