Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up QHash iterator code again

Browse source
This commit is contained in:
wangyix 2014-07-28 09:47:40 -07:00
parent c129db16cb
commit 45b4777e60
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,8 +279,8 @@ void AudioMixer::prepareMixForListeningNode(Node* node) {
// enumerate the ARBs attached to the otherNode and add all that should be added to mix // enumerate the ARBs attached to the otherNode and add all that should be added to mix
const QHash<QUuid, PositionalAudioRingBuffer*>& otherNodeRingBuffers = otherNodeClientData->getRingBuffers(); const QHash<QUuid, PositionalAudioRingBuffer*>& otherNodeRingBuffers = otherNodeClientData->getRingBuffers();
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i, end = otherNodeRingBuffers.constEnd(); QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
for (i = otherNodeRingBuffers.begin(); i != end; i++) { for (i = otherNodeRingBuffers.begin(); i != otherNodeRingBuffers.constEnd(); i++) {
PositionalAudioRingBuffer* otherNodeBuffer = i.value(); PositionalAudioRingBuffer* otherNodeBuffer = i.value();
if ((*otherNode != *node || otherNodeBuffer->shouldLoopbackForNode()) if ((*otherNode != *node || otherNodeBuffer->shouldLoopbackForNode())

9
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -28,8 +28,7 @@ AudioMixerClientData::AudioMixerClientData() :
AudioMixerClientData::~AudioMixerClientData() { AudioMixerClientData::~AudioMixerClientData() {
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i; QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd(); for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd(); i++) {
for (i = _ringBuffers.constBegin(); i != end; i++) {
// delete this attached InboundAudioStream // delete this attached InboundAudioStream
delete i.value(); delete i.value();
} }
@ -101,8 +100,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
void AudioMixerClientData::audioStreamsPopFrameForMixing() { void AudioMixerClientData::audioStreamsPopFrameForMixing() {
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i; QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd(); for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd(); i++) {
for (i = _ringBuffers.constBegin(); i != end; i++) {
i.value()->popFrames(1); i.value()->popFrames(1);
} }
} }
@ -227,8 +225,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
} }
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i; QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd(); for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd; i++) {
for (i = _ringBuffers.constBegin(); i != end; i++) {
if (i.value()->getType() == PositionalAudioRingBuffer::Injector) { if (i.value()->getType() == PositionalAudioRingBuffer::Injector) {
AudioStreamStats streamStats = i.value()->getAudioStreamStats(); AudioStreamStats streamStats = i.value()->getAudioStreamStats();
result += " UPSTREAM.inj.desired:" + QString::number(streamStats._ringBufferDesiredJitterBufferFrames) result += " UPSTREAM.inj.desired:" + QString::number(streamStats._ringBufferDesiredJitterBufferFrames)