[Scummvm-cvs-logs] SF.net SVN: scummvm: [29998] scummvm/trunk/engines/kyra/kyra.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Dec 26 02:17:58 CET 2007
Revision: 29998
http://scummvm.svn.sourceforge.net/scummvm/?rev=29998&view=rev
Author: lordhoto
Date: 2007-12-25 17:17:58 -0800 (Tue, 25 Dec 2007)
Log Message:
-----------
Update comment.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2007-12-26 01:09:46 UTC (rev 29997)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2007-12-26 01:17:58 UTC (rev 29998)
@@ -89,7 +89,10 @@
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
- // for now we prefer Adlib over native MIDI
+ // We prefer AdLib over native MIDI, since our AdLib playback code is much
+ // more mature than our MIDI player. For example we are missing MT-32 support
+ // and it seems our MIDI playback code has threading issues (see bug #1506583
+ // "KYRA1: Crash on exceeded polyphony" for more information).
int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
@@ -119,8 +122,7 @@
// Unlike some SCUMM games, it's not that the MIDI sounds are
// missing. It's just that at least at the time of writing they
// are decidedly inferior to the Adlib ones.
-
- if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) {
+ if (ConfMan.getBool("multi_midi")) {
SoundAdlibPC *adlib = new SoundAdlibPC(this, _mixer);
assert(adlib);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list