[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.h,1.45,1.46 script_v8.cpp,2.278,2.279 scumm.cpp,1.290,1.291

[Max Horn]

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

Modified Files:
	saveload.h script_v8.cpp scumm.cpp 
Log Message:
Add 'speech' sound type to mixer; make use of that in iMuse Digital

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- saveload.h	7 Oct 2004 21:23:29 -0000	1.45
+++ saveload.h	27 Dec 2004 01:32:39 -0000	1.46
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 42
+#define CURRENT_VER 43
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.278
retrieving revision 2.279
diff -u -d -r2.278 -r2.279
--- script_v8.cpp	19 Oct 2004 12:30:41 -0000	2.278
+++ script_v8.cpp	27 Dec 2004 01:32:39 -0000	2.279
@@ -1383,13 +1383,13 @@
 		}
 		break;
 	case 0xDD:		// getGroupSfxVol
-		push(_imuseDigital->getGroupSfxVolume());
+		push(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType) / 2);
 		break;
 	case 0xDE:		// getGroupVoiceVol
-		push(_imuseDigital->getGroupVoiceVolume());
+		push(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType) / 2);
 		break;
 	case 0xDF:		// getGroupMusicVol
-		push(_imuseDigital->getGroupMusicVolume());
+		push(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType) / 2);
 		break;
 	case 0xE0:		// readRegistryValue
 		{

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- scumm.cpp	27 Dec 2004 00:26:56 -0000	1.290
+++ scumm.cpp	27 Dec 2004 01:32:39 -0000	1.291
@@ -1390,13 +1390,7 @@
 
 	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, soundVolumeSfx);
 	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, soundVolumeMusic);
-
-	if (_imuseDigital) {
-		_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, 255);
-		_imuseDigital->setGroupMusicVolume(soundVolumeMusic / 2);
-		_imuseDigital->setGroupSfxVolume(soundVolumeSfx / 2);
-		_imuseDigital->setGroupVoiceVolume(soundVolumeSpeech / 2);
-	}
+	_mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, soundVolumeSpeech);
 }