From bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 21 Jun 2010 21:36:36 +0000
Subject: Patch #1956501: "GUI/LAUNCHER: Midi device selection"

svn-id: r50128
---
 base/commandLine.cpp | 2 +-
 base/plugins.cpp     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 1c548d3f50..8b0decf695 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -364,7 +364,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 			END_OPTION
 
 			DO_OPTION('e', "music-driver")
-				if (MidiDriver::findMusicDriver(option) == 0)
+				if (MidiDriver::getMusicType(MidiDriver::getDeviceHandle(option)) == MT_NULL)
 					usage("Unrecognized music driver '%s'", option);
 			END_OPTION
 
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 6c80da65d4..199344087c 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -167,6 +167,7 @@ public:
 		// Music plugins
 		// TODO: Use defines to disable or enable each MIDI driver as a
 		// static/dynamic plugin, like it's done for the engines
+		LINK_PLUGIN(AUTO)
 		LINK_PLUGIN(NULL)
 		#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		LINK_PLUGIN(WINDOWS)
-- 
cgit v1.2.3