From c77310019db567fd453449c874f36e3e73e326bd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 9 Jul 2015 14:03:32 -0700 Subject: [PATCH] Some .get() cleanup --- assignment-client/src/audio/AudioMixer.cpp | 2 -- assignment-client/src/entities/EntityServer.cpp | 2 +- libraries/octree/src/OctreeEditPacketSender.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index bb58bb0f78..e81f4c66f8 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -463,8 +463,6 @@ int AudioMixer::prepareMixForListeningNode(Node* node) { } void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) { - static char clientEnvBuffer[MAX_PACKET_SIZE]; - // Send stream properties bool hasReverb = false; float reverbTime, wetLevel; diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index b928adde53..08907380fb 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -96,7 +96,7 @@ int EntityServer::sendSpecialPackets(const SharedNodePointer& node, OctreeQueryN auto specialPacket = tree->encodeEntitiesDeletedSince(queryNode->getSequenceNumber(), deletedEntitiesSentAt, hasMoreToSend); - queryNode->packetSent(*specialPacket.get()); + queryNode->packetSent(*specialPacket); totalBytes += specialPacket->getSizeWithHeader(); packetsSent++; diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 4151f19821..41b8b7bca6 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -108,7 +108,7 @@ void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, std::uniqu } // add packet to history - _sentPacketHistories[nodeUUID].packetSent(sequence, *packet.get()); + _sentPacketHistories[nodeUUID].packetSent(sequence, *packet); queuePacketForSending(node, std::move(packet)); } @@ -186,7 +186,7 @@ void OctreeEditPacketSender::queuePacketToNodes(std::unique_ptr packet if (isMyJurisdiction) { // make a copy of this packet for this node and queue - auto packetCopy = NLPacket::createCopy(*packet.get()); + auto packetCopy = NLPacket::createCopy(*packet); queuePacketToNode(nodeUUID, std::move(packetCopy)); } }