From 863cc3390a265a701d2fec1e049f9d13a5bfc2b2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 15 Jul 2015 17:41:00 -0700
Subject: [PATCH] fix send of mixed audio stream packet from AM

---
 assignment-client/src/audio/AudioMixer.cpp        | 2 +-
 assignment-client/src/audio/AvatarAudioStream.cpp | 2 +-
 libraries/networking/src/NodeList.cpp             | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 215459bc2b..fe24812783 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -777,7 +777,7 @@ void AudioMixer::run() {
                     std::unique_ptr<NLPacket> mixPacket;
 
                     if (streamsMixed > 0) {
-                        int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO * sizeof(int16_t);
+                        int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO;
                         mixPacket = NLPacket::create(PacketType::MixedAudio, mixPacketBytes);
 
                         // pack sequence number
diff --git a/assignment-client/src/audio/AvatarAudioStream.cpp b/assignment-client/src/audio/AvatarAudioStream.cpp
index fc14bcede6..4c71777d01 100644
--- a/assignment-client/src/audio/AvatarAudioStream.cpp
+++ b/assignment-client/src/audio/AvatarAudioStream.cpp
@@ -48,7 +48,7 @@ int AvatarAudioStream::parseStreamProperties(PacketType::Value type, const QByte
 
         // read the positional data
         readBytes += parsePositionalData(packetAfterSeqNum.mid(readBytes));
-
+        
         // calculate how many samples are in this packet
         int numAudioBytes = packetAfterSeqNum.size() - readBytes;
         numAudioSamples = numAudioBytes / sizeof(int16_t);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 8d54e05fb6..002484a54c 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -126,8 +126,11 @@ qint64 NodeList::sendStatsToDomainServer(const QJsonObject& statsObject) {
 
 void NodeList::timePingReply(QSharedPointer<NLPacket> packet, const SharedNodePointer& sendingNode) {
     PingType_t pingType;
+    
     quint64 ourOriginalTime, othersReplyTime;
+    
     packet->seek(0);
+    
     packet->readPrimitive(&pingType);
     packet->readPrimitive(&ourOriginalTime);
     packet->readPrimitive(&othersReplyTime);