[Scummvm-cvs-logs] scummvm master -> b22aeafcc87d0eb8dc3504f88d388aa0540f7de7

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b22aeafcc8 AUDIO: Do not add extrapath to SearchMan in MT-32 emu code.


Commit: b22aeafcc87d0eb8dc3504f88d388aa0540f7de7
    https://github.com/scummvm/scummvm/commit/b22aeafcc87d0eb8dc3504f88d388aa0540f7de7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-03T10:36:04-08:00

Commit Message:
AUDIO: Do not add extrapath to SearchMan in MT-32 emu code.

At the point where the emulator is created extrapath should already been
added to extrapath. If not, the check in checkDevice already failed and thus
adding it would be too late anyway.

It seems this was added in 805b21181ab7138da6960ade703b25716120fc29. The
comment about it being a HACK has been removed in bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3
but it's not clear to my why... At any rate, this should not be here.

Changed paths:
    audio/softsynth/mt32.cpp



diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index 29f5e35..2a90b58 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -460,9 +460,6 @@ bool MT32EmuMusicPlugin::checkDevice(MidiDriver::DeviceHandle) const {
 }
 
 Common::Error MT32EmuMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
-	if (ConfMan.hasKey("extrapath"))
-		SearchMan.addDirectory("extrapath", ConfMan.get("extrapath"));
-
 	*mididriver = new MidiDriver_MT32(g_system->getMixer());
 
 	return Common::kNoError;