Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 08:17:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove application calls from audio-client

Browse source
This commit is contained in:
Stephen Birarda 2015-02-02 17:13:08 -08:00
parent bd0552618f
commit 28d710877c
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/audio-client/src/AudioClient.cpp
View file

@ -844,13 +844,6 @@ void AudioClient::handleAudioInput() {
int packetBytes = currentPacketPtr - audioDataPacket; int packetBytes = currentPacketPtr - audioDataPacket;
nodeList->writeDatagram(audioDataPacket, packetBytes, audioMixer); nodeList->writeDatagram(audioDataPacket, packetBytes, audioMixer);
_outgoingAvatarAudioSequenceNumber++; _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 // Audio output must exist and be correctly set up if we're going to process received audio
_receivedAudioStream.parseData(audioByteArray); _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) { void AudioClient::parseAudioEnvironmentData(const QByteArray &packet) {