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

fix for double packet check, unused var

Browse source
This commit is contained in:
Stephen Birarda 2015-02-06 12:27:34 -08:00
parent 5e864278a3
commit df6071093c
2 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gvr-interface/src/Client.cpp
View file

@ -53,8 +53,6 @@ void Client::setupNetworking() {
} }
void Client::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) { void Client::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
PacketType incomingType = packetTypeForPacket(incomingPacket);
DependencyManager::get<NodeList>()->processNodeData(senderSockAddr, incomingPacket); DependencyManager::get<NodeList>()->processNodeData(senderSockAddr, incomingPacket);
} }

95
gvr-interface/src/RenderingClient.cpp
View file

@ -83,58 +83,55 @@ void RenderingClient::processVerifiedPacket(const HifiSockAddr& senderSockAddr,
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
PacketType incomingType = packetTypeForPacket(incomingPacket); PacketType incomingType = packetTypeForPacket(incomingPacket);
if (nodeList->packetVersionAndHashMatch(incomingPacket)) { switch (incomingType) {
// only process this packet if we have a match on the packet version case PacketTypeAudioEnvironment:
switch (incomingType) { case PacketTypeAudioStreamStats:
case PacketTypeAudioEnvironment: case PacketTypeMixedAudio:
case PacketTypeAudioStreamStats: case PacketTypeSilentAudioFrame: {
case PacketTypeMixedAudio:
case PacketTypeSilentAudioFrame: { if (incomingType == PacketTypeAudioStreamStats) {
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
if (incomingType == PacketTypeAudioStreamStats) { Qt::QueuedConnection,
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket", Q_ARG(QByteArray, incomingPacket));
Qt::QueuedConnection, } else if (incomingType == PacketTypeAudioEnvironment) {
Q_ARG(QByteArray, incomingPacket)); QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
} else if (incomingType == PacketTypeAudioEnvironment) { Qt::QueuedConnection,
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData", Q_ARG(QByteArray, incomingPacket));
Qt::QueuedConnection, } else {
Q_ARG(QByteArray, incomingPacket)); QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
} else { Qt::QueuedConnection,
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream", Q_ARG(QByteArray, incomingPacket));
Qt::QueuedConnection,
Q_ARG(QByteArray, incomingPacket));
}
// update having heard from the audio-mixer and record the bytes received
SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
if (audioMixer) {
audioMixer->setLastHeardMicrostamp(usecTimestampNow());
}
break;
} }
case PacketTypeBulkAvatarData:
case PacketTypeKillAvatar: // update having heard from the audio-mixer and record the bytes received
case PacketTypeAvatarIdentity: SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
case PacketTypeAvatarBillboard: {
// update having heard from the avatar-mixer and record the bytes received if (audioMixer) {
SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket); audioMixer->setLastHeardMicrostamp(usecTimestampNow());
if (avatarMixer) {
avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
QMetaObject::invokeMethod(DependencyManager::get<AvatarHashMap>().data(),
"processAvatarMixerDatagram",
Q_ARG(const QByteArray&, incomingPacket),
Q_ARG(const QWeakPointer<Node>&, avatarMixer));
}
break;
} }
default:
Client::processVerifiedPacket(senderSockAddr, incomingPacket); break;
break;
} }
case PacketTypeBulkAvatarData:
case PacketTypeKillAvatar:
case PacketTypeAvatarIdentity:
case PacketTypeAvatarBillboard: {
// update having heard from the avatar-mixer and record the bytes received
SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket);
if (avatarMixer) {
avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
QMetaObject::invokeMethod(DependencyManager::get<AvatarHashMap>().data(),
"processAvatarMixerDatagram",
Q_ARG(const QByteArray&, incomingPacket),
Q_ARG(const QWeakPointer<Node>&, avatarMixer));
}
break;
}
default:
Client::processVerifiedPacket(senderSockAddr, incomingPacket);
break;
} }
} }