From cdbcaf0f7f4668f2b54c2e676166825211f2c83d Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 13 Jul 2015 12:06:12 -0700
Subject: [PATCH] Fix AudioMixer compilation errors

---
 assignment-client/src/Agent.cpp            | 47 ++++------------------
 assignment-client/src/Agent.h              |  1 -
 assignment-client/src/audio/AudioMixer.cpp | 14 +++----
 3 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 6166923832..0037f989ef 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -65,7 +65,7 @@ void Agent::handleOctreePacket(QSharedPointer<NLPacket> packet, SharedNodePointe
 
     if (packetType == PacketType::OctreeStats) {
 
-        int statsMessageLength = OctreeHeadlessViewer::parseOctreeStats(mutablePacket, senderNode);
+        int statsMessageLength = OctreeHeadlessViewer::parseOctreeStats(packet, senderNode);
         if (messageLength > statsMessageLength) {
             mutablePacket = mutablePacket.mid(statsMessageLength);
         } else {
@@ -80,49 +80,16 @@ void Agent::handleOctreePacket(QSharedPointer<NLPacket> packet, SharedNodePointe
     }
 }
 
-void Agent::readPendingDatagrams() {
-    QByteArray receivedPacket;
-    HifiSockAddr senderSockAddr;
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    while (readAvailableDatagram(receivedPacket, senderSockAddr)) {
-        if (nodeList->packetVersionAndHashMatch(receivedPacket)) {
-            PacketType::Value datagramPacketType = packetTypeForPacket(receivedPacket);
-
-            if (datagramPacketType == PacketType::Jurisdiction) {
-                int headerBytes = numBytesForPacketHeader(receivedPacket);
-
-                SharedNodePointer matchedNode = nodeList->sendingNodeForPacket(receivedPacket);
-
-                if (matchedNode) {
-                    // PacketType_JURISDICTION, first byte is the node type...
-                    switch (receivedPacket[headerBytes]) {
-                        case NodeType::EntityServer:
-                            DependencyManager::get<EntityScriptingInterface>()->getJurisdictionListener()->
-                                queueReceivedPacket(matchedNode, receivedPacket);
-                            break;
-                    }
-                }
-            }
-        }
-    }
-}
-
 void Agent::handleJurisdictionPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr) {
     QByteArray receivedPacket = QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader());
     int headerBytes = numBytesForPacketHeader(receivedPacket);
 
-    auto nodeList = DependencyManager::get<NodeList>();
-    SharedNodePointer matchedNode = nodeList->sendingNodeForPacket(receivedPacket);
-
-    if (matchedNode) {
-        // PacketType_JURISDICTION, first byte is the node type...
-        switch (receivedPacket[headerBytes]) {
-            case NodeType::EntityServer:
-                DependencyManager::get<EntityScriptingInterface>()->getJurisdictionListener()->
-                    queueReceivedPacket(senderNode, receivedPacket);
-                break;
-        }
+    // PacketType_JURISDICTION, first byte is the node type...
+    switch (receivedPacket[headerBytes]) {
+        case NodeType::EntityServer:
+            DependencyManager::get<EntityScriptingInterface>()->getJurisdictionListener()->
+                queueReceivedPacket(packet, senderNode);
+            break;
     }
 }
 
diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index 70e1913b54..3e202f2d0d 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -52,7 +52,6 @@ public:
     
 public slots:
     void run();
-    void readPendingDatagrams();
     void playAvatarSound(Sound* avatarSound) { _scriptEngine.setAvatarSound(avatarSound); }
 
 private slots:
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index dc790e99f4..d8c01dafcd 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -545,34 +545,32 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) {
 
 void AudioMixer::readPendingDatagram(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    if (nodeList->packetVersionAndHashMatch(receivedPacket)) {
-        nodeList->processNodeData(senderSockAddr, receivedPacket);
-    }
+    nodeList->processNodeData(senderSockAddr, receivedPacket);
 }
 
 void AudioMixer::handleMicrophoneAudioNoEchoPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->findNodeAndUpdateWithDataFromPacket(packet->getData());
+    nodeList->findNodeAndUpdateWithDataFromPacket(packet);
 }
 
 void AudioMixer::handleMicrophoneAudioWithEchoPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->findNodeAndUpdateWithDataFromPacket(packet->getData());
+    nodeList->findNodeAndUpdateWithDataFromPacket(packet);
 }
 
 void AudioMixer::handleInjectAudioPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->findNodeAndUpdateWithDataFromPacket(packet->getData());
+    nodeList->findNodeAndUpdateWithDataFromPacket(packet);
 }
 
 void AudioMixer::handleSilentAudioFramePacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->findNodeAndUpdateWithDataFromPacket(packet->getData());
+    nodeList->findNodeAndUpdateWithDataFromPacket(packet);
 }
 
 void AudioMixer::handleAudioStreamStatsPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->findNodeAndUpdateWithDataFromPacket(packet->getData());
+    nodeList->findNodeAndUpdateWithDataFromPacket(packet);
 }
 
 void AudioMixer::handleMuteEnvironmentPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {