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
---
 engines/saga/music.cpp | 4 ++--
 engines/saga/music.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/saga')

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 8b8f26d5a0..dbe79a3e72 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -47,8 +47,8 @@ MusicDriver::MusicDriver() : _isGM(false) {
 	_masterVolume = 0;
 	_nativeMT32 = ConfMan.getBool("native_mt32");
 
-	_driverType = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
-	_driver = MidiDriver::createMidi(_driverType);
+	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+	_driver = MidiDriver::createMidi(dev);
 	if (isMT32())
 		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
diff --git a/engines/saga/music.h b/engines/saga/music.h
index cb068cd835..5cce3d4c04 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -52,8 +52,8 @@ public:
 	void setVolume(int volume);
 	int getVolume() { return _masterVolume; }
 
-	bool isAdlib() { return _driverType == MD_ADLIB; }
-	bool isMT32() { return _driverType == MD_MT32 || _nativeMT32; }
+	bool isAdlib() { return _driverType == MT_ADLIB; }
+	bool isMT32() { return _driverType == MT_MT32 || _nativeMT32; }
 	void setGM(bool isGM) { _isGM = isGM; }
 
 	//MidiDriver interface implementation
@@ -78,7 +78,7 @@ protected:
 
 	MidiChannel *_channel[16];
 	MidiDriver *_driver;
-	MidiDriverType _driverType;
+	MusicType _driverType;
 	byte _channelVolume[16];
 	bool _isGM;
 	bool _nativeMT32;
-- 
cgit v1.2.3