[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.14,1.15 sound.cpp,1.10,1.11
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:53:17 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.h,1.10,1.11 audiostream.cpp,1.72,1.73 flac.cpp,1.8,1.9 mididrv.h,1.45,1.46 mixer.cpp,1.191,1.192 mixer.h,1.104,1.105 mp3.cpp,1.19,1.20 rate.cpp,1.37,1.38 voc.cpp,1.25,1.26 vorbis.cpp,1.23,1.24 wave.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.77,1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/gob
Modified Files:
gob.cpp sound.cpp
Log Message:
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gob.cpp 10 May 2005 22:55:47 -0000 1.14
+++ gob.cpp 10 May 2005 23:48:36 -0000 1.15
@@ -130,8 +130,8 @@
warning("Sound initialization failed.");
}
- _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
- _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_vm = this;
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp 6 May 2005 15:59:33 -0000 1.10
+++ sound.cpp 10 May 2005 23:48:36 -0000 1.11
@@ -114,7 +114,7 @@
void snd_speakerOn(int16 frequency, int32 length) {
speakerStream.playNote(frequency, length);
if (!_vm->_mixer->isSoundHandleActive(speakerHandle)) {
- _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false);
+ _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.h,1.10,1.11 audiostream.cpp,1.72,1.73 flac.cpp,1.8,1.9 mididrv.h,1.45,1.46 mixer.cpp,1.191,1.192 mixer.h,1.104,1.105 mp3.cpp,1.19,1.20 rate.cpp,1.37,1.38 voc.cpp,1.25,1.26 vorbis.cpp,1.23,1.24 wave.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.77,1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list