From 67b311713d8f4cfcd460a9649e0075f24278a048 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 27 Dec 2004 00:27:00 +0000
Subject: Added 'sound types' to the mixer - for now, only plain (for the
 premixer), SFX and music; volume is now controlled based on the sound type

svn-id: r16330
---
 queen/sound.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'queen/sound.cpp')

diff --git a/queen/sound.cpp b/queen/sound.cpp
index d551564bbd..d98b64595b 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -201,7 +201,7 @@ void SBSound::sfxPlay(const char *name, bool isSpeech) {
 void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);
-	_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size));
 }
 #endif
 
@@ -209,7 +209,7 @@ void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
 void OGGSound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);		
-	_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size));
 }
 #endif
 
@@ -217,7 +217,7 @@ void OGGSound::sfxPlay(const char *name, bool isSpeech) {
 void FLACSound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);		
-	_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size));
 }
 #endif
 
-- 
cgit v1.2.3