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

Couple fixes SharedNodePointer > Node&

Browse source
This commit is contained in:
Atlante45 2015-07-13 15:29:41 -07:00
parent c80df94b06
commit 44c5d4a2bf
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -159,10 +159,7 @@ void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer&
int numStreamStatsRemaining = _audioStreams.size(); int numStreamStatsRemaining = _audioStreams.size();
QHash<QUuid, PositionalAudioStream*>::ConstIterator audioStreamsIterator = _audioStreams.constBegin(); QHash<QUuid, PositionalAudioStream*>::ConstIterator audioStreamsIterator = _audioStreams.constBegin();
NLPacketList statsPacketList(PacketType::AudioStreamStats);
while (numStreamStatsRemaining > 0) { while (numStreamStatsRemaining > 0) {
auto statsPacket = NLPacket::create(PacketType::AudioStreamStats); auto statsPacket = NLPacket::create(PacketType::AudioStreamStats);
// pack the append flag in this packet // pack the append flag in this packet

8
libraries/networking/src/NodeList.cpp
View file

@ -184,7 +184,7 @@ void NodeList::processNodeData(const HifiSockAddr& senderSockAddr, const QByteAr
if (matchingNode) { if (matchingNode) {
matchingNode->setLastHeardMicrostamp(usecTimestampNow()); matchingNode->setLastHeardMicrostamp(usecTimestampNow());
auto replyPacket = constructPingReplyPacket(packet); auto replyPacket = constructPingReplyPacket(packet);
sendPacket(std::move(replyPacket), matchingNode, senderSockAddr); sendPacket(std::move(replyPacket), *matchingNode, senderSockAddr);
// If we don't have a symmetric socket for this node and this socket doesn't match // If we don't have a symmetric socket for this node and this socket doesn't match
// what we have for public and local then set it as the symmetric. // what we have for public and local then set it as the symmetric.
@ -611,14 +611,14 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
// send the ping packet to the local and public sockets for this node // send the ping packet to the local and public sockets for this node
auto localPingPacket = constructPingPacket(PingType::Local); auto localPingPacket = constructPingPacket(PingType::Local);
sendPacket(std::move(localPingPacket), node, node->getLocalSocket()); sendPacket(std::move(localPingPacket), *node, node->getLocalSocket());
auto publicPingPacket = constructPingPacket(PingType::Public); auto publicPingPacket = constructPingPacket(PingType::Public);
sendPacket(std::move(publicPingPacket), node, node->getPublicSocket()); sendPacket(std::move(publicPingPacket), *node, node->getPublicSocket());
if (!node->getSymmetricSocket().isNull()) { if (!node->getSymmetricSocket().isNull()) {
auto symmetricPingPacket = constructPingPacket(PingType::Symmetric); auto symmetricPingPacket = constructPingPacket(PingType::Symmetric);
sendPacket(std::move(symmetricPingPacket), node, node->getSymmetricSocket()); sendPacket(std::move(symmetricPingPacket), *node, node->getSymmetricSocket());
} }
node->incrementConnectionAttempts(); node->incrementConnectionAttempts();