and finally VorbisInputStream::readBuffer. Once we verified the new readBuffer methods all work, we can get rid of readIntern again and merge those back into the regular read() methods

svn-id: r9476

1 files changed, 16 insertions, 2 deletions

diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index b206c00fc4..7a71a43234 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -512,10 +512,24 @@ inline bool VorbisInputStream::eosIntern() const {
 }
 
 int VorbisInputStream::readBuffer(int16 *buffer, int numSamples) {
-	int samples;
-	for (samples = 0; samples < numSamples && !eosIntern(); samples++) {
+	int samples = 0;
+#if 1
+	const int16 * const bufferEnd = _buffer + ARRAYSIZE(_buffer);
+	while (samples < numSamples && !eosIntern()) {
+		if (_pos >= bufferEnd) {
+			refill();
+		}
+		const int len = MIN(numSamples, bufferEnd - _pos);
+		memcpy(buffer, _pos, len * 2);
+		buffer += len;
+		_pos += len;
+		samples += len;
+	}
+#else
+	for (; samples < numSamples && !eosIntern(); samples++) {
 		*buffer++ = readIntern();
 	}
+#endif
 	return samples;
 }