FluidSynth: Apply music volume when using FluidSynth's own driver

skyjake · Nov 30, 2012 · a668e75 · a668e75
1 parent 94a9634
commit a668e75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/doomsday/plugins/fluidsynth/include/driver_fluidsynth.h b/doomsday/plugins/fluidsynth/include/driver_fluidsynth.h
@@ -46,6 +46,8 @@ fluid_synth_t* DMFluid_Synth();
 fluid_audio_driver_t* DMFluid_Driver();
 audiointerface_sfx_generic_t* DMFluid_Sfx();
 
+#define MAX_SYNTH_GAIN      0.4
+
 #ifdef DENG_DSFLUIDSYNTH_DEBUG
 #  define DSFLUIDSYNTH_TRACE(args)  std::cerr << "[dsFluidSynth] " << args << std::endl;
 #else

diff --git a/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp b/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp
@@ -61,7 +61,7 @@ int DS_Init(void)
 
     // Set up a reasonable configuration.
     fsConfig = new_fluid_settings();
-    fluid_settings_setnum(fsConfig, "synth.gain", 0.4);
+    fluid_settings_setnum(fsConfig, "synth.gain", MAX_SYNTH_GAIN);
 
     // Create the synthesizer.
     fsSynth = new_fluid_synth(fsConfig);

diff --git a/doomsday/plugins/fluidsynth/src/fluidsynth_music.cpp b/doomsday/plugins/fluidsynth/src/fluidsynth_music.cpp
@@ -386,6 +386,10 @@ void DM_Music_Set(int prop, float value)
         {
             DMFluid_Sfx()->Set(sfxBuf, SFXBP_VOLUME, musicVolume);
         }
+        else if(DMFluid_Driver())
+        {
+            fluid_synth_set_gain(DMFluid_Synth(), MAX_SYNTH_GAIN * musicVolume);
+        }
         DSFLUIDSYNTH_TRACE("Music_Set: MUSIP_VOLUME = " << musicVolume);
         break;