From 2355ba70caa81e460599651cfcc3116692d82e28 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Nov 2015 18:55:09 -0800
Subject: [PATCH] just remove messages-mixer settings grabbing all together

---
 .../src/messages/MessagesMixer.cpp            | 30 ++-----------------
 .../src/messages/MessagesMixer.h              |  2 --
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/assignment-client/src/messages/MessagesMixer.cpp b/assignment-client/src/messages/MessagesMixer.cpp
index f91076c335..d3662f3fb5 100644
--- a/assignment-client/src/messages/MessagesMixer.cpp
+++ b/assignment-client/src/messages/MessagesMixer.cpp
@@ -129,32 +129,6 @@ void MessagesMixer::run() {
     auto nodeList = DependencyManager::get<NodeList>();
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
     
-    // The messages-mixer currently does not have any settings, so it would be kind of insane to bail on an empty settings
-    // object. The below can be uncommented once messages-mixer settings are enabled.
-    
-    // wait until we have the domain-server settings, otherwise we bail
-//    DomainHandler& domainHandler = nodeList->getDomainHandler();
-//
-//    qDebug() << "Waiting for domain settings from domain-server.";
-//
-//    // block until we get the settingsRequestComplete signal
-//    QEventLoop loop;
-//    connect(&domainHandler, &DomainHandler::settingsReceived, &loop, &QEventLoop::quit);
-//    connect(&domainHandler, &DomainHandler::settingsReceiveFail, &loop, &QEventLoop::quit);
-//    domainHandler.requestDomainSettings();
-//    loop.exec();
-//
-//    if (domainHandler.getSettingsObject().isEmpty()) {
-//        qDebug() << "Failed to retreive settings object from domain-server. Bailing on assignment.";
-//        setFinished(true);
-//        return;
-//    }
-//
-//    // parse the settings to pull out the values we need
-//    parseDomainServerSettings(domainHandler.getSettingsObject());
-}
-
-void MessagesMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
-    // TODO - if we want options, parse them here...
-    const QString MESSAGES_MIXER_SETTINGS_KEY = "messages_mixer";
+    // The messages-mixer currently does currently have any domain settings. If it did, they would be
+    // synchronously grabbed here.
 }
diff --git a/assignment-client/src/messages/MessagesMixer.h b/assignment-client/src/messages/MessagesMixer.h
index 12667bcc1b..65419a8ca6 100644
--- a/assignment-client/src/messages/MessagesMixer.h
+++ b/assignment-client/src/messages/MessagesMixer.h
@@ -35,8 +35,6 @@ private slots:
     void handleMessagesUnsubscribe(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode);
 
 private:
-    void parseDomainServerSettings(const QJsonObject& domainSettings);
-
     QHash<QString,QSet<QUuid>> _channelSubscribers;
 };