diff options
| author | Johannes Schickel | 2009-05-17 22:12:36 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-05-17 22:12:36 +0000 |
| commit | 6c3ef0f57eea8f4a116c66866b8f3e7ad9c5edcb (patch) | |
| tree | 819e460bd37e81f07cf0a9f1ce052513b6135d9f | |
| parent | 1c86e186806d2ab66da377a642fc36627ba3e5d7 (diff) | |
| download | scummvm-rg350-6c3ef0f57eea8f4a116c66866b8f3e7ad9c5edcb.tar.gz scummvm-rg350-6c3ef0f57eea8f4a116c66866b8f3e7ad9c5edcb.tar.bz2 scummvm-rg350-6c3ef0f57eea8f4a116c66866b8f3e7ad9c5edcb.zip | |
Audio related cleanup.
svn-id: r40659
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 9 | ||||
| -rw-r--r-- | engines/kyra/scene_lok.cpp | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 2661217cc7..2999a387a8 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -103,11 +103,8 @@ Common::Error KyraEngine_v1::init() { _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); if (!_flags.useDigSound) { - // 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*/); + // We prefer AdLib over MIDI, since generally AdLib is better supported + int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB); if (_flags.platform == Common::kPlatformFMTowns) { if (_flags.gameID == GI_KYRA1) @@ -499,7 +496,7 @@ void KyraEngine_v1::readSettings() { _configMusic = 0; if (!ConfMan.getBool("music_mute")) { - if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) + if (_flags.platform == Common::kPlatformFMTowns) _configMusic = ConfMan.getBool("cdaudio") ? 2 : 1; else _configMusic = 1; diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index 8d6309855f..df5d248bbc 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -48,7 +48,7 @@ void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2, // TODO: Check how the original handled sfx still playing _sound->stopAllSoundEffects(); - if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) { + if (_flags.platform == Common::kPlatformFMTowns) { int newSfxFile = -1; if (_currentCharacter->sceneId == 7 && sceneId == 24) newSfxFile = 2; |