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
---
 saga/music.cpp | 4 ++--
 saga/saga.cpp  | 4 ++--
 saga/sound.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'saga')

diff --git a/saga/music.cpp b/saga/music.cpp
index 338bf09977..0b8596be0f 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -295,7 +295,7 @@ void MusicPlayer::stopMusic() {
 Music::Music(SoundMixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer), _enabled(enabled), _adlib(false) {
 	_player = new MusicPlayer(driver);
 	_musicInitialized = 1;
-	_mixer->setMusicVolume(ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 
 	if (_vm->_gameType == GType_ITE) {
 		File file;
@@ -438,7 +438,7 @@ int Music::play(uint32 music_rn, uint16 flags) {
 
 	if (audioStream) {
 		debug(0, "Playing digitized music");
-		_mixer->playInputStream(&_musicHandle, audioStream, true);
+		_mixer->playInputStream(SoundMixer::kMusicAudioDataType, &_musicHandle, audioStream);
 		return SUCCESS;
 	}
 
diff --git a/saga/saga.cpp b/saga/saga.cpp
index c22e38eb19..3f1c760dd1 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -107,8 +107,8 @@ SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst)
 		warning("Sound initialization failed.");
 	}
 
-	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
-	_mixer->setMusicVolume(ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 
 	_vm = this;
 }
diff --git a/saga/sound.cpp b/saga/sound.cpp
index 8fdf9d1e5e..c82fd5c65e 100644
--- a/saga/sound.cpp
+++ b/saga/sound.cpp
@@ -221,7 +221,7 @@ int Sound::playVoxVoice(SOUNDBUFFER *buf) {
 	AudioStream *audioStream;
 
 	audioStream = makeVOXStream(buf->s_buf, buf->s_buf_len);
-	_mixer->playInputStream(&_voiceHandle, audioStream, false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_voiceHandle, audioStream);
 
 	return SUCCESS;
 }
-- 
cgit v1.2.3