From 269bea65fb3b8dd8135144585c2de614a8a433ac Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 6 Jul 2015 17:20:08 -0700
Subject: [PATCH] fix AssignmentClientMonitor and AudioMixer to use NLPacket

---
 assignment-client/src/AssignmentClientMonitor.cpp | 4 ++--
 assignment-client/src/audio/AudioMixer.cpp        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 97f91566e1..4c034721d1 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -195,7 +195,7 @@ void AssignmentClientMonitor::checkSpares() {
             SharedNodePointer childNode = nodeList->nodeWithUUID(aSpareId);
             childNode->activateLocalSocket();
 
-            NodeListPacket diePacket = NodeListPacket::create(PacketType::StopNode);
+            auto diePacket { NLPacket::create(PacketType::StopNode); }
             nodeList->sendPacket(diePacket, childNode);
         }
     }
@@ -230,7 +230,7 @@ void AssignmentClientMonitor::readPendingDatagrams() {
                             // tell unknown assignment-client child to exit.
                             qDebug() << "asking unknown child to exit.";
 
-                            NodeListPacket diePacket = NodeListPacket::create(PacketType::StopNode);
+                            auto diePacket { NL::create(PacketType::StopNode); }
                             nodeList->sendPacket(diePacket, childNode);
                         }
                     }
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index fdb6c8618e..055294b9bf 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -785,7 +785,7 @@ void AudioMixer::run() {
                 // if the stream should be muted, send mute packet
                 if (nodeData->getAvatarAudioStream()
                     && shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) {
-                    auto mutePacket = NodeListPacket::create(PacketType::NoisyMute);
+                    auto mutePacket { NLPacket::create(PacketType::NoisyMute); }
                     nodeList->sendPacket(mutePacket, node);
                 }
 
@@ -794,11 +794,11 @@ void AudioMixer::run() {
 
                     int streamsMixed = prepareMixForListeningNode(node.data());
 
-                    std::unique_ptr<NodeListPacket> mixPacket;
+                    std::unique_ptr<NLPacket> mixPacket;
 
                     if (streamsMixed > 0) {
                         int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO;
-                        mixPacket = NodeListPacket::create(PacketType::MixedAudio);
+                        mixPacket = NLPacket::create(PacketType::MixedAudio);
 
                         // pack sequence number
                         quint16 sequence = nodeData->getOutgoingSequenceNumber();
@@ -808,7 +808,7 @@ void AudioMixer::run() {
                         mixPacket.write(mixSamples, AudioConstants::NETWORK_FRAME_BYTES_STEREO);
                     } else {
                         int silentPacketBytes = sizeof(quint16) + sizeof(quint16);
-                        mixPacket = NodeListPacket::create(PacketType::SilentAudioFrame);
+                        mixPacket = NLPacket::create(PacketType::SilentAudioFrame);
 
                         // pack sequence number
                         quint16 sequence = nodeData->getOutgoingSequenceNumber();