[Scummvm-cvs-logs] CVS: scummvm/sword1 credits.cpp,1.9,1.10 sound.cpp,1.42,1.43 sword1.cpp,1.83,1.84
Max Horn
fingolfin at users.sourceforge.net
Wed Mar 9 10:14:50 CET 2005
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.484,1.485 sound.cpp,1.74,1.75
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27444/sword1
Modified Files:
credits.cpp sound.cpp sword1.cpp
Log Message:
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- credits.cpp 10 Jan 2005 22:06:21 -0000 1.9
+++ credits.cpp 9 Mar 2005 18:12:49 -0000 1.10
@@ -113,7 +113,7 @@
// everything's initialized, time to render and show the credits.
PlayingSoundHandle bgSound;
- _mixer->playInputStream(SoundMixer::kMusicAudioDataType, &bgSound, bgSoundStream, 0);
+ _mixer->playInputStream(SoundMixer::kMusicSoundType, &bgSound, bgSoundStream, 0);
int relDelay = 0;
uint16 scrollY = 0;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sound.cpp 9 Jan 2005 15:57:38 -0000 1.42
+++ sound.cpp 9 Mar 2005 18:12:50 -0000 1.43
@@ -195,7 +195,7 @@
#ifdef USE_MAD
else if (_cowMode == CowMp3) {
_cowFile.seek(index);
- _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_speechHandle, makeMP3Stream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playInputStream(SoundMixer::kSFXSoundType, &_speechHandle, makeMP3Stream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
for (int cnt = 0; cnt < 480; cnt++)
@@ -206,7 +206,7 @@
#ifdef USE_VORBIS
else if (_cowMode == CowVorbis) {
_cowFile.seek(index);
- _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playInputStream(SoundMixer::kSFXSoundType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
for (int cnt = 0; cnt < 480; cnt++)
_waveVolume[cnt] = true;
_waveVolPos = 0;
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- sword1.cpp 6 Feb 2005 20:31:20 -0000 1.83
+++ sword1.cpp 9 Mar 2005 18:12:50 -0000 1.84
@@ -166,8 +166,8 @@
_resMan = new ResMan("swordres.rif");
debug(5, "Starting object manager");
_objectMan = new ObjectMan(_resMan);
- _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, SoundMixer::kMaxMixerVolume);
- _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume);
+ _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, SoundMixer::kMaxMixerVolume);
+ _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, SoundMixer::kMaxMixerVolume);
_mouse = new Mouse(_system, _resMan, _objectMan);
_screen = new Screen(_system, _resMan, _objectMan);
_music = new Music(_mixer);
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.484,1.485 sound.cpp,1.74,1.75
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list