From 3eae0e61e77bd2fe51934465c14bc71d8bec6773 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 2 Jan 2013 13:07:19 +0200
Subject: GUI: Improve the description of the Roland GS mode checkbox

---
 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 4868f1876d..ea3cbff2be 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -877,7 +877,7 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
 		_mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _c("True Roland MT-32 (no GM emulation)", "lowres"), _("Check if you want to use your real hardware Roland-compatible sound device connected to your computer"));
 
 	// GS Extensions setting
-	_enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Enable Roland GS Mode"), _("Turns off General MIDI mapping for games with Roland MT-32 soundtrack"));
+	_enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Roland GS Mode (disable GM mapping)"), _("Turns off General MIDI mapping for games with Roland MT-32 soundtrack"));
 
 	const MusicPlugin::List p = MusicMan.getPlugins();
 	// Make sure the null device is the first one in the list to avoid undesired
-- 
cgit v1.2.3


From 681f81211f25c4c9fc163e0ec4d005f796da547d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 27 Dec 2012 15:08:54 +0100
Subject: FLUIDSYNTH: Add separate dialog for FluidSynth settings

I don't really understand what these parameters do, or what the
sensible values are, so for now the sliders are limited only by
the allowed (or, in one case, "safe") values.
---
 gui/options.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'gui/options.cpp')

diff --git a/gui/options.cpp b/gui/options.cpp
index 4868f1876d..65f26d2ad5 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -75,6 +75,12 @@ enum {
 };
 #endif
 
+#ifdef USE_FLUIDSYNTH
+enum {
+	kFluidSynthSettingsCmd		= 'flst'
+};
+#endif
+
 static const char *savePeriodLabels[] = { _s("Never"), _s("every 5 mins"), _s("every 10 mins"), _s("every 15 mins"), _s("every 30 mins"), 0 };
 static const int savePeriodValues[] = { 0, 5 * 60, 10 * 60, 15 * 60, 30 * 60, -1 };
 static const char *outputRateLabels[] = { _s("<default>"), _s("8 kHz"), _s("11kHz"), _s("22 kHz"), _s("44 kHz"), _s("48 kHz"), 0 };
@@ -119,6 +125,9 @@ void OptionsDialog::init() {
 	_midiGainDesc = 0;
 	_midiGainSlider = 0;
 	_midiGainLabel = 0;
+#ifdef USE_FLUIDSYNTH
+	_fluidSynthSettings = 0;
+#endif
 	_enableMT32Settings = false;
 	_mt32Checkbox = 0;
 	_mt32DevicePopUp = 0;
@@ -863,6 +872,10 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
 	_midiGainSlider->setMaxValue(1000);
 	_midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", "1.00");
 
+#ifdef USE_FLUIDSYNTH
+	_fluidSynthSettings = new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd);
+#endif
+
 	_enableMIDISettings = true;
 }
 
@@ -1231,12 +1244,20 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 #ifdef SMALL_SCREEN_DEVICE
 	_keysDialog = new KeysDialog();
 #endif
+
+#ifdef USE_FLUIDSYNTH
+	_fluidSynthSettingsDialog = new FluidSynthSettingsDialog();
+#endif
 }
 
 GlobalOptionsDialog::~GlobalOptionsDialog() {
 #ifdef SMALL_SCREEN_DEVICE
 	delete _keysDialog;
 #endif
+
+#ifdef USE_FLUIDSYNTH
+	delete _fluidSynthSettingsDialog;
+#endif
 }
 
 void GlobalOptionsDialog::open() {
@@ -1465,6 +1486,11 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
 	case kChooseKeyMappingCmd:
 		_keysDialog->runModal();
 		break;
+#endif
+#ifdef USE_FLUIDSYNTH
+	case kFluidSynthSettingsCmd:
+		_fluidSynthSettingsDialog->runModal();
+		break;
 #endif
 	default:
 		OptionsDialog::handleCommand(sender, cmd, data);
-- 
cgit v1.2.3


From 10724365aa320092fa2f5b98d8f9b0ff6e219a0b Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 27 Dec 2012 22:13:45 +0100
Subject: GUI: Misc FluidSynth-related cleanups.

---
 gui/options.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'gui/options.cpp')

diff --git a/gui/options.cpp b/gui/options.cpp
index 65f26d2ad5..05997142b9 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -125,9 +125,6 @@ void OptionsDialog::init() {
 	_midiGainDesc = 0;
 	_midiGainSlider = 0;
 	_midiGainLabel = 0;
-#ifdef USE_FLUIDSYNTH
-	_fluidSynthSettings = 0;
-#endif
 	_enableMT32Settings = false;
 	_mt32Checkbox = 0;
 	_mt32DevicePopUp = 0;
@@ -873,7 +870,7 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
 	_midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", "1.00");
 
 #ifdef USE_FLUIDSYNTH
-	_fluidSynthSettings = new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd);
+	new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd);
 #endif
 
 	_enableMIDISettings = true;
-- 
cgit v1.2.3