summaryrefslogtreecommitdiffstats
path: root/options
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 /options
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 'options')
-rw-r--r--options/options.c6
-rw-r--r--options/options.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c
index 42c4828b56..1540dcbbf4 100644
--- a/options/options.c
+++ b/options/options.c
@@ -550,8 +550,10 @@ const m_option_t mp_opts[] = {
({"no", 0},
{"auto", 0},
{"yes", 1})),
- OPT_FLAG("replaygain-track", rgain_track, UPDATE_VOL),
- OPT_FLAG("replaygain-album", rgain_album, UPDATE_VOL),
+ OPT_CHOICE("replaygain", rgain_mode, UPDATE_VOL,
+ ({"no", 0},
+ {"track", 1},
+ {"album", 2})),
OPT_FLOATRANGE("replaygain-preamp", rgain_preamp, UPDATE_VOL, -15, 15),
OPT_FLAG("replaygain-clip", rgain_clip, UPDATE_VOL),
OPT_FLOATRANGE("replaygain-fallback", rgain_fallback, UPDATE_VOL, -200, 60),
diff --git a/options/options.h b/options/options.h
index 0d288be586..bfe7d42bcf 100644
--- a/options/options.h
+++ b/options/options.h
@@ -101,8 +101,7 @@ typedef struct MPOpts {
int force_vo;
int softvol;
float softvol_volume;
- int rgain_track; // Enable/disable track based replaygain
- int rgain_album; // Enable/disable album based replaygain
+ int rgain_mode;
float rgain_preamp; // Set replaygain pre-amplification
int rgain_clip; // Enable/disable clipping prevention
float rgain_fallback;