diff options
| author | Max Horn | 2009-03-26 13:52:43 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-26 13:52:43 +0000 |
| commit | e5e16152808bfc44681a5ea217685fb474339064 (patch) | |
| tree | 8dd91ea357007552e67222c59d66deac572fc13f /gui | |
| parent | c21110f36ee9618fd94f306eba39fe9208eb887d (diff) | |
| download | scummvm-rg350-e5e16152808bfc44681a5ea217685fb474339064.tar.gz scummvm-rg350-e5e16152808bfc44681a5ea217685fb474339064.tar.bz2 scummvm-rg350-e5e16152808bfc44681a5ea217685fb474339064.zip | |
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
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/options.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
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) { |