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/fluidsynth-dialog.cpp | 2 +- gui/options.cpp | 5 +---- gui/options.h | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gui/fluidsynth-dialog.cpp b/gui/fluidsynth-dialog.cpp index eb5bac9645..d97b3d75dd 100644 --- a/gui/fluidsynth-dialog.cpp +++ b/gui/fluidsynth-dialog.cpp @@ -66,7 +66,7 @@ FluidSynthSettingsDialog::FluidSynthSettingsDialog() _tabWidget->addTab(_("Reverb")); - _reverbActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Reverb.EnableTabCheckbox", _("Activate"), 0, kActivateReverbCmd); + _reverbActivate = new CheckboxWidget(_tabWidget, "FluidSynthSettings_Reverb.EnableTabCheckbox", _("Active"), 0, kActivateReverbCmd); _reverbRoomSizeDesc = new StaticTextWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeText", _("Room:")); _reverbRoomSizeSlider = new SliderWidget(_tabWidget, "FluidSynthSettings_Reverb.RoomSizeSlider", 0, kReverbRoomSizeChangedCmd); 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; diff --git a/gui/options.h b/gui/options.h index eb4512677e..081ef4fea5 100644 --- a/gui/options.h +++ b/gui/options.h @@ -135,9 +135,6 @@ private: StaticTextWidget *_midiGainDesc; SliderWidget *_midiGainSlider; StaticTextWidget *_midiGainLabel; -#ifdef USE_FLUIDSYNTH - ButtonWidget *_fluidSynthSettings; -#endif // // MT-32 controls -- cgit v1.2.3