Switch most AudioStream factories to use DisposeAfterUse::Flag

svn-id: r47334

22 files changed, 61 insertions, 61 deletions

diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 258f9b670c..5b72b948f8 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -302,10 +302,10 @@ void MoviePlayerDXA::startSound() {
 			size = in.readUint32LE();
 
 			in.seek(offset, SEEK_SET);
-			_bgSoundStream = Audio::makeWAVStream(in.readStream(size), true);
+			_bgSoundStream = Audio::makeWAVStream(in.readStream(size), DisposeAfterUse::YES);
 			in.close();
 		} else {
-			_bgSoundStream = Audio::makeWAVStream(_fileStream->readStream(size), true);
+			_bgSoundStream = Audio::makeWAVStream(_fileStream->readStream(size), DisposeAfterUse::YES);
 		}
 	} else {
 		_bgSoundStream = Audio::SeekableAudioStream::openStreamFile(baseName);
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 77604eca75..4d79f4fed3 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -248,7 +248,7 @@ Audio::AudioStream *WavSound::makeAudioStream(uint sound) {
 		return NULL;
 
 	_file->seek(_offsets[sound], SEEK_SET);
-	return Audio::makeWAVStream(_file, false);
+	return Audio::makeWAVStream(_file, DisposeAfterUse::NO);
 }
 
 void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, byte flags, int vol) {
@@ -302,7 +302,7 @@ Audio::AudioStream *MP3Sound::makeAudioStream(uint sound) {
 
 	Common::MemoryReadStream *tmp = _file->readStream(size);
 	assert(tmp);
-	return Audio::makeMP3Stream(tmp, true);
+	return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 }
 
 void MP3Sound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, byte flags, int vol) {
@@ -333,7 +333,7 @@ Audio::AudioStream *VorbisSound::makeAudioStream(uint sound) {
 
 	Common::MemoryReadStream *tmp = _file->readStream(size);
 	assert(tmp);
-	return Audio::makeVorbisStream(tmp, true);
+	return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 }
 
 void VorbisSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, byte flags, int vol) {
@@ -364,7 +364,7 @@ Audio::AudioStream *FlacSound::makeAudioStream(uint sound) {
 
 	Common::MemoryReadStream *tmp = _file->readStream(size);
 	assert(tmp);
-	return Audio::makeFlacStream(tmp, true);
+	return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
 }
 
 void FlacSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, byte flags, int vol) {
@@ -783,7 +783,7 @@ void Sound::playVoiceData(byte *soundData, uint sound) {
 void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint sound, int pan, int vol, bool loop) {
 	int size = READ_LE_UINT32(soundData + 4);
 	Common::MemoryReadStream *stream = new Common::MemoryReadStream(soundData, size);
-	Audio::RewindableAudioStream *sndStream = Audio::makeWAVStream(stream, true);
+	Audio::RewindableAudioStream *sndStream = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
 
 	convertVolume(vol);
 	convertPan(pan);
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index b97d367206..e75c6e0033 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -97,7 +97,7 @@ Audio::SeekableAudioStream *Sound::getVoiceStream(const char *file) {
 		if (!stream)
 			continue;
 
-		audioStream = _supportedCodecs[i].streamFunc(stream, true);
+		audioStream = _supportedCodecs[i].streamFunc(stream, DisposeAfterUse::YES);
 		break;
 	}
 
@@ -241,12 +241,12 @@ namespace {
 
 // A simple wrapper to create VOC streams the way like creating MP3, OGG/Vorbis and FLAC streams.
 // Possible TODO: Think of making this complete and moving it to sound/voc.cpp ?
-Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse) {
+Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) {
 
 #ifdef STREAM_AUDIO_FROM_DISK
 	Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, disposeAfterUse);
 #else
-	Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, false);
+	Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, DisposeAfterUse::NO);
 
 	if (disposeAfterUse)
 		delete stream;
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index ae0510853a..9cba030a13 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -243,7 +243,7 @@ private:
 		const char *fileext;
 		Audio::SeekableAudioStream *(*streamFunc)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse);
+			DisposeAfterUse::Flag disposeAfterUse);
 	};
 
 	static const SpeechCodecs _supportedCodecs[];
@@ -358,7 +358,7 @@ private:
 		const char *fileext;
 		Audio::SeekableAudioStream *(*streamFunc)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse);
+			DisposeAfterUse::Flag disposeAfterUse);
 	};
 
 	static const AudioCodecs _supportedCodecs[];
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index 84b18ebc33..314d45299a 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -460,7 +460,7 @@ int SoundDigital::playSound(const char *filename, uint8 priority, Audio::Mixer::
 
 	strncpy(use->filename, filename, sizeof(use->filename));
 	use->priority = priority;
-	Audio::SeekableAudioStream *audioStream = _supportedCodecs[usedCodec].streamFunc(stream, true);
+	Audio::SeekableAudioStream *audioStream = _supportedCodecs[usedCodec].streamFunc(stream, DisposeAfterUse::YES);
 	if (!audioStream) {
 		warning("Couldn't create audio stream for file '%s'", filename);
 		return -1;
@@ -522,7 +522,7 @@ void SoundDigital::beginFadeOut(int channel, int ticks) {
 
 namespace {
 
-Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, bool disposeAfterUse) {
+Audio::SeekableAudioStream *makeAUDStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) {
 	return new AUDStream(stream);
 }
 
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 1864cdd006..fd37bbdfee 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -108,7 +108,7 @@ Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume)
 				delete mjmpStream;
 			}
 			
-			audStream = Audio::makeWAVStream(_vm->getRawData(ID_MSND, id), true);
+			audStream = Audio::makeWAVStream(_vm->getRawData(ID_MSND, id), DisposeAfterUse::YES);
 		} else
 			audStream = makeMohawkWaveStream(_vm->getRawData(ID_MSND, id));
 		break;
@@ -448,7 +448,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre
 	} else if (data_chunk.encoding == kCodecMPEG2) {
 #ifdef USE_MAD
 		Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES);
-		return Audio::makeLoopingAudioStream(Audio::makeMP3Stream(dataStream, true), loop ? 0 : 1);
+		return Audio::makeLoopingAudioStream(Audio::makeMP3Stream(dataStream, DisposeAfterUse::YES), loop ? 0 : 1);
 #else
 		warning ("MAD library not included - unable to play MP2 audio");
 #endif
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index b7dd9c66c9..b0bc2cf6b6 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -120,7 +120,7 @@ protected:
 	void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
 		Common::MemoryReadStream *tmp = f->readStream(size);
 		assert(tmp);
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeMP3Stream(tmp, true)));
+		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeMP3Stream(tmp, DisposeAfterUse::YES)));
 	}
 };
 #endif
@@ -133,7 +133,7 @@ protected:
 	void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
 		Common::MemoryReadStream *tmp = f->readStream(size);
 		assert(tmp);
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeVorbisStream(tmp, true)));
+		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeVorbisStream(tmp, DisposeAfterUse::YES)));
 	}
 };
 #endif
@@ -146,7 +146,7 @@ protected:
 	void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
 		Common::MemoryReadStream *tmp = f->readStream(size);
 		assert(tmp);
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFlacStream(tmp, true)));
+		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFlacStream(tmp, DisposeAfterUse::YES)));
 	}
 };
 #endif // #ifdef USE_FLAC
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 34b35305c2..37d211bc72 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -308,7 +308,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 					Audio::LinearDiskStreamAudioBlock audioBlocks[1];
 					audioBlocks[0].pos = 0;
 					audioBlocks[0].len = resData->size / 2;	// 16-bit sound
-					audioStream = Audio::makeLinearDiskStream(musicStream, audioBlocks, 1, 11025, musicFlags, true);
+					audioStream = Audio::makeLinearDiskStream(musicStream, audioBlocks, 1, 11025, musicFlags, DisposeAfterUse::YES);
 				} else {
 					// Read compressed header to determine compression type
 					musicFile->seek((uint32)resData->offset, SEEK_SET);
@@ -316,15 +316,15 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 
 					if (identifier == 0) {		// MP3
 #ifdef USE_MAD
-						audioStream = Audio::makeMP3Stream(musicStream, true);
+						audioStream = Audio::makeMP3Stream(musicStream, DisposeAfterUse::YES);
 #endif
 					} else if (identifier == 1) {	// OGG
 #ifdef USE_VORBIS
-						audioStream = Audio::makeVorbisStream(musicStream, true);
+						audioStream = Audio::makeVorbisStream(musicStream, DisposeAfterUse::YES);
 #endif
 					} else if (identifier == 2) {	// FLAC
 #ifdef USE_FLAC
-						audioStream = Audio::makeFlacStream(musicStream, true);
+						audioStream = Audio::makeFlacStream(musicStream, DisposeAfterUse::YES);
 #endif
 					}
 				}
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index e611cd4bdc..2636567880 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -83,17 +83,17 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int
 		switch (buffer.soundType) {
 #ifdef USE_MAD
 			case kSoundMP3:
-				stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
+				stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
 				break;
 #endif
 #ifdef USE_VORBIS
 			case kSoundOGG:
-				stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
+				stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
 				break;
 #endif
 #ifdef USE_FLAC
 			case kSoundFLAC:
-				stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
+				stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), DisposeAfterUse::YES);
 				break;
 #endif
 			default:
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 4011aa9fa3..54655eb0c7 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -230,7 +230,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 			if (memcmp(audioRes->data, "RIFF", 4) == 0) {
 				// WAVE detected
 				Common::MemoryReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, DisposeAfterUse::NO);
-				audioStream = Audio::makeWAVStream(waveStream, true);
+				audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES);
 			}
 		}
 		if (!audioStream) {
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index d7642d10b7..59554b93a1 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -228,7 +228,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 	if (pSnd->pStreamAud && !_pMixer->isSoundHandleActive(pSnd->hCurrentAud)) {
 		if (pSnd->loop > 1) {
 			pSnd->pLoopStream = new Audio::LoopingAudioStream(pSnd->pStreamAud,
-			                                                  pSnd->loop, false
+			                                                  pSnd->loop, DisposeAfterUse::NO
 			                                                  );
 			_pMixer->playInputStream(pSnd->soundType, &pSnd->hCurrentAud,
 			                         pSnd->pLoopStream, -1, pSnd->volume, 0,
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 7b966943b8..e366a04969 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -704,15 +704,15 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte
 				assert(tmp);
 #ifdef USE_FLAC
 				if (soundMode == 3)
-					soundDesc->compressedStream = Audio::makeFlacStream(tmp, true);
+					soundDesc->compressedStream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
 #endif
 #ifdef USE_VORBIS
 				if (soundMode == 2)
-					soundDesc->compressedStream = Audio::makeVorbisStream(tmp, true);
+					soundDesc->compressedStream = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 #endif
 #ifdef USE_MAD
 				if (soundMode == 1)
-					soundDesc->compressedStream = Audio::makeMP3Stream(tmp, true);
+					soundDesc->compressedStream = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 #endif
 				assert(soundDesc->compressedStream);
 				soundDesc->compressedStream->seek(offsetMs);
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index df7b97a9af..cc84a4db4a 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1110,7 +1110,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
 	strcpy(fname + (i - filename), ".ogg");
 	if (file->open(fname)) {
 		_compressedFileMode = true;
-		_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeVorbisStream(file, true));
+		_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeVorbisStream(file, DisposeAfterUse::YES));
 		return;
 	}
 #endif
@@ -1119,7 +1119,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
 	strcpy(fname + (i - filename), ".mp3");
 	if (file->open(fname)) {
 		_compressedFileMode = true;
-		_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeMP3Stream(file, true));
+		_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeMP3Stream(file, DisposeAfterUse::YES));
 		return;
 	}
 #endif
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 957da9f26a..80887c7cb8 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -632,7 +632,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 			assert(size > 0);
 			tmp = _sfxFile->readStream(size);
 			assert(tmp);
-			input = Audio::makeMP3Stream(tmp, true);
+			input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 	#endif
 			break;
 		case kVorbisMode:
@@ -640,7 +640,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 			assert(size > 0);
 			tmp = _sfxFile->readStream(size);
 			assert(tmp);
-			input = Audio::makeVorbisStream(tmp, true);
+			input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 	#endif
 			break;
 		case kFlacMode:
@@ -648,7 +648,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 			assert(size > 0);
 			tmp = _sfxFile->readStream(size);
 			assert(tmp);
-			input = Audio::makeFlacStream(tmp, true);
+			input = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
 	#endif
 			break;
 		default:
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index de5906713e..9d74e6a3f2 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -62,7 +62,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 	if (!_audioSource) {
 		sprintf(fileName, "%s.flac", fileBase);
 		if (_file.open(fileName)) {
-			_audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, false), loop ? 0 : 1);
+			_audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
 			if (!_audioSource)
 				_file.close();
 		}
@@ -71,7 +71,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 	if (!_audioSource) {
 		sprintf(fileName, "%s.fla", fileBase);
 		if (_file.open(fileName)) {
-			_audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, false), loop ? 0 : 1);
+			_audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
 			if (!_audioSource)
 				_file.close();
 		}
@@ -81,7 +81,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 	if (!_audioSource) {
 		sprintf(fileName, "%s.ogg", fileBase);
 		if (_file.open(fileName)) {
-			_audioSource = Audio::makeLoopingAudioStream(Audio::makeVorbisStream(&_file, false), loop ? 0 : 1);
+			_audioSource = Audio::makeLoopingAudioStream(Audio::makeVorbisStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
 			if (!_audioSource)
 				_file.close();
 		}
@@ -91,7 +91,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 	if (!_audioSource) {
 		sprintf(fileName, "%s.mp3", fileBase);
 		if (_file.open(fileName)) {
-			_audioSource = Audio::makeLoopingAudioStream(Audio::makeMP3Stream(&_file, false), loop ? 0 : 1);
+			_audioSource = Audio::makeLoopingAudioStream(Audio::makeMP3Stream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
 			if (!_audioSource)
 				_file.close();
 		}
@@ -100,7 +100,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
 	if (!_audioSource) {
 		sprintf(fileName, "%s.wav", fileBase);
 		if (_file.open(fileName))
-			_audioSource = Audio::makeLoopingAudioStream(Audio::makeWAVStream(&_file, false), loop ? 0 : 1);
+			_audioSource = Audio::makeLoopingAudioStream(Audio::makeWAVStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
 	}
 
 	if (!_audioSource) {
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 98b87d56ea..b3671791a1 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -371,7 +371,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 			_cowFile.seek(index);
 			Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
 			assert(tmp);
-			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeFlacStream(tmp, true), SOUND_SPEECH_ID, speechVol, speechPan);
+			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeFlacStream(tmp, DisposeAfterUse::YES), SOUND_SPEECH_ID, speechVol, speechPan);
 			// with compressed audio, we can't calculate the wave volume.
 			// so default to talking.
 			for (int cnt = 0; cnt < 480; cnt++)
@@ -384,7 +384,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 			_cowFile.seek(index);
 			Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
 			assert(tmp);
-			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeVorbisStream(tmp, true), SOUND_SPEECH_ID, speechVol, speechPan);
+			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeVorbisStream(tmp, DisposeAfterUse::YES), SOUND_SPEECH_ID, speechVol, speechPan);
 			// with compressed audio, we can't calculate the wave volume.
 			// so default to talking.
 			for (int cnt = 0; cnt < 480; cnt++)
@@ -397,7 +397,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 			_cowFile.seek(index);
 			Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
 			assert(tmp);
-			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeMP3Stream(tmp, true), SOUND_SPEECH_ID, speechVol, speechPan);
+			_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeMP3Stream(tmp, DisposeAfterUse::YES), SOUND_SPEECH_ID, speechVol, speechPan);
 			// with compressed audio, we can't calculate the wave volume.
 			// so default to talking.
 			for (int cnt = 0; cnt < 480; cnt++)
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 67d04c870d..e5936bb958 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -199,17 +199,17 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 #ifdef USE_MAD
 	case kMP3Mode:
 		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
-		return Audio::makeMP3Stream(tmp, true);
+		return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 #endif
 #ifdef USE_VORBIS
 	case kVorbisMode:
 		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
-		return Audio::makeVorbisStream(tmp, true);
+		return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 #endif
 #ifdef USE_FLAC
 	case kFlacMode:
 		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
-		return Audio::makeFlacStream(tmp, true);
+		return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
 #endif
 	default:
 		return NULL;
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index 224bc66a95..2d02a2d3ba 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -336,7 +336,7 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo
 	if (Sword2Engine::isPsx())
 		input = new Audio::VagStream(stream);
 	else
-		input = Audio::makeWAVStream(stream, true);
+		input = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
 
 	assert(input);
 
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 9921d0edfa..8f6dd762ba 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -139,17 +139,17 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
 		switch (_soundMode) {
 		case kMP3Mode:
 			#ifdef USE_MAD
-			sampleStream = Audio::makeMP3Stream(compressedStream, true);
+			sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
 			#endif
 			break;
 		case kVorbisMode:
 			#ifdef USE_VORBIS
-			sampleStream = Audio::makeVorbisStream(compressedStream, true);
+			sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
 			#endif
 			break;
 		case kFlacMode:
 			#ifdef USE_FLAC
-			sampleStream = Audio::makeFlacStream(compressedStream, true);
+			sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
 			#endif
 			break;
 		default:
@@ -289,21 +289,21 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
 	switch (_soundMode) {
 	case kMP3Mode:
 		#ifdef USE_MAD
-		sampleStream = Audio::makeMP3Stream(compressedStream, true);
+		sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
 		#endif
 		break;
 	case kVorbisMode:
 		#ifdef USE_VORBIS
-		sampleStream = Audio::makeVorbisStream(compressedStream, true);
+		sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
 		#endif
 		break;
 	case kFlacMode:
 		#ifdef USE_FLAC
-		sampleStream = Audio::makeFlacStream(compressedStream, true);
+		sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
 		#endif
 		break;
 	default:
-		sampleStream = Audio::makeADPCMStream(compressedStream, true, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
+		sampleStream = Audio::makeADPCMStream(compressedStream, DisposeAfterUse::YES, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
 		break;
 	}
 
diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index 55aab42ff4..1a9889c307 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -47,7 +47,7 @@ struct CompressedSpeechFile {
 	const char *filename;
 	Audio::SeekableAudioStream *(*makeStream)(
 			Common::SeekableReadStream *stream,
-			bool disposeAfterUse);
+			DisposeAfterUse::Flag disposeAfterUse);
 };
 
 static const CompressedSpeechFile compressedSpeechFilesTable[] = {
@@ -667,7 +667,7 @@ void ToucheEngine::res_loadSpeechSegment(int num) {
 			_fSpeech[0].seek(offs);
 			Common::MemoryReadStream *tmp = _fSpeech[0].readStream(size);
 			if (tmp)
-				stream = (compressedSpeechFilesTable[_compressedSpeechData].makeStream)(tmp, true);
+				stream = (compressedSpeechFilesTable[_compressedSpeechData].makeStream)(tmp, DisposeAfterUse::YES);
 		}
 		if (stream) {
 			_speechPlaying = true;
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 6c244d070a..e1bca03724 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -43,7 +43,7 @@ enum {
 
 struct CompressedSoundFile {
 	const char *filename;
-	Audio::SeekableAudioStream *(*makeStream)(Common::SeekableReadStream *stream, bool disposeAfterUse);
+	Audio::SeekableAudioStream *(*makeStream)(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse);
 };
 
 static const CompressedSoundFile compressedSoundFilesTable[] = {
@@ -270,7 +270,7 @@ Audio::RewindableAudioStream *CompressedSound::load(CompressedSoundType type, in
 			_fCompressedSound.seek(dirOffset + dirSize * 8 + soundOffset);
 			Common::MemoryReadStream *tmp = _fCompressedSound.readStream(soundSize);
 			if (tmp) {
-				stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, true);
+				stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, DisposeAfterUse::YES);
 			}
 		}
 	}
@@ -946,7 +946,7 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume,
 		snprintf(fileName, sizeof(fileName), fmt, num);
 		Common::File *f = new Common::File;
 		if (f->open(fileName)) {
-			stream = Audio::makeWAVStream(f, true);
+			stream = Audio::makeWAVStream(f, DisposeAfterUse::YES);
 		} else {
 			delete f;
 		}
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 204913addf..cd3423d8c2 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -603,7 +603,7 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim
 			}
 			break;
 		case kAnimationSoundTypeWAV:
-			stream = Audio::makeWAVStream(&f, false);
+			stream = Audio::makeWAVStream(&f, DisposeAfterUse::NO);
 			break;
 		}