diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 450b6e0ad9..82674e5141 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -455,6 +455,10 @@ void AudioMixer::run() { } } + if (!hasRatioChanged) { + ++framesSinceCutoffEvent; + } + foreach (const SharedNodePointer& node, nodeList->getNodeHash()) { if (node->getType() == NodeType::Agent && node->getActiveSocket() && node->getLinkedData() && ((AudioMixerClientData*) node->getLinkedData())->getAvatarAudioRingBuffer()) { diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 54f1943930..65e0acd4a6 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -306,6 +306,10 @@ void AvatarMixer::run() { } } + if (!hasRatioChanged) { + ++framesSinceCutoffEvent; + } + broadcastAvatarData(); QCoreApplication::processEvents(); @@ -318,8 +322,6 @@ void AvatarMixer::run() { if (usecToSleep > 0) { usleep(usecToSleep); - } else { - qDebug() << "AvatarMixer loop took too" << -usecToSleep << "of extra time. Won't sleep."; } } } diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css index fb295cffc3..ff33cc206b 100644 --- a/domain-server/resources/web/css/style.css +++ b/domain-server/resources/web/css/style.css @@ -40,6 +40,10 @@ span.port { color: #666666; } +.stats-key { + width: 400px; +} + .stale { color: red; } \ No newline at end of file diff --git a/domain-server/resources/web/stats/js/stats.js b/domain-server/resources/web/stats/js/stats.js index a7b0aecfcf..74d58c72c0 100644 --- a/domain-server/resources/web/stats/js/stats.js +++ b/domain-server/resources/web/stats/js/stats.js @@ -21,8 +21,9 @@ $(document).ready(function(){ $.each(json, function(key, value) { statsTableBody += ""; - statsTableBody += "" + key + ""; - statsTableBody += "" + value + ""; + statsTableBody += "" + key + ""; + var formattedValue = (typeof value == 'number' ? value.toLocaleString() : value); + statsTableBody += "" + formattedValue + ""; statsTableBody += ""; }); diff --git a/libraries/shared/src/ThreadedAssignment.cpp b/libraries/shared/src/ThreadedAssignment.cpp index f4ea383399..642f471cc5 100644 --- a/libraries/shared/src/ThreadedAssignment.cpp +++ b/libraries/shared/src/ThreadedAssignment.cpp @@ -82,9 +82,9 @@ void ThreadedAssignment::sendStatsPacket() { void ThreadedAssignment::checkInWithDomainServerOrExit() { if (NodeList::getInstance()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) { - qDebug() << "NRDC:" << NodeList::getInstance()->getNumNoReplyDomainCheckIns(); setFinished(true); } else { + qDebug() << "Sending DS check in. There are" << NodeList::getInstance()->getNumNoReplyDomainCheckIns() << "unreplied."; NodeList::getInstance()->sendDomainServerCheckIn(); } }