[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.42,1.43 saga.cpp,1.74,1.75 sound.cpp,1.18,1.19

[Max Horn]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17934/saga

Modified Files:
	music.cpp saga.cpp sound.cpp 
Log Message:
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

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- music.cpp	25 Dec 2004 23:43:05 -0000	1.42
+++ music.cpp	27 Dec 2004 00:26:56 -0000	1.43
@@ -295,7 +295,7 @@
 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 @@
 
 	if (audioStream) {
 		debug(0, "Playing digitized music");
-		_mixer->playInputStream(&_musicHandle, audioStream, true);
+		_mixer->playInputStream(SoundMixer::kMusicAudioDataType, &_musicHandle, audioStream);
 		return SUCCESS;
 	}
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- saga.cpp	22 Dec 2004 21:04:50 -0000	1.74
+++ saga.cpp	27 Dec 2004 00:26:56 -0000	1.75
@@ -107,8 +107,8 @@
 		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;
 }

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sound.cpp	22 Dec 2004 19:34:41 -0000	1.18
+++ sound.cpp	27 Dec 2004 00:26:56 -0000	1.19
@@ -221,7 +221,7 @@
 	AudioStream *audioStream;
 
 	audioStream = makeVOXStream(buf->s_buf, buf->s_buf_len);
-	_mixer->playInputStream(&_voiceHandle, audioStream, false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_voiceHandle, audioStream);
 
 	return SUCCESS;
 }