[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.59,1.60
Jamieson Christian
jamieson630 at users.sourceforge.net
Sun Oct 12 07:32:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/sky sky.vcp,1.3,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.29,1.30 debug.cpp,1.14,1.15 logic.cpp,1.19,1.20 router.cpp,1.22,1.23 router.h,1.7,1.8 save_rest.cpp,1.25,1.26 startup.cpp,1.20,1.21 sword2.cpp,1.55,1.56 sword2.h,1.19,1.20 walker.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv20923/scummvm/simon
Modified Files:
midi.cpp
Log Message:
Fix for Bug [821514] SIMON: No Adlib volume for percussion
Transmit volume with each percussion event. (Necessary
because music and SFX tracks may share the percussion
channel.) This is the same approach used in iMuse.
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- midi.cpp 3 Oct 2003 19:42:27 -0000 1.59
+++ midi.cpp 12 Oct 2003 14:31:21 -0000 1.60
@@ -124,8 +124,11 @@
if (!_current->channel[channel])
_current->channel[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel();
- if (_current->channel[channel])
+ if (_current->channel[channel]) {
+ if (channel == 9)
+ _current->channel[9]->volume (_current->volume[9] * _masterVolume / 255);
_current->channel[channel]->send(b);
+ }
}
void MidiPlayer::metaEvent (byte type, byte *data, uint16 length) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/sky sky.vcp,1.3,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.29,1.30 debug.cpp,1.14,1.15 logic.cpp,1.19,1.20 router.cpp,1.22,1.23 router.h,1.7,1.8 save_rest.cpp,1.25,1.26 startup.cpp,1.20,1.21 sword2.cpp,1.55,1.56 sword2.h,1.19,1.20 walker.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list