[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth fluidsynth.cpp,1.6.2.1,1.6.2.2

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sat Jan 14 12:14:03 CET 2006


Update of /cvsroot/scummvm/scummvm/sound/softsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/sound/softsynth

Modified Files:
      Tag: branch-0-8-0
	fluidsynth.cpp 
Log Message:
Backported MIDI gain stuff to make FluidSynth a bit nicer to use.


Index: fluidsynth.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/fluidsynth.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- fluidsynth.cpp	18 Oct 2005 02:11:26 -0000	1.6.2.1
+++ fluidsynth.cpp	14 Jan 2006 20:13:12 -0000	1.6.2.2
@@ -114,10 +114,14 @@
 
 	_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...
+	// The default gain setting is ridiculously low - at least for me. This
+	// cannot be fixed by ScummVM's volume settings because they can only
+	// soften the sound, not amplify it, so instead we add an option to
+	// adjust the gain of FluidSynth itself.
 
-	setNum("synth.gain", 2.1);
+	double gain = (double)ConfMan.getInt("midi_gain") / 100.0;
+
+	setNum("synth.gain", gain);
 	setNum("synth.sample-rate", _outputRate);
 
 	_synth = new_fluid_synth(_settings);





More information about the Scummvm-git-logs mailing list