From 28d710877c5fa19326cec89e6fce639cfe4e237e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 2 Feb 2015 17:13:08 -0800 Subject: [PATCH] remove application calls from audio-client --- libraries/audio-client/src/AudioClient.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 572da1e8da..b42ebb09a1 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -844,13 +844,6 @@ void AudioClient::handleAudioInput() { int packetBytes = currentPacketPtr - audioDataPacket; nodeList->writeDatagram(audioDataPacket, packetBytes, audioMixer); _outgoingAvatarAudioSequenceNumber++; - -<<<<<<< HEAD:libraries/audio-client/src/AudioClient.cpp - emit outputBytesToNetwork(packetBytes); -======= - Application::getInstance()->getBandwidthRecorder()->audioChannel->output.updateValue(packetBytes); - Application::getInstance()->getBandwidthRecorder()->totalChannel->output.updateValue(packetBytes); ->>>>>>> 2eeb2a5ec5cdcc27319b2140c7ebae17b8ee5371:interface/src/Audio.cpp } } } @@ -901,9 +894,6 @@ void AudioClient::addReceivedAudioToStream(const QByteArray& audioByteArray) { // Audio output must exist and be correctly set up if we're going to process received audio _receivedAudioStream.parseData(audioByteArray); } - - Application::getInstance()->getBandwidthRecorder()->audioChannel->input.updateValue(audioByteArray.size()); - Application::getInstance()->getBandwidthRecorder()->totalChannel->input.updateValue(audioByteArray.size()); } void AudioClient::parseAudioEnvironmentData(const QByteArray &packet) {