Merge branch 'master' of https://github.com/worklist/hifi

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()) {

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.";
         }
     }
 }

domain-server/resources/web/css/style.css

@@ -40,6 +40,10 @@ span.port {
   color: #666666;
 }
 
+.stats-key {
+  width: 400px;
+}
+
 .stale {
   color: red;
 }

domain-server/resources/web/stats/js/stats.js

@@ -21,8 +21,9 @@ $(document).ready(function(){
       
       $.each(json, function(key, value) {
         statsTableBody += "<tr>";
-        statsTableBody += "<td>" + key + "</td>";
+        statsTableBody += "<td class='stats-key'>" + key + "</td>";
-        statsTableBody += "<td>" + value + "</td>";
+        var formattedValue = (typeof value == 'number' ? value.toLocaleString() : value);
+        statsTableBody += "<td>" + formattedValue + "</td>";
         statsTableBody += "</tr>";
       });
       

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();
     }
 }