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

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

Browse source
This commit is contained in:
Philip Rosedale 2014-03-25 14:10:47 -07:00
commit 3051104054
5 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
assignment-client/src/avatars/AvatarMixer.cpp
View file

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

4
domain-server/resources/web/css/style.css
View file

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

5
domain-server/resources/web/stats/js/stats.js
View file

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

2
libraries/shared/src/ThreadedAssignment.cpp
View file

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