libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

- fixed valgrind warning

Browse Source 
- reduced midi volume fadeout from 2s to 1s like HoF is doing (Kyra1 should use the same value)

svn-id: r31473
This commit is contained in:
Johannes Schickel 2008-04-10 19:33:06 +00:00
parent 924912b7fb
commit 5f3bfc702c
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
engines/kyra/sound.cpp
View File

@ -155,6 +155,9 @@ SoundMidiPC::SoundMidiPC(KyraEngine *vm, Audio::Mixer *mixer, MidiDriver *driver
_nativeMT32 = _useC55 = false;
_fadeStartTime = 0;
_fadeMusicOut = false;
memset(_channel, 0, sizeof(_channel));
memset(_channelVolume, 50, sizeof(_channelVolume));
_channelVolume[10] = 100;
@ -381,26 +384,28 @@ void SoundMidiPC::onTimer(void *refCon) {
Common::StackLock lock(sound->_mutex);
// this should be set to the fadeToBlack value
static const uint32 musicFadeTime = 2 * 1000;
static const uint32 musicFadeTime = 1 * 1000;
if (sound->_fadeMusicOut && sound->_fadeStartTime + musicFadeTime > sound->_vm->_system->getMillis()) {
byte volume = (byte)((musicFadeTime - (sound->_vm->_system->getMillis() - sound->_fadeStartTime)) * sound->_musicVolume / musicFadeTime);
sound->updateChannelVolume(volume);
} else if (sound->_fadeStartTime) {
sound->_fadeStartTime = 0;
sound->_fadeMusicOut = false;
sound->_isMusicPlaying = false;
if (sound->_fadeMusicOut) {
if (sound->_fadeStartTime + musicFadeTime > sound->_vm->_system->getMillis()) {
byte volume = (byte)((musicFadeTime - (sound->_vm->_system->getMillis() - sound->_fadeStartTime)) * sound->_musicVolume / musicFadeTime);
sound->updateChannelVolume(volume);
} else {
sound->_fadeStartTime = 0;
sound->_fadeMusicOut = false;
sound->_isMusicPlaying = false;
sound->_eventFromMusic = true;
// from sound/midiparser.cpp
for (int i = 0; i < 128; ++i) {
for (int j = 0; j < 16; ++j) {
sound->send(0x80 | j | i << 8);
sound->_eventFromMusic = true;
// from sound/midiparser.cpp
for (int i = 0; i < 128; ++i) {
for (int j = 0; j < 16; ++j) {
sound->send(0x80 | j | i << 8);
}
}
}
for (int i = 0; i < 16; ++i)
sound->send(0x007BB0 | i);
for (int i = 0; i < 16; ++i)
sound->send(0x007BB0 | i);
}
}
if (sound->_isMusicPlaying) {