missed API fixes in AudioClient and AvatarData

This commit is contained in:
Stephen Birarda 2015-07-08 16:53:04 -07:00
parent 2ac833c904
commit 964041d8d3
2 changed files with 5 additions and 5 deletions

View file

@ -858,7 +858,7 @@ void AudioClient::handleAudioInput() {
// write sequence number // write sequence number
_audioPacket->writePrimitive(_outgoingAvatarAudioSequenceNumber); _audioPacket->writePrimitive(_outgoingAvatarAudioSequenceNumber);
if (_audioPacket->getPacketType() == PacketType::SilentAudioFrame) { if (_audioPacket->getType() == PacketType::SilentAudioFrame) {
// pack num silent samples // pack num silent samples
quint16 numSilentSamples = numNetworkSamples; quint16 numSilentSamples = numNetworkSamples;
_audioPacket->writePrimitive(numSilentSamples); _audioPacket->writePrimitive(numSilentSamples);
@ -873,7 +873,7 @@ void AudioClient::handleAudioInput() {
// pack the orientation // pack the orientation
_audioPacket->writePrimitive(headOrientation); _audioPacket->writePrimitive(headOrientation);
if (_audioPacket->getPacketType() != PacketType::SilentAudioFrame) { if (_audioPacket->getType() != PacketType::SilentAudioFrame) {
// audio samples have already been packed (written to networkAudioSamples) // audio samples have already been packed (written to networkAudioSamples)
_audioPacket->setSizeUsed(_audioPacket->getSizeUsed() + numNetworkBytes); _audioPacket->setSizeUsed(_audioPacket->getSizeUsed() + numNetworkBytes);
} }

View file

@ -1089,10 +1089,10 @@ void AvatarData::sendAvatarDataPacket() {
void AvatarData::sendIdentityPacket() { void AvatarData::sendIdentityPacket() {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
QByteArray identityByteArray = identityByteArray(); QByteArray identityData = identityByteArray();
auto identityPacket = NLPacket::create(PacketType::AvatarIdentity, identityByteArray.size()); auto identityPacket = NLPacket::create(PacketType::AvatarIdentity, identityData.size());
identityPacket->write(identityByteArray); identityPacket->write(identityData);
nodeList->broadcastToNodes(std::move(identityPacket), NodeSet() << NodeType::AvatarMixer); nodeList->broadcastToNodes(std::move(identityPacket), NodeSet() << NodeType::AvatarMixer);
} }