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

reinstate delete for starved but started audio ring buffers

Browse source
This commit is contained in:
Stephen Birarda 2013-12-19 15:51:14 -08:00
parent 0446aeb4d3
commit 87e5579e52
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,11 +94,10 @@ void AudioMixerClientData::pushBuffersAfterFrameSend() {
audioBuffer->shiftReadPosition(NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL); audioBuffer->shiftReadPosition(NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
audioBuffer->setWillBeAddedToMix(false); audioBuffer->setWillBeAddedToMix(false);
} else if (audioBuffer->isStarved()) { } else if (audioBuffer->hasStarted() && audioBuffer->isStarved()) {
// this was previously the kill for injected audio from a client // this is an empty audio buffer that has starved, safe to delete
// fix when that is added back delete audioBuffer;
// delete audioBuffer; _ringBuffers.erase(_ringBuffers.begin() + i);
// _ringBuffers.erase(_ringBuffers.begin() + i);
} }
} }
} }

2
libraries/audio/src/AudioRingBuffer.h
View file

@ -62,6 +62,8 @@ public:
bool isStarved() const { return _isStarved; } bool isStarved() const { return _isStarved; }
void setIsStarved(bool isStarved) { _isStarved = isStarved; } void setIsStarved(bool isStarved) { _isStarved = isStarved; }
bool hasStarted() const { return _hasStarted; }
protected: protected:
// disallow copying of AudioRingBuffer objects // disallow copying of AudioRingBuffer objects
AudioRingBuffer(const AudioRingBuffer&); AudioRingBuffer(const AudioRingBuffer&);