From e5e16152808bfc44681a5ea217685fb474339064 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 26 Mar 2009 13:52:43 +0000
Subject: MidiDriver cleanup: findMusicDriver now returns a pointer (makes it
 possible to distinguish 'no match found' from other results); updated
 parseMusicDriver accordingly; some methods now return MidiDriverType instead
 of int

svn-id: r39702
---
 gui/options.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'gui')

diff --git a/gui/options.cpp b/gui/options.cpp
index 3e11161aa6..956c0d8cf6 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -177,17 +177,8 @@ void OptionsDialog::open() {
 	// Audio options
 	if (_midiPopUp) {
 		// Music driver
-		const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
-		int i = 0;
-		const int midiDriver =
-			ConfMan.hasKey("music_driver", _domain)
-				? MidiDriver::parseMusicDriver(ConfMan.get("music_driver", _domain))
-				: MD_AUTO;
-		while (md->name && md->id != midiDriver) {
-			i++;
-			md++;
-		}
-		_midiPopUp->setSelected(md->name ? i : 0);
+		MidiDriverType id = MidiDriver::parseMusicDriver(ConfMan.get("music_driver", _domain));
+		_midiPopUp->setSelectedTag(id);
 	}
 
 	if (_outputRatePopUp) {
-- 
cgit v1.2.3