From 68bbab0e42e141896545f1f6e9699bcad2d685f8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 22 May 2015 18:35:03 +0200 Subject: audio: change range of volume option/property Now --volume takes an absolute volume, meaning it doesn't depend on --softvol-max. 0 is still silence, and 100 now always means unchanged volume. The OSD and the "volume" property are changed accordingly. Also raise the minimum value of --softvol-max. A value below 100 makes no sense and breaks the OSD. --- options/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index b4662605ae..dcd6167c4e 100644 --- a/options/options.c +++ b/options/options.c @@ -379,8 +379,8 @@ const m_option_t mp_opts[] = { ({"no", SOFTVOL_NO}, {"yes", SOFTVOL_YES}, {"auto", SOFTVOL_AUTO})), - OPT_FLOATRANGE("softvol-max", softvol_max, 0, 10, 10000), - OPT_FLOATRANGE("volume", mixer_init_volume, 0, -1, 100), + OPT_FLOATRANGE("softvol-max", softvol_max, 0, 100, 10000), + OPT_FLOATRANGE("volume", mixer_init_volume, 0, -1, 10000), OPT_CHOICE("mute", mixer_init_mute, 0, ({"auto", -1}, {"no", 0}, -- cgit v1.2.3