summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-04-27 00:21:17 +0200
committerwm4 <wm4@nowhere>2017-04-27 00:21:17 +0200
commitafead7a3566e455cd2ceec54010a95387b7b022f (patch)
tree1dfa2d70ff7c8fd79c7499b44ef7fd75a12f58cc /player
parent90a1ca02a23608d375d319e5c1208db77427818c (diff)
downloadmpv-afead7a3566e455cd2ceec54010a95387b7b022f.tar.bz2
mpv-afead7a3566e455cd2ceec54010a95387b7b022f.tar.xz
audio: merge --replaygain-track and --replaygain-album into one option
This is probably better than separate options. For example, the user does not have to guess which one is applied if both options are enabled.
Diffstat (limited to 'player')
-rw-r--r--player/audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c
index ea013b02e2..0922db804c 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -136,13 +136,13 @@ static float compute_replaygain(struct MPContext *mpctx)
float rgain = 1.0;
struct replaygain_data *rg = ao_c->af->replaygain_data;
- if ((opts->rgain_track || opts->rgain_album) && rg) {
+ if (opts->rgain_mode && rg) {
MP_VERBOSE(mpctx, "Replaygain: Track=%f/%f Album=%f/%f\n",
rg->track_gain, rg->track_peak,
rg->album_gain, rg->album_peak);
float gain, peak;
- if (opts->rgain_track) {
+ if (opts->rgain_mode == 1) {
gain = rg->track_gain;
peak = rg->track_peak;
} else {