From 964041d8d38c716a54150da83db5c04dde05bbcb Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 8 Jul 2015 16:53:04 -0700 Subject: [PATCH] missed API fixes in AudioClient and AvatarData --- libraries/audio-client/src/AudioClient.cpp | 4 ++-- libraries/avatars/src/AvatarData.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index b9a6db472f..ab668653d1 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -858,7 +858,7 @@ void AudioClient::handleAudioInput() { // write sequence number _audioPacket->writePrimitive(_outgoingAvatarAudioSequenceNumber); - if (_audioPacket->getPacketType() == PacketType::SilentAudioFrame) { + if (_audioPacket->getType() == PacketType::SilentAudioFrame) { // pack num silent samples quint16 numSilentSamples = numNetworkSamples; _audioPacket->writePrimitive(numSilentSamples); @@ -873,7 +873,7 @@ void AudioClient::handleAudioInput() { // pack the orientation _audioPacket->writePrimitive(headOrientation); - if (_audioPacket->getPacketType() != PacketType::SilentAudioFrame) { + if (_audioPacket->getType() != PacketType::SilentAudioFrame) { // audio samples have already been packed (written to networkAudioSamples) _audioPacket->setSizeUsed(_audioPacket->getSizeUsed() + numNetworkBytes); } diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index dfac2f9b46..5ea3b4c669 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1089,10 +1089,10 @@ void AvatarData::sendAvatarDataPacket() { void AvatarData::sendIdentityPacket() { auto nodeList = DependencyManager::get(); - QByteArray identityByteArray = identityByteArray(); + QByteArray identityData = identityByteArray(); - auto identityPacket = NLPacket::create(PacketType::AvatarIdentity, identityByteArray.size()); - identityPacket->write(identityByteArray); + auto identityPacket = NLPacket::create(PacketType::AvatarIdentity, identityData.size()); + identityPacket->write(identityData); nodeList->broadcastToNodes(std::move(identityPacket), NodeSet() << NodeType::AvatarMixer); }