Commit b2c2e1c7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout: avoid duplicate check in replay gain

parent 4a7c50fc
...@@ -154,13 +154,6 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str, ...@@ -154,13 +154,6 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
else else
if (!strcmp (str, "album")) if (!strcmp (str, "album"))
mode = AUDIO_REPLAY_GAIN_ALBUM; mode = AUDIO_REPLAY_GAIN_ALBUM;
/* If the selectrf mode is not available, prefer the other one */
if (mode != AUDIO_REPLAY_GAIN_MAX && !replay_gain->pb_gain[mode])
{
if (replay_gain->pb_gain[!mode])
mode = !mode;
}
} }
/* */ /* */
...@@ -174,6 +167,10 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str, ...@@ -174,6 +167,10 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
{ {
float gain; float gain;
/* If the selectrf mode is not available, prefer the other one */
if (!replay_gain->pb_gain[mode] && replay_gain->pb_gain[!mode])
mode = !mode;
if (replay_gain->pb_gain[mode]) if (replay_gain->pb_gain[mode])
gain = replay_gain->pf_gain[mode] gain = replay_gain->pf_gain[mode]
+ var_InheritFloat (obj, "audio-replay-gain-preamp"); + var_InheritFloat (obj, "audio-replay-gain-preamp");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment