aout: remove unused "equalizer" object variable

[vlc] / src / audio_output / volume.c

diff --git a/src/audio_output/volume.c b/src/audio_output/volume.c
index 7eb977de557cb1a0676cc87e1331abf93686c4f8..78c151756e41a2f65d908e459b71df801c043138 100644 (file)
--- a/src/audio_output/volume.c
+++ b/src/audio_output/volume.c
@@ -135,7 +135,7 @@ int aout_volume_Amplify(aout_volume_t *vol, block_t *block)
         return -1;
 
     float amp = vol->output_factor
-              * vlc_atomic_loadf (&vol->gain_factor);
+              * vlc_atomic_load_float (&vol->gain_factor);
 
     vol->object.amplify(&vol->object, block, amp);
     return 0;
@@ -177,12 +177,12 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
         else
             gain = var_InheritFloat (obj, "audio-replay-gain-default");
 
-        multiplier = pow (10., gain / 20.);
+        multiplier = powf (10.f, gain / 20.f);
 
-        if (replay_gain->pb_peak[mode]
-         && var_InheritBool (obj, "audio-replay-gain-peak-protection")
-         && replay_gain->pf_peak[mode] * multiplier > 1.f)
-            multiplier = 1.f / replay_gain->pf_peak[mode];
+        if (var_InheritBool (obj, "audio-replay-gain-peak-protection"))
+            multiplier = fminf (multiplier, replay_gain->pb_peak[mode]
+                                            ? 1.f / replay_gain->pf_peak[mode]
+                                            : 1.f);
     }
 
     /* Command line / configuration gain */
@@ -197,7 +197,7 @@ static int ReplayGainCallback (vlc_object_t *obj, char const *var,
     aout_volume_t *vol = data;
     float multiplier = aout_ReplayGainSelect(obj, val.psz_string,
                                              &vol->replay_gain);
-    vlc_atomic_storef (&vol->gain_factor, multiplier);
+    vlc_atomic_store_float (&vol->gain_factor, multiplier);
     VLC_UNUSED(var); VLC_UNUSED(oldval);
     return VLC_SUCCESS;
 }