From fbd287472d2d4b05240f3da78533f9693eb39791 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 14 Jul 2015 14:09:00 -0700 Subject: [PATCH] make NodeData parseData take only packet --- assignment-client/src/Agent.cpp | 4 ++-- assignment-client/src/Agent.h | 2 +- assignment-client/src/AssignmentClientChildData.h | 7 ++----- assignment-client/src/audio/AudioMixerClientData.cpp | 4 ++-- assignment-client/src/audio/AudioMixerClientData.h | 2 +- .../src/avatars/AvatarMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixerClientData.h | 2 +- domain-server/src/DomainServerNodeData.h | 1 - libraries/audio-client/src/AudioClient.cpp | 10 +++++----- libraries/audio-client/src/AudioClient.h | 8 ++++---- libraries/audio/src/InboundAudioStream.cpp | 4 ++-- libraries/audio/src/InboundAudioStream.h | 2 +- libraries/networking/src/Assignment.h | 3 --- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/NodeData.h | 2 +- libraries/octree/src/OctreeQuery.cpp | 2 +- libraries/octree/src/OctreeQuery.h | 2 +- 17 files changed, 26 insertions(+), 33 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index c25a0dc434..051ae68ff2 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -99,8 +99,8 @@ void Agent::handleJurisdictionPacket(QSharedPointer packet, SharedNode } } -void Agent::handleAudioPacket(QSharedPointer packet, SharedNodePointer senderNode) { - _receivedAudioStream.parseData(*packet, senderNode); +void Agent::handleAudioPacket(QSharedPointer packet) { + _receivedAudioStream.parseData(*packet); _lastReceivedAudioLoudness = _receivedAudioStream.getNextOutputFrameLoudness(); diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h index 840c1d6d22..241e14439c 100644 --- a/assignment-client/src/Agent.h +++ b/assignment-client/src/Agent.h @@ -55,7 +55,7 @@ public slots: void playAvatarSound(Sound* avatarSound) { _scriptEngine.setAvatarSound(avatarSound); } private slots: - void handleAudioPacket(QSharedPointer packet, SharedNodePointer senderNode); + void handleAudioPacket(QSharedPointer packet); void handleOctreePacket(QSharedPointer packet, SharedNodePointer senderNode); void handleJurisdictionPacket(QSharedPointer packet, SharedNodePointer senderNode); diff --git a/assignment-client/src/AssignmentClientChildData.h b/assignment-client/src/AssignmentClientChildData.h index 926a160d08..7858ede448 100644 --- a/assignment-client/src/AssignmentClientChildData.h +++ b/assignment-client/src/AssignmentClientChildData.h @@ -16,16 +16,13 @@ class AssignmentClientChildData : public NodeData { - public: +public: AssignmentClientChildData(Assignment::Type childType); Assignment::Type getChildType() { return _childType; } void setChildType(Assignment::Type childType) { _childType = childType; } - // implement parseData to return 0 so we can be a subclass of NodeData - int parseData(NLPacket& packet, QSharedPointer sendingNode) { return 0; } - - private: +private: Assignment::Type _childType; }; diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index dc2d60be51..c929d39224 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -49,7 +49,7 @@ AvatarAudioStream* AudioMixerClientData::getAvatarAudioStream() const { return NULL; } -int AudioMixerClientData::parseData(NLPacket& packet, SharedNodePointer sendingNode) { +int AudioMixerClientData::parseData(NLPacket& packet) { PacketType::Value packetType = packet.getType(); if (packetType == PacketType::AudioStreamStats) { @@ -107,7 +107,7 @@ int AudioMixerClientData::parseData(NLPacket& packet, SharedNodePointer sendingN // seek to the beginning of the packet so that the next reader is in the right spot packet.seek(0); - return matchingStream->parseData(packet, sendingNode); + return matchingStream->parseData(packet); } return 0; } diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h index 99f8683b70..20bcaf5627 100644 --- a/assignment-client/src/audio/AudioMixerClientData.h +++ b/assignment-client/src/audio/AudioMixerClientData.h @@ -42,7 +42,7 @@ public: const QHash& getAudioStreams() const { return _audioStreams; } AvatarAudioStream* getAvatarAudioStream() const; - int parseData(NLPacket& packet, QSharedPointer sendingNode); + int parseData(NLPacket& packet); void checkBuffersBeforeFrameSend(); diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index 9f658e1b48..51543f0d5e 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -13,7 +13,7 @@ #include "AvatarMixerClientData.h" -int AvatarMixerClientData::parseData(NLPacket& packet, SharedNodePointer sendingNode) { +int AvatarMixerClientData::parseData(NLPacket& packet) { // compute the offset to the data payload return _avatar.parseDataFromBuffer(QByteArray::fromRawData(packet.getPayload(), packet.getSizeUsed())); } diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index 4497f17da7..5aef1b7822 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -31,7 +31,7 @@ const QString OUTBOUND_AVATAR_DATA_STATS_KEY = "outbound_av_data_kbps"; class AvatarMixerClientData : public NodeData { Q_OBJECT public: - int parseData(NLPacket& packet, SharedNodePointer sendingNode); + int parseData(NLPacket& packet); AvatarData& getAvatar() { return _avatar; } bool checkAndSetHasReceivedFirstPackets(); diff --git a/domain-server/src/DomainServerNodeData.h b/domain-server/src/DomainServerNodeData.h index 00c5f659ca..57ed96acab 100644 --- a/domain-server/src/DomainServerNodeData.h +++ b/domain-server/src/DomainServerNodeData.h @@ -24,7 +24,6 @@ class DomainServerNodeData : public NodeData { public: DomainServerNodeData(); - int parseData(NLPacket& packet, QSharedPointer sendingNode) { return 0; } const QJsonObject& getStatsJSONObject() const { return _statsJSONObject; } diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index a9e60f85e2..6ae8402d5e 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -535,7 +535,7 @@ void AudioClient::stop() { } } -void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer packet, SharedNodePointer sendingNode) { +void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer packet) { char bitset; packet->readPrimitive(&bitset); @@ -552,7 +552,7 @@ void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer pack } } -void AudioClient::handleAudioDataPacket(QSharedPointer packet, SharedNodePointer sendingNode) { +void AudioClient::handleAudioDataPacket(QSharedPointer packet) { auto nodeList = DependencyManager::get(); nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::ReceiveFirstAudioPacket); @@ -566,11 +566,11 @@ void AudioClient::handleAudioDataPacket(QSharedPointer packet, SharedN } // Audio output must exist and be correctly set up if we're going to process received audio - _receivedAudioStream.parseData(*packet, sendingNode); + _receivedAudioStream.parseData(*packet); } } -void AudioClient::handleNoisyMutePacket(QSharedPointer packet, SharedNodePointer sendingNode) { +void AudioClient::handleNoisyMutePacket(QSharedPointer packet) { if (!_muted) { toggleMute(); @@ -579,7 +579,7 @@ void AudioClient::handleNoisyMutePacket(QSharedPointer packet, SharedN } } -void AudioClient::handleMuteEnvironmentPacket(QSharedPointer packet, SharedNodePointer sendingNode) { +void AudioClient::handleMuteEnvironmentPacket(QSharedPointer packet) { glm::vec3 position; float radius; diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index dc9c40acf7..79a044601d 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -140,10 +140,10 @@ public slots: void start(); void stop(); - void handleAudioEnvironmentDataPacket(QSharedPointer packet, SharedNodePointer sendingNode); - void handleAudioDataPacket(QSharedPointer packet, SharedNodePointer sendingNode); - void handleNoisyMutePacket(QSharedPointer packet, SharedNodePointer sendingNode); - void handleMuteEnvironmentPacket(QSharedPointer packet, SharedNodePointer sendingNode); + void handleAudioEnvironmentDataPacket(QSharedPointer packet); + void handleAudioDataPacket(QSharedPointer packet); + void handleNoisyMutePacket(QSharedPointer packet); + void handleMuteEnvironmentPacket(QSharedPointer packet); void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); } void handleAudioInput(); diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp index 1c061b3aaa..8df42ff76f 100644 --- a/libraries/audio/src/InboundAudioStream.cpp +++ b/libraries/audio/src/InboundAudioStream.cpp @@ -99,13 +99,13 @@ void InboundAudioStream::perSecondCallbackForUpdatingStats() { _timeGapStatsForStatsPacket.currentIntervalComplete(); } -int InboundAudioStream::parseData(NLPacket& packet, SharedNodePointer sendingNode) { +int InboundAudioStream::parseData(NLPacket& packet) { // parse sequence number and track it quint16 sequence; packet.readPrimitive(&sequence); SequenceNumberStats::ArrivalInfo arrivalInfo = _incomingSequenceNumberStats.sequenceNumberReceived(sequence, - sendingNode->getUUID()); + packet.getSourceID()); packetReceivedUpdateTimingStats(); diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h index 106caa11ef..6cd719d233 100644 --- a/libraries/audio/src/InboundAudioStream.h +++ b/libraries/audio/src/InboundAudioStream.h @@ -107,7 +107,7 @@ public: virtual void resetStats(); void clearBuffer(); - virtual int parseData(NLPacket& packet, QSharedPointer sendingNode); + virtual int parseData(NLPacket& packet); int popFrames(int maxFrames, bool allOrNothing, bool starveIfNoFramesPopped = true); int popSamples(int maxSamples, bool allOrNothing, bool starveIfNoSamplesPopped = true); diff --git a/libraries/networking/src/Assignment.h b/libraries/networking/src/Assignment.h index 1e4c985583..67f861f850 100644 --- a/libraries/networking/src/Assignment.h +++ b/libraries/networking/src/Assignment.h @@ -85,9 +85,6 @@ public: const char* getTypeName() const; - // implement parseData to return 0 so we can be a subclass of NodeData - int parseData(NLPacket& packet, SharedNodePointer sendingNode) { return 0; } - friend QDebug operator<<(QDebug debug, const Assignment& assignment); friend QDataStream& operator<<(QDataStream &out, const Assignment& assignment); friend QDataStream& operator>>(QDataStream &in, Assignment& assignment); diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index d03a3c9f07..f0193a1789 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -247,7 +247,7 @@ int LimitedNodeList::updateNodeWithDataFromPacket(QSharedPointer packe if (linkedData) { QMutexLocker linkedDataLocker(&linkedData->getMutex()); - return linkedData->parseData(*packet, sendingNode); + return linkedData->parseData(*packet); } return 0; diff --git a/libraries/networking/src/NodeData.h b/libraries/networking/src/NodeData.h index d323c72184..78ef446938 100644 --- a/libraries/networking/src/NodeData.h +++ b/libraries/networking/src/NodeData.h @@ -25,7 +25,7 @@ class NodeData : public QObject { public: NodeData(); virtual ~NodeData() = 0; - virtual int parseData(NLPacket& packet, QSharedPointer sendingNode) = 0; + virtual int parseData(NLPacket& packet) { return 0; } QMutex& getMutex() { return _mutex; } diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp index ea568387f5..cdda3a7a0e 100644 --- a/libraries/octree/src/OctreeQuery.cpp +++ b/libraries/octree/src/OctreeQuery.cpp @@ -64,7 +64,7 @@ int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) { } // called on the other nodes - assigns it to my views of the others -int OctreeQuery::parseData(NLPacket& packet, QSharedPointer sendingNode) { +int OctreeQuery::parseData(NLPacket& packet) { const unsigned char* startPosition = reinterpret_cast(packet.getPayload()); const unsigned char* sourceBuffer = startPosition; diff --git a/libraries/octree/src/OctreeQuery.h b/libraries/octree/src/OctreeQuery.h index 83cb828112..86474ffc02 100644 --- a/libraries/octree/src/OctreeQuery.h +++ b/libraries/octree/src/OctreeQuery.h @@ -48,7 +48,7 @@ public: virtual ~OctreeQuery() {} int getBroadcastData(unsigned char* destinationBuffer); - int parseData(NLPacket& packet, QSharedPointer sendingNode); + int parseData(NLPacket& packet); // getters for camera details const glm::vec3& getCameraPosition() const { return _cameraPosition; }