From 2db12a1ae7f0dffd4384e71df577a407f2a35f44 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Tue, 10 Aug 2010 16:24:00 +0000
Subject: GUI: fix broken MT-32 tab

svn-id: r51953
---
 gui/options.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/options.cpp')

diff --git a/gui/options.cpp b/gui/options.cpp
index 072b20b393..d1901e9219 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -770,7 +770,7 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
 		_mt32DevicePopUp->setEnabled(false);
 	}
 
-	_enableMIDISettings = true;
+	_enableMT32Settings = true;
 }
 
 // The function has an extra slider range parameter, since both the launcher and SCUMM engine
-- 
cgit v1.2.3


From 4a159bcb1e086d03c7bd1216694552ed5a83103e Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Wed, 11 Aug 2010 18:54:56 +0000
Subject: GUI: add music devices for c64, amiga and apple II gs

These devices are not able to create appropriate drivers.
The only purpose for now is having proper gui options and flags and music types for the device detector.
The corresponding GUIO flags for the new devices have been added, too.

svn-id: r51995
---
 gui/options.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gui/options.cpp')

diff --git a/gui/options.cpp b/gui/options.cpp
index d1901e9219..69e92bf5eb 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -672,7 +672,8 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
 		for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
 			const uint32 deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType());
 
-			if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS) // global dialog - skip useless FM-Towns option there
+			if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS  // global dialog - skip useless FM-Towns, C64, Amiga, AppleIIGS options there
+                && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS)
 			    || (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified
 			    || (_guioptions & deviceGuiOption) // flag is present
 			    // HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set,
-- 
cgit v1.2.3


From ff8b296c299d01dd1e7670e6c6d38e12b4c1f3e6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 11 Aug 2010 19:32:07 +0000
Subject: Use tabs instead of spaces for indentation.

svn-id: r51997
---
 gui/options.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gui/options.cpp')

diff --git a/gui/options.cpp b/gui/options.cpp
index 69e92bf5eb..4969f8ef3f 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -673,15 +673,15 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
 			const uint32 deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType());
 
 			if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS  // global dialog - skip useless FM-Towns, C64, Amiga, AppleIIGS options there
-                && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS)
-			    || (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified
-			    || (_guioptions & deviceGuiOption) // flag is present
-			    // HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set,
-			    // else we would not show for example external devices connected via ALSA, since they are always
-			    // marked as General MIDI device.
-			    || (deviceGuiOption == Common::GUIO_MIDIGM && (_guioptions & Common::GUIO_MIDIMT32))
-			    || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device
-					_midiPopUp->appendEntry(d->getCompleteName(), d->getHandle());
+				 && d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS)
+				|| (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified
+				|| (_guioptions & deviceGuiOption) // flag is present
+				// HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set,
+				// else we would not show for example external devices connected via ALSA, since they are always
+				// marked as General MIDI device.
+				|| (deviceGuiOption == Common::GUIO_MIDIGM && (_guioptions & Common::GUIO_MIDIMT32))
+				|| d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device
+				_midiPopUp->appendEntry(d->getCompleteName(), d->getHandle());
 		}
 	}
 
-- 
cgit v1.2.3