6 files changed, 14 insertions, 14 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp
index f949d612df..7416d86310 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/graphics/video/avi_decoder.cpp
@@ -431,10 +431,10 @@ Codec *AviDecoder::createCodec() {
 	return NULL;
 }
 
-Audio::QueuedAudioStream *AviDecoder::createAudioStream() {
+Audio::QueuingAudioStream *AviDecoder::createAudioStream() {
 
 	if (_wvInfo.tag == AVI_WAVE_FORMAT_PCM) {
-		return Audio::makeQueuedAudioStream(AUDIO_RATE, false);
+		return Audio::makeQueuingAudioStream(AUDIO_RATE, false);
 	}
 	
 	if (_wvInfo.tag != 0) // No sound
diff --git a/graphics/video/avi_decoder.h b/graphics/video/avi_decoder.h
index 81d2bceffc..e8d38fefb7 100644
--- a/graphics/video/avi_decoder.h
+++ b/graphics/video/avi_decoder.h
@@ -216,8 +216,8 @@ private:
 	void handlePalChange();
 	
 	Audio::SoundHandle *_audHandle;
-	Audio::QueuedAudioStream *_audStream;
-	Audio::QueuedAudioStream *createAudioStream();
+	Audio::QueuingAudioStream *_audStream;
+	Audio::QueuingAudioStream *createAudioStream();
 
 	// Helper functions
 	static byte char2num(char c);
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp
index d4412c4b5a..ccaf72cce7 100644
--- a/graphics/video/coktelvideo/coktelvideo.cpp
+++ b/graphics/video/coktelvideo/coktelvideo.cpp
@@ -201,7 +201,7 @@ bool Imd::assessAudioProperties() {
 		_soundStage = 1;
 		_hasSound   = true;
 
-		_audioStream = Audio::makeQueuedAudioStream(_soundFreq, false);
+		_audioStream = Audio::makeQueuingAudioStream(_soundFreq, false);
 	} else
 		_frameLength = 1000 / _frameRate;
 
@@ -1276,7 +1276,7 @@ bool Vmd::assessAudioProperties() {
 
 	_soundStage = 1;
 
-	_audioStream = Audio::makeQueuedAudioStream(_soundFreq, _soundStereo != 0);
+	_audioStream = Audio::makeQueuingAudioStream(_soundFreq, _soundStereo != 0);
 
 	return true;
 }
@@ -1562,9 +1562,9 @@ void Vmd::seekFrame(int32 frame, int16 whence, bool restart) {
 		// FIXME: This code didn't check the stereo flag at all and always generated
 		// mono data. Is that on purpose? If so, just remove this comment.
 		// If it was by accident, remove the assert and replace "false" in the call
-		// to makeQueuedAudioStream() below by "_soundStereo > 0".
+		// to makeQueuingAudioStream() below by "_soundStereo > 0".
 		assert(_soundStereo == 0);
-		_audioStream = Audio::makeQueuedAudioStream(_soundFreq, false);
+		_audioStream = Audio::makeQueuingAudioStream(_soundFreq, false);
 	}
 
 	// Seek
diff --git a/graphics/video/coktelvideo/coktelvideo.h b/graphics/video/coktelvideo/coktelvideo.h
index 352abf282d..f0165cfb76 100644
--- a/graphics/video/coktelvideo/coktelvideo.h
+++ b/graphics/video/coktelvideo/coktelvideo.h
@@ -341,7 +341,7 @@ protected:
 	uint8  _soundStage; // (0: no sound, 1: loaded, 2: playing)
 	uint32 _skipFrames;
 
-	Audio::QueuedAudioStream *_audioStream;
+	Audio::QueuingAudioStream *_audioStream;
 	Audio::SoundHandle _audioHandle;
 
 	// Current video state
diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp
index 551b75b828..1a313b9f2e 100644
--- a/graphics/video/smk_decoder.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -465,7 +465,7 @@ bool SmackerDecoder::loadFile(const char *fileName) {
 		_header.audioInfo[i].sampleRate = audioInfo & 0xFFFFFF;
 
 		if (_header.audioInfo[i].hasAudio && i == 0) {
-			_audioStream = Audio::makeQueuedAudioStream(_header.audioInfo[0].sampleRate, _header.audioInfo[0].isStereo);
+			_audioStream = Audio::makeQueuingAudioStream(_header.audioInfo[0].sampleRate, _header.audioInfo[0].isStereo);
 		}
 	}
 
@@ -577,7 +577,7 @@ bool SmackerDecoder::decodeNextFrame() {
 					flags = flags | Audio::Mixer::FLAG_STEREO;
 
 				_audioStream->queueBuffer(soundBuffer, chunkSize, flags);
-				// The sound buffer will be deleted by QueuedAudioStream
+				// The sound buffer will be deleted by QueuingAudioStream
 			}
 
 			if (!_audioStarted) {
@@ -831,7 +831,7 @@ void SmackerDecoder::queueCompressedBuffer(byte *buffer, uint32 bufferSize,
 	if (_header.audioInfo[0].isStereo)
 		flags = flags | Audio::Mixer::FLAG_STEREO;
 	_audioStream->queueBuffer(unpackedBuffer, unpackedSize, flags);
-	// unpackedBuffer will be deleted by QueuedAudioStream
+	// unpackedBuffer will be deleted by QueuingAudioStream
 }
 
 void SmackerDecoder::unpackPalette() {
diff --git a/graphics/video/smk_decoder.h b/graphics/video/smk_decoder.h
index 5bebf3a14f..443d063138 100644
--- a/graphics/video/smk_decoder.h
+++ b/graphics/video/smk_decoder.h
@@ -30,7 +30,7 @@
 #include "sound/mixer.h"
 
 namespace Audio {
-	class QueuedAudioStream;
+	class QueuingAudioStream;
 }
 
 namespace Graphics {
@@ -115,7 +115,7 @@ private:
 	Audio::Mixer::SoundType _soundType;
 	Audio::Mixer *_mixer;
 	bool _audioStarted;
-	Audio::QueuedAudioStream *_audioStream;
+	Audio::QueuingAudioStream *_audioStream;
 	Audio::SoundHandle _audioHandle;
 
 	BigHuffmanTree *_MMapTree;