[Scummvm-cvs-logs] SF.net SVN: scummvm:[40659] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 40659
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40659&view=rev
Author:   lordhoto
Date:     2009-05-17 22:12:36 +0000 (Sun, 17 May 2009)

Log Message:
-----------
Audio related cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/scene_lok.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-05-17 21:55:24 UTC (rev 40658)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-05-17 22:12:36 UTC (rev 40659)
@@ -103,11 +103,8 @@
 	_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 @@
 	_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;

Modified: scummvm/trunk/engines/kyra/scene_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lok.cpp	2009-05-17 21:55:24 UTC (rev 40658)
+++ scummvm/trunk/engines/kyra/scene_lok.cpp	2009-05-17 22:12:36 UTC (rev 40659)
@@ -48,7 +48,7 @@
 	// 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.