summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-01-21 09:28:07 +0200
committerUoti Urpala <uau@mplayer2.org>2012-03-20 14:51:32 +0200
commitec58e5a3848f82681839eaa15d2c6912d92e74ed (patch)
tree82bd6ea3411d9c2c5fcd18b9d4cb3f166db57ee3 /cfg-mplayer.h
parent7a699cea2849b2ef3f0a7a0702b74c33327ef8a9 (diff)
downloadmpv-ec58e5a3848f82681839eaa15d2c6912d92e74ed.tar.bz2
mpv-ec58e5a3848f82681839eaa15d2c6912d92e74ed.tar.xz
options: move mixer.h options to struct
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 2f1ba666bb..6a167ece54 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -728,11 +728,10 @@ const m_option_t mplayer_opts[]={
{"border", &vo_border, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noborder", &vo_border, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"mixer-channel", &mixer_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"nosoftvol", &soft_vol, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"softvol-max", &soft_vol_max, CONF_TYPE_FLOAT, CONF_RANGE, 10, 10000, NULL},
+ OPT_STRING("mixer", mixer_device, 0),
+ OPT_STRING("mixer-channel", mixer_channel, 0),
+ OPT_MAKE_FLAGS("softvol", softvol, 0),
+ OPT_FLOATRANGE("softvol-max", softvol_max, 0, 10, 10000),
{"volstep", &volstep, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
{"volume", &start_volume, CONF_TYPE_FLOAT, CONF_RANGE, -1, 10000, NULL},
OPT_MAKE_FLAGS("gapless-audio", gapless_audio, 0),