Ticket #8476: midi-gain.diff

NEWS

@@ -21 +21 @@
    - Added FluidSynth MIDI driver.
    - Added GUI for the "soundfont" setting. (Currently only used by the
      CoreAudio and FluidSynth MIDI drivers.)
+   - Added "MIDI gain" setting. (Currently only used by the FluidSynth MIDI
+     driver.)
    - The MPEG player could hang if the sound ended prematurely.
    - Improved autoscaling GUI, which takes full advantage of your screen.
    - Fixes for GCC 4.

README

@@ -834 +834 @@
 ---- ----------------------------------------------
 If ScummVM was build with libfluildsynth support it will be able to play MIDI
 music through the FluidSynth driver. You will have to specify a SoundFont to
-use, however.
+use, however. Depending on the SoundFont, you may also have to adjust the MIDI
+gain setting.
 
 NOTE: The processor requirements for FluidSynth can be fairly high in some
 cases. A fast CPU is recommended.

base/gameDetector.cpp

@@ -132 +132 @@
         ConfMan.registerDefault("multi_midi", false);
         ConfMan.registerDefault("native_mt32", false);
         ConfMan.registerDefault("enable_gs", false);
+        ConfMan.registerDefault("midi_gain", 150);
 //      ConfMan.registerDefault("music_driver", ???);
 
         ConfMan.registerDefault("cdrom", 0);

doc/07_02b.tex

@@ -8 +8 @@
 
 If ScummVM was build with libfluildsynth support it will be able to play MIDI
 music through the FluidSynth driver. You will have to specify a SoundFont to
-use, however.
+use, however. Depending on the SoundFont, you may also have to adjust the MIDI
+gain setting.
 
 \textbf{NOTE:} The processor requirements for FluidSynth can be fairly high in
 some cases. A fast CPU is recommended.

gui/options.cpp

@@ -60 +60 @@
         kSfxVolumeChanged               = 'sfvc',
         kSpeechVolumeChanged    = 'vcvc',
         kChooseSoundFontCmd             = 'chsf',
+        kMIDIGainChanged                = 'migc',
         kChooseSaveDirCmd               = 'chos',
         kChooseExtraDirCmd              = 'chex'
 };
@@ -159 +160 @@
 
                 // GS extensions setting
                 _enableGSCheckbox->setState(ConfMan.getBool("enable_gs", _domain));
+
+                char buf[10];
+                int gain = ConfMan.getInt("midi_gain", _domain);
+                sprintf(buf, "%.2f", (double)gain / 100.0);
+                _midiGainSlider->setValue(gain);
+                _midiGainLabel->setLabel(buf);
         }
 
 
@@ -232 +239 @@
                                 ConfMan.set("multi_midi", _multiMidiCheckbox->getState(), _domain);
                                 ConfMan.set("native_mt32", _mt32Checkbox->getState(), _domain);
                                 ConfMan.set("enable_gs", _enableGSCheckbox->getState(), _domain);
+                                ConfMan.set("midi_gain", _midiGainSlider->getValue(), _domain);
                         } else {
                                 ConfMan.removeKey("multi_midi", _domain);
                                 ConfMan.removeKey("native_mt32", _domain);
                                 ConfMan.removeKey("enable_gs", _domain);
+                                ConfMan.removeKey("midi_gain", _domain);
                         }
                 }
 
@@ -247 +256 @@
 }
 
 void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+        char buf[10];
+
         switch (cmd) {
         case kMusicVolumeChanged:
                 _musicVolumeLabel->setValue(_musicVolumeSlider->getValue());
@@ -260 +271 @@
                 _speechVolumeLabel->setValue(_speechVolumeSlider->getValue());
                 _speechVolumeLabel->draw();
                 break;
+        case kMIDIGainChanged:
+                sprintf(buf, "%.2f", (double)_midiGainSlider->getValue() / 100.0);
+                _midiGainLabel->setLabel(buf);
+                _midiGainLabel->draw();
+                break;
         case kOKCmd:
                 setResult(1);
                 close();
@@ -295 +311 @@
         _multiMidiCheckbox->setEnabled(enabled);
         _mt32Checkbox->setEnabled(enabled);
         _enableGSCheckbox->setEnabled(enabled);
+        _midiGainSlider->setEnabled(enabled);
+        _midiGainLabel->setEnabled(enabled);
 }
 
 void OptionsDialog::setVolumeSettingsState(bool enabled) {
@@ -411 +429 @@
         }
 
         // SoundFont
-        _soundFontButton = addButton(boss, x, yoffset, "SoundFont: ", kChooseSoundFontCmd, 0, ws);
+        _soundFontButton = addButton(boss, x, yoffset, "SoundFont:", kChooseSoundFontCmd, 0, ws);
         _soundFont = new StaticTextWidget(boss, x + buttonWidth + 20, yoffset + 3, _w - (x + buttonWidth + 20) - 10, kLineHeight, "None", kTextAlignLeft, ws);
         yoffset += buttonHeight + 2 * spacing;
 
@@ -427 +445 @@
         _enableGSCheckbox = addCheckbox(boss, x, yoffset, "Enable Roland GS Mode", 0, 0, ws);
         yoffset += _enableGSCheckbox->getHeight() + spacing;
 
+        const char *label = "MIDI gain:";
+        int textwidth = g_gui.getStringWidth(label);
+
+        new StaticTextWidget(boss, x, yoffset + 2, textwidth, kLineHeight, label, kTextAlignLeft, ws);
+        _midiGainSlider = addSlider(boss, x + textwidth + 15, yoffset, kMIDIGainChanged, ws);
+        _midiGainLabel = new StaticTextWidget(boss, x + textwidth + 15 + _midiGainSlider->getWidth() + 10, yoffset + 2, 40, kLineHeight, "100%", kTextAlignLeft, ws);
+
+        _midiGainSlider->setMinValue(0);
+        _midiGainSlider->setMaxValue(1000);
+        _midiGainLabel->setFlags(WIDGET_CLEARBG);
+
+        yoffset += _midiGainSlider->getHeight() + 4;
+
         _enableMIDISettings = true;
 
         return yoffset;

gui/options.h

@@ -104 +104 @@
 
         SliderWidget *_speechVolumeSlider;
         StaticTextWidget *_speechVolumeLabel;
+
+        SliderWidget *_midiGainSlider;
+        StaticTextWidget *_midiGainLabel;
 };
 
 

sound/softsynth/fluidsynth.cpp

@@ -114 +114 @@
 
         _settings = new_fluid_settings();
 
-        // The default gain setting is ridiculously low, but we can't set it
-        // too high either or sound will be clipped. This may need tuning...
+        double gain = (double)ConfMan.getInt("midi_gain") / 100.0;
 
-        setNum("synth.gain", 2.1);
+        setNum("synth.gain", gain);
         setNum("synth.sample-rate", _outputRate);
 
         _synth = new_fluid_synth(_settings);