diff options
| author | wm4 <wm4@nowhere> | 2014-02-27 01:07:46 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-02-27 01:07:46 +0100 |
| commit | 14607f27ef01c81e4544d0eaa7ed182001c15305 (patch) | |
| tree | 73c18acabeef92272543af8be450c7bf9738e02a /player | |
| parent | b4fb71634cf746cfd9ba19c1260dbc0aee38700e (diff) | |
| download | mpv-14607f27ef01c81e4544d0eaa7ed182001c15305.tar.bz2 mpv-14607f27ef01c81e4544d0eaa7ed182001c15305.tar.xz | |
command: use the step size for "add volume" commands
The step argument for "add volume <step>" was ignored until now. Fix it.
There is one problem: by defualt, "add volume" should use the value set
with --volstep. This value is 3 by default. Since the default volue for
the step argument is always 1 (and we don't really want to make the
generic code more complicated by introducing custom step sizes), we
simply multiply the step argument with --volstep to keep it compatible.
The --volstep option should probably be just removed in the future.
Diffstat (limited to 'player')
| -rw-r--r-- | player/command.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c index 7712a6e550..4997056be4 100644 --- a/player/command.c +++ b/player/command.c @@ -931,10 +931,7 @@ static int mp_property_volume(m_option_t *prop, int action, void *arg, if (!mixer_audio_initialized(mpctx->mixer)) return M_PROPERTY_ERROR; struct m_property_switch_arg *sarg = arg; - if (sarg->inc <= 0) - mixer_decvolume(mpctx->mixer); - else - mixer_incvolume(mpctx->mixer); + mixer_addvolume(mpctx->mixer, mpctx->opts->volstep * sarg->inc); return M_PROPERTY_OK; } } |