From 5f93e44ff7477ac3e5dce57faed954d5f263df9a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 24 Mar 2014 12:33:00 -0700 Subject: [PATCH] abstract stats packet sending to NodeList --- assignment-client/src/audio/AudioMixer.cpp | 8 +------- libraries/shared/src/NodeList.cpp | 9 +++++++-- libraries/shared/src/NodeList.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 8412295bae..f7953cdf41 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -355,13 +355,7 @@ void AudioMixer::sendStatsPacket() { statsObject["trailing_sleep"] = _trailingSleepRatio; statsObject["min_audability_threshold"] = _minAudibilityThreshold; - QByteArray statsPacket = byteArrayWithPopulatedHeader(PacketTypeNodeJsonStats); - QDataStream statsPacketStream(&statsPacket, QIODevice::Append); - - statsPacketStream << statsObject.toVariantMap(); - - NodeList* nodeList = NodeList::getInstance(); - nodeList->sendDatagramToDomainServer(statsPacket); + NodeList::getInstance()->sendStatsToDomainServer(statsObject); } void AudioMixer::run() { diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 7bbe1ce29b..fe1466d5d1 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -193,8 +193,13 @@ qint64 NodeList::writeDatagram(const char* data, qint64 size, const SharedNodePo return writeDatagram(QByteArray(data, size), destinationNode, overridenSockAddr); } -qint64 NodeList::sendDatagramToDomainServer(const QByteArray &datagram) { - return writeDatagram(datagram, _domainInfo.getSockAddr(), _domainInfo.getConnectionSecret()); +qint64 NodeList::sendStatsToDomainServer(const QJsonObject& statsObject) { + QByteArray statsPacket = byteArrayWithPopulatedHeader(PacketTypeNodeJsonStats); + QDataStream statsPacketStream(&statsPacket, QIODevice::Append); + + statsPacketStream << statsObject.toVariantMap(); + + return writeDatagram(statsPacket, _domainInfo.getSockAddr(), _domainInfo.getConnectionSecret()); } void NodeList::timePingReply(const QByteArray& packet, const SharedNodePointer& sendingNode) { diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h index d479e72ee7..379db70412 100644 --- a/libraries/shared/src/NodeList.h +++ b/libraries/shared/src/NodeList.h @@ -78,7 +78,7 @@ public: const HifiSockAddr& overridenSockAddr = HifiSockAddr()); qint64 writeDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode, const HifiSockAddr& overridenSockAddr = HifiSockAddr()); - qint64 sendDatagramToDomainServer(const QByteArray& datagram); + qint64 sendStatsToDomainServer(const QJsonObject& statsObject); void(*linkedDataCreateCallback)(Node *);