From d5b466e3ae36eec5ef4b2621e27d92b18ee5c3b6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 12 Jun 2017 11:31:35 -0700
Subject: [PATCH] fix replicant handling slot, add node strings for replicants

---
 assignment-client/src/audio/AudioMixer.cpp   | 3 ++-
 libraries/networking/src/LimitedNodeList.cpp | 3 ++-
 libraries/networking/src/Node.cpp            | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 1246617540..0927e02655 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -100,10 +100,11 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
         PacketType::ReplicatedSilentAudioFrame,
         PacketType::ReplicatedNegotiateAudioFormat
     },
-        this, "queueMirroredAudioPacket"
+        this, "queueReplicatedAudioPacket"
     );
 
     connect(nodeList.data(), &NodeList::nodeKilled, this, &AudioMixer::handleNodeKilled);
+
 }
 
 void AudioMixer::queueAudioPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 7b0b2d5bc5..afb0dce8af 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -744,7 +744,8 @@ void LimitedNodeList::removeSilentNodes() {
         SharedNodePointer node = it->second;
         node->getMutex().lock();
 
-        if ((usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) {
+        if (node->getType() != NodeType::ReplicantAudioMixer && node->getType() != NodeType::ReplicantAvatarMixer
+            && (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) {
             // call the NodeHash erase to get rid of this node
             it = _nodeHash.unsafe_erase(it);
 
diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp
index 49f032b823..a023e488c4 100644
--- a/libraries/networking/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -42,6 +42,8 @@ void NodeType::init() {
     TypeNameHash.insert(NodeType::MessagesMixer, "Messages Mixer");
     TypeNameHash.insert(NodeType::AssetServer, "Asset Server");
     TypeNameHash.insert(NodeType::EntityScriptServer, "Entity Script Server");
+    TypeNameHash.insert(NodeType::ReplicantAudioMixer, "Replicant Audio Mixer");
+    TypeNameHash.insert(NodeType::ReplicantAvatarMixer, "Replicant Avatar Mixer");
     TypeNameHash.insert(NodeType::Unassigned, "Unassigned");
 }