Replace AppendableAudioStream by QueuingAudioStream

svn-id: r47189

6 files changed, 25 insertions, 29 deletions

diff --git a/engines/groovie/player.h b/engines/groovie/player.h
index 2ef340149a..d54601bc52 100644
--- a/engines/groovie/player.h
+++ b/engines/groovie/player.h
@@ -52,7 +52,7 @@ protected:
 	OSystem *_syst;
 	Common::SeekableReadStream *_file;
 	uint16 _flags;
-	Audio::AppendableAudioStream *_audioStream;
+	Audio::QueuingAudioStream *_audioStream;
 
 private:
 	// Synchronization stuff
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 5f16f9c935..11e7fd9aaa 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -516,11 +516,7 @@ bool ROQPlayer::processBlockSoundMono(ROQBlockHeader &blockHeader) {
 
 	// Initialize the audio stream if needed
 	if (!_audioStream) {
-		byte flags = Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_AUTOFREE;
-#ifdef SCUMM_LITTLE_ENDIAN
-		flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
-#endif
-		_audioStream = Audio::makeAppendableAudioStream(22050, flags);
+		_audioStream = Audio::makeQueuingAudioStream(22050, false);
 		Audio::SoundHandle sound_handle;
 		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
@@ -544,7 +540,11 @@ bool ROQPlayer::processBlockSoundMono(ROQBlockHeader &blockHeader) {
 	}
 
 	// Queue the read buffer
-	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2);
+	byte flags = Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_AUTOFREE;
+#ifdef SCUMM_LITTLE_ENDIAN
+	flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+#endif
+	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, flags);
 
 	return true;
 }
@@ -559,11 +559,7 @@ bool ROQPlayer::processBlockSoundStereo(ROQBlockHeader &blockHeader) {
 
 	// Initialize the audio stream if needed
 	if (!_audioStream) {
-		byte flags = Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_STEREO;
-#ifdef SCUMM_LITTLE_ENDIAN
-		flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
-#endif
-		_audioStream = Audio::makeAppendableAudioStream(22050, flags);
+		_audioStream = Audio::makeQueuingAudioStream(22050, true);
 		Audio::SoundHandle sound_handle;
 		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
@@ -600,7 +596,11 @@ bool ROQPlayer::processBlockSoundStereo(ROQBlockHeader &blockHeader) {
 	}
 
 	// Queue the read buffer
-	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2);
+	byte flags = Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_STEREO;
+#ifdef SCUMM_LITTLE_ENDIAN
+	flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+#endif
+	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, flags);
 
 	return true;
 }
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 0c754473fe..e2764defa6 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -498,7 +498,7 @@ void VDXPlayer::decodeBlockDelta(uint32 offset, byte *colours, uint16 imageWidth
 
 void VDXPlayer::chunkSound(Common::ReadStream *in) {
 	if (!_audioStream) {
-		_audioStream = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE);
+		_audioStream = Audio::makeQueuingAudioStream(22050, false);
 		Audio::SoundHandle sound_handle;
 		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
@@ -506,7 +506,7 @@ void VDXPlayer::chunkSound(Common::ReadStream *in) {
 	byte *data = new byte[60000];
 	int chunksize = in->read(data, 60000);
 	if (!Common::isDebugChannelEnabled(kGroovieDebugFast)) {
-		_audioStream->queueBuffer(data, chunksize);
+		_audioStream->queueBuffer(data, chunksize, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE);
 	}
 }
 
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 1b9683ed65..fde6e06a96 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -292,7 +292,7 @@ bool VQAMovie::open(const char *filename) {
 				assert(_header.bits == 8);
 				assert(_header.channels == 1);
 
-				_stream = Audio::makeAppendableAudioStream(_header.freq, Audio::Mixer::FLAG_UNSIGNED);
+				_stream = Audio::makeQueuingAudioStream(_header.freq, false);
 			} else {
 				_stream = NULL;
 			}
@@ -422,7 +422,7 @@ void VQAMovie::displayFrame(uint frameNum) {
 			inbuf = new byte[size];
 			_file->read(inbuf, size);
 			assert(_stream);
-			_stream->queueBuffer(inbuf, size);
+			_stream->queueBuffer(inbuf, size, Audio::Mixer::FLAG_UNSIGNED);
 			break;
 
 		case MKID_BE('SND1'):	// Compressed sound, almost like AUD
@@ -435,12 +435,12 @@ void VQAMovie::displayFrame(uint frameNum) {
 
 			if (insize == outsize) {
 				assert(_stream);
-				_stream->queueBuffer(inbuf, insize);
+				_stream->queueBuffer(inbuf, insize, Audio::Mixer::FLAG_UNSIGNED);
 			} else {
 				outbuf = new byte[outsize];
 				decodeSND1(inbuf, insize, outbuf, outsize);
 				assert(_stream);
-				_stream->queueBuffer(outbuf, outsize);
+				_stream->queueBuffer(outbuf, outsize, Audio::Mixer::FLAG_UNSIGNED);
 				delete[] inbuf;
 			}
 			break;
@@ -612,7 +612,7 @@ void VQAMovie::play() {
 			case MKID_BE('SND0'):	// Uncompressed sound
 				inbuf = new byte[size];
 				_file->read(inbuf, size);
-				_stream->queueBuffer(inbuf, size);
+				_stream->queueBuffer(inbuf, size, Audio::Mixer::FLAG_UNSIGNED);
 				break;
 
 			case MKID_BE('SND1'):	// Compressed sound
@@ -623,11 +623,11 @@ void VQAMovie::play() {
 				_file->read(inbuf, insize);
 
 				if (insize == outsize) {
-					_stream->queueBuffer(inbuf, insize);
+					_stream->queueBuffer(inbuf, insize, Audio::Mixer::FLAG_UNSIGNED);
 				} else {
 					outbuf = new byte[outsize];
 					decodeSND1(inbuf, insize, outbuf, outsize);
-					_stream->queueBuffer(outbuf, outsize);
+					_stream->queueBuffer(outbuf, outsize, Audio::Mixer::FLAG_UNSIGNED);
 					delete[] inbuf;
 				}
 				break;
diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h
index bf3d1fe855..c1448a4865 100644
--- a/engines/kyra/vqa.h
+++ b/engines/kyra/vqa.h
@@ -33,7 +33,7 @@
 class OSystem;
 
 namespace Audio {
-class AppendableAudioStream;
+class QueuingAudioStream;
 } // End of namespace Audio
 
 namespace Common {
@@ -127,7 +127,7 @@ protected:
 
 	byte *_frame;
 
-	Audio::AppendableAudioStream *_stream;
+	Audio::QueuingAudioStream *_stream;
 	Audio::SoundHandle _sound;
 
 	uint32 readTag();
diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h
index c93221d7a0..d2c041742a 100644
--- a/engines/kyra/wsamovie.h
+++ b/engines/kyra/wsamovie.h
@@ -26,12 +26,8 @@
 #ifndef KYRA_WSAMOVIE_H
 #define KYRA_WSAMOVIE_H
 
-namespace Audio {
-class AppendableAudioStream;
-class SoundHandle;
-} // End of namespace Audio
-
 namespace Kyra {
+
 class KyraEngine_v1;
 class Screen_v2;
 class Palette;