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

CR fixes

Browse source
This commit is contained in:
Roxanne Skelly 2019-05-14 16:39:39 -07:00
parent fad7fa4c07
commit a7595496f6
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AudioMixerSlavePool.cpp
View file

@ -114,7 +114,7 @@ void AudioMixerSlavePool::each(std::function<void(AudioMixerSlave& slave)> funct
}
#ifdef DEBUG_EVENT_QUEUE
void AudioMixerSlavePool::queueStats(QJsonObject & stats) {
void AudioMixerSlavePool::queueStats(QJsonObject& stats) {
unsigned i = 0;
for (auto& slave : _slaves) {
int queueSize = ::hifi::qt::getEventQueueSize(slave.get());

2
assignment-client/src/audio/AudioMixerSlavePool.h
View file

@ -73,7 +73,7 @@ public:
void each(std::function<void(AudioMixerSlave& slave)> functor);
#ifdef DEBUG_EVENT_QUEUE
void queueStats(QJsonObject & stats);
void queueStats(QJsonObject& stats);
#endif
void setNumThreads(int numThreads);

2
assignment-client/src/avatars/AvatarMixerSlavePool.cpp
View file

@ -118,7 +118,7 @@ void AvatarMixerSlavePool::each(std::function<void(AvatarMixerSlave& slave)> fun
}
#ifdef DEBUG_EVENT_QUEUE
void AvatarMixerSlavePool::queueStats(QJsonObject & stats) {
void AvatarMixerSlavePool::queueStats(QJsonObject& stats) {
unsigned i = 0;
for (auto& slave : _slaves) {
int queueSize = ::hifi::qt::getEventQueueSize(slave.get());

2
assignment-client/src/avatars/AvatarMixerSlavePool.h
View file

@ -75,7 +75,7 @@ public:
void each(std::function<void(AvatarMixerSlave& slave)> functor);
#ifdef DEBUG_EVENT_QUEUE
void AvatarMixerSlavePool::queueStats(QJsonObject & stats);
void AvatarMixerSlavePool::queueStats(QJsonObject& stats);
#endif
void setNumThreads(int numThreads);

5
interface/resources/qml/Stats.qml
View file

@ -149,12 +149,13 @@ Item {
}
StatText {
visible: { root.eventQueueDebuggingOn && root.expanded }
text: { if (root.eventQueueDebuggingOn)
text: { if (root.eventQueueDebuggingOn) {
return "Event Queue Depth\n " +
"Main:\t" + root.mainThreadQueueDepth + "\n" +
"NodeList:\t" + root.nodeListThreadQueueDepth;
else
} else {
return "";
}
}
}
}