From 1fe01f3e61bb6168375313de27fe740b1fe69c17 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 25 Mar 2014 12:16:07 -0700 Subject: [PATCH] increment framesSinceCutoffEvent in mixers to enable recovery --- assignment-client/src/audio/AudioMixer.cpp | 4 ++++ assignment-client/src/avatars/AvatarMixer.cpp | 4 ++++ 2 files changed, 8 insertions(+) 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..f0a2b68050 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();