[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.4,1.5
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Wed Jul 9 10:23:12 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv27226/sky/music
Modified Files:
adlibmusic.cpp
Log Message:
SoundMixer::setMusicVolume() doesn't seem to do anything, so set music volume manually....
Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adlibmusic.cpp 1 Jul 2003 01:27:50 -0000 1.4
+++ adlibmusic.cpp 9 Jul 2003 17:22:45 -0000 1.5
@@ -47,7 +47,8 @@
void SkyAdlibMusic::setVolume(uint8 volume) {
_musicVolume = volume;
- _mixer->setMusicVolume(_musicVolume << 1);
+ for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++)
+ _channels[cnt]->updateVolume(volume | 128);
}
void SkyAdlibMusic::premixerCall(int16 *buf, uint len) {
@@ -98,6 +99,7 @@
for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
uint16 chDataStart = ((channelData[(cnt << 1) | 1] << 8) | channelData[cnt << 1]) + _musicDataLoc;
_channels[cnt] = new SkyAdlibChannel(_musicData, chDataStart);
+ _channels[cnt]->updateVolume(_musicVolume | 128);
}
}
More information about the Scummvm-git-logs
mailing list