Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 08:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

abstract stats packet sending to NodeList

Browse source
This commit is contained in:
Stephen Birarda 2014-03-24 12:33:00 -07:00
parent fc76103fa0
commit 5f93e44ff7
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/audio/AudioMixer.cpp
View file

@ -355,13 +355,7 @@ void AudioMixer::sendStatsPacket() {
statsObject["trailing_sleep"] = _trailingSleepRatio; statsObject["trailing_sleep"] = _trailingSleepRatio;
statsObject["min_audability_threshold"] = _minAudibilityThreshold; statsObject["min_audability_threshold"] = _minAudibilityThreshold;
QByteArray statsPacket = byteArrayWithPopulatedHeader(PacketTypeNodeJsonStats); NodeList::getInstance()->sendStatsToDomainServer(statsObject);
QDataStream statsPacketStream(&statsPacket, QIODevice::Append);
statsPacketStream << statsObject.toVariantMap();
NodeList* nodeList = NodeList::getInstance();
nodeList->sendDatagramToDomainServer(statsPacket);
} }
void AudioMixer::run() { void AudioMixer::run() {

9
libraries/shared/src/NodeList.cpp
View file

@ -193,8 +193,13 @@ qint64 NodeList::writeDatagram(const char* data, qint64 size, const SharedNodePo
return writeDatagram(QByteArray(data, size), destinationNode, overridenSockAddr); return writeDatagram(QByteArray(data, size), destinationNode, overridenSockAddr);
} }
qint64 NodeList::sendDatagramToDomainServer(const QByteArray &datagram) { qint64 NodeList::sendStatsToDomainServer(const QJsonObject& statsObject) {
return writeDatagram(datagram, _domainInfo.getSockAddr(), _domainInfo.getConnectionSecret()); 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) { void NodeList::timePingReply(const QByteArray& packet, const SharedNodePointer& sendingNode) {

2
libraries/shared/src/NodeList.h
View file

@ -78,7 +78,7 @@ public:
const HifiSockAddr& overridenSockAddr = HifiSockAddr()); const HifiSockAddr& overridenSockAddr = HifiSockAddr());
qint64 writeDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode, qint64 writeDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode,
const HifiSockAddr& overridenSockAddr = HifiSockAddr()); const HifiSockAddr& overridenSockAddr = HifiSockAddr());
qint64 sendDatagramToDomainServer(const QByteArray& datagram); qint64 sendStatsToDomainServer(const QJsonObject& statsObject);
void(*linkedDataCreateCallback)(Node *); void(*linkedDataCreateCallback)(Node *);