[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.47,1.48 saga.cpp,1.99,1.100 sound.cpp,1.22,1.23
Max Horn
fingolfin at users.sourceforge.net
Wed Mar 9 10:14:25 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.122,1.123 sound.cpp,1.50,1.51
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27444/saga
Modified Files:
music.cpp saga.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: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- music.cpp 17 Jan 2005 14:19:17 -0000 1.47
+++ music.cpp 9 Mar 2005 18:12:40 -0000 1.48
@@ -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->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
+ _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
if (_vm->getGameType() == GType_ITE) {
File file;
@@ -448,7 +448,7 @@
if (audioStream) {
debug(0, "Playing digitized music");
- _mixer->playInputStream(SoundMixer::kMusicAudioDataType, &_musicHandle, audioStream);
+ _mixer->playInputStream(SoundMixer::kMusicSoundType, &_musicHandle, audioStream);
return SUCCESS;
}
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- saga.cpp 7 Mar 2005 11:49:59 -0000 1.99
+++ saga.cpp 9 Mar 2005 18:12:40 -0000 1.100
@@ -138,8 +138,8 @@
warning("Sound initialization failed.");
}
- _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
- _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
+ _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+ _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_vm = this;
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.cpp 11 Jan 2005 21:10:36 -0000 1.22
+++ sound.cpp 9 Mar 2005 18:12:40 -0000 1.23
@@ -221,7 +221,7 @@
AudioStream *audioStream;
audioStream = makeVOXStream(buf->s_buf, buf->s_buf_len);
- _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_voiceHandle, audioStream);
+ _mixer->playInputStream(SoundMixer::kSFXSoundType, &_voiceHandle, audioStream);
return SUCCESS;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.122,1.123 sound.cpp,1.50,1.51
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list