From df6071093c0d41bc20a993afb6c1248ab253e11f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 6 Feb 2015 12:27:34 -0800
Subject: [PATCH] fix for double packet check, unused var

---
 gvr-interface/src/Client.cpp          |  2 -
 gvr-interface/src/RenderingClient.cpp | 95 +++++++++++++--------------
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/gvr-interface/src/Client.cpp b/gvr-interface/src/Client.cpp
index 7c4184bfbb..e323ab96b5 100644
--- a/gvr-interface/src/Client.cpp
+++ b/gvr-interface/src/Client.cpp
@@ -53,8 +53,6 @@ void Client::setupNetworking() {
 }
 
 void Client::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
-    PacketType incomingType = packetTypeForPacket(incomingPacket);
-    
     DependencyManager::get<NodeList>()->processNodeData(senderSockAddr, incomingPacket);
 }
 
diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp
index e0416fd532..9737263eee 100644
--- a/gvr-interface/src/RenderingClient.cpp
+++ b/gvr-interface/src/RenderingClient.cpp
@@ -83,58 +83,55 @@ void RenderingClient::processVerifiedPacket(const HifiSockAddr& senderSockAddr,
     auto nodeList = DependencyManager::get<NodeList>();
     PacketType incomingType = packetTypeForPacket(incomingPacket);
     
-    if (nodeList->packetVersionAndHashMatch(incomingPacket)) {
-        // only process this packet if we have a match on the packet version
-        switch (incomingType) {
-            case PacketTypeAudioEnvironment:
-            case PacketTypeAudioStreamStats:
-            case PacketTypeMixedAudio:
-            case PacketTypeSilentAudioFrame: {
-            
-                if (incomingType == PacketTypeAudioStreamStats) {
-                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
-                                              Qt::QueuedConnection,
-                                              Q_ARG(QByteArray, incomingPacket));
-                } else if (incomingType == PacketTypeAudioEnvironment) {
-                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
-                                              Qt::QueuedConnection,
-                                              Q_ARG(QByteArray, incomingPacket));
-                } else {
-                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
-                                              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;
+    switch (incomingType) {
+        case PacketTypeAudioEnvironment:
+        case PacketTypeAudioStreamStats:
+        case PacketTypeMixedAudio:
+        case PacketTypeSilentAudioFrame: {
+        
+            if (incomingType == PacketTypeAudioStreamStats) {
+                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
+                                          Qt::QueuedConnection,
+                                          Q_ARG(QByteArray, incomingPacket));
+            } else if (incomingType == PacketTypeAudioEnvironment) {
+                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
+                                          Qt::QueuedConnection,
+                                          Q_ARG(QByteArray, incomingPacket));
+            } else {
+                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
+                                          Qt::QueuedConnection,
+                                          Q_ARG(QByteArray, incomingPacket));
             }
-            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;
+        
+            // update having heard from the audio-mixer and record the bytes received
+            SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
+        
+            if (audioMixer) {
+                audioMixer->setLastHeardMicrostamp(usecTimestampNow());
             }
-            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;
     }
 }