[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.281,2.282 scumm.cpp,1.350,1.351 sound.cpp,1.426,1.427
Max Horn
fingolfin at users.sourceforge.net
Wed Mar 9 10:14:25 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.47,1.48 saga.cpp,1.99,1.100 sound.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.87,1.88 sound.cpp,1.56,1.57 sword2.cpp,1.138,1.139
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27444/scumm
Modified Files:
script_v8.cpp scumm.cpp sound.cpp
Log Message:
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.281
retrieving revision 2.282
diff -u -d -r2.281 -r2.282
--- script_v8.cpp 10 Jan 2005 22:05:47 -0000 2.281
+++ script_v8.cpp 9 Mar 2005 18:12:41 -0000 2.282
@@ -1384,13 +1384,13 @@
}
break;
case 0xDD: // getGroupSfxVol
- push(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType) / 2);
+ push(_mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType) / 2);
break;
case 0xDE: // getGroupVoiceVol
- push(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType) / 2);
+ push(_mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType) / 2);
break;
case 0xDF: // getGroupMusicVol
- push(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType) / 2);
+ push(_mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType) / 2);
break;
case 0xE0: // readRegistryValue
{
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -d -r1.350 -r1.351
--- scumm.cpp 9 Mar 2005 05:04:13 -0000 1.350
+++ scumm.cpp 9 Mar 2005 18:12:41 -0000 1.351
@@ -1595,9 +1595,9 @@
_musicEngine->setMusicVolume(soundVolumeMusic);
}
- _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, soundVolumeSfx);
- _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, soundVolumeMusic);
- _mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, soundVolumeSpeech);
+ _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, soundVolumeSfx);
+ _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, soundVolumeMusic);
+ _mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, soundVolumeSpeech);
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- sound.cpp 9 Mar 2005 13:41:33 -0000 1.426
+++ sound.cpp 9 Mar 2005 18:12:41 -0000 1.427
@@ -772,7 +772,7 @@
//_vm->_imuseDigital->stopSound(kTalkSoundID);
_vm->_imuseDigital->startVoice(kTalkSoundID, input);
} else {
- _vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, input, id);
+ _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, input, id);
}
}
}
@@ -1139,7 +1139,7 @@
}
bool Sound::isSfxFinished() const {
- return !_vm->_mixer->hasActiveChannelOfType(SoundMixer::kSFXAudioDataType);
+ return !_vm->_mixer->hasActiveChannelOfType(SoundMixer::kSFXSoundType);
}
// We use a real timer in an attempt to get better sync with CD tracks. This is
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.47,1.48 saga.cpp,1.99,1.100 sound.cpp,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.87,1.88 sound.cpp,1.56,1.57 sword2.cpp,1.138,1.139
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list