[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.147,1.148
Max Horn
fingolfin at users.sourceforge.net
Thu May 5 09:00:25 CEST 2005
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30031/sword2/driver
Modified Files:
d_sound.cpp
Log Message:
Fixed some doxygen warnings
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- d_sound.cpp 2 May 2005 05:41:01 -0000 1.147
+++ d_sound.cpp 5 May 2005 15:59:24 -0000 1.148
@@ -525,7 +525,7 @@
/**
* Streams music from a cluster file.
* @param musicId the id of the music to stream
- * @param looping true if the music is to loop back to the start
+ * @param loop true if the music is to loop back to the start
* @return RD_OK or an error code
*/
int32 Sound::streamCompMusic(uint32 musicId, bool loop) {
@@ -803,25 +803,25 @@
* @param pan panning
*/
-int32 Sound::setFxIdVolumePan(int32 i, int vol, int pan) {
- if (!_fxQueue[i].resource)
+int32 Sound::setFxIdVolumePan(int32 id, int vol, int pan) {
+ if (!_fxQueue[id].resource)
return RDERR_FXNOTOPEN;
if (vol > 16)
vol = 16;
- _fxQueue[i].volume = (vol * SoundMixer::kMaxChannelVolume) / 16;
+ _fxQueue[id].volume = (vol * SoundMixer::kMaxChannelVolume) / 16;
if (pan != 255) {
if (isReverseStereo())
pan = -pan;
- _fxQueue[i].pan = (pan * 127) / 16;
+ _fxQueue[id].pan = (pan * 127) / 16;
}
- if (!_fxMuted && _vm->_mixer->isSoundHandleActive(_fxQueue[i].handle)) {
- _vm->_mixer->setChannelVolume(_fxQueue[i].handle, _fxQueue[i].volume);
+ if (!_fxMuted && _vm->_mixer->isSoundHandleActive(_fxQueue[id].handle)) {
+ _vm->_mixer->setChannelVolume(_fxQueue[id].handle, _fxQueue[id].volume);
if (pan != -1)
- _vm->_mixer->setChannelBalance(_fxQueue[i].handle, _fxQueue[i].pan);
+ _vm->_mixer->setChannelBalance(_fxQueue[id].handle, _fxQueue[id].pan);
}
return RD_OK;
More information about the Scummvm-git-logs
mailing list