Merge pull request #2490 from birarda/master

properly increment framesSinceCutoffEvent in mixers
This commit is contained in:
Stephen Birarda 2014-03-25 12:17:29 -07:00
commit a35eca1d4b
2 changed files with 8 additions and 0 deletions

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

View file

@ -306,6 +306,10 @@ void AvatarMixer::run() {
}
}
if (!hasRatioChanged) {
++framesSinceCutoffEvent;
}
broadcastAvatarData();
QCoreApplication::processEvents();