aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2013-08-27 20:25:22 +0200
committerMemphiz <memphis@machzwo.de>2013-08-27 20:25:22 +0200
commit3996de9eef940bd16fb1de9c3f6d738ee67cea4c (patch)
tree7a30f37a7c549eb4ee1a86f59b612115bafc4d00
parent0b19ff22d6fdd2347e75ea1c729cc3008c1624be (diff)
[AE/CA] - fix regression (stuck ringbuffer after 46min, 62min, 180min - depending on the stream setup).
Revert "[AE/CA] - fix a possible overflow in the ringbuffer during readsize calculation (yes we hit this in pvr branch in internalflush - when zapping channels)" This reverts commit e447c4bb34bbc10e1a97ea779eaaafd54a76e3f7.
-rw-r--r--xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h
index 348c9b3177..edff5d2d51 100644
--- a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h
+++ b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h
@@ -232,7 +232,7 @@ public:
*/
unsigned int GetReadSize()
{
- return m_iWritten > m_iReadSize ? m_iWritten - m_iRead : 0;
+ return m_iWritten - m_iRead;
}
/**