diff options
| author | wm4 <wm4@nowhere> | 2013-09-19 14:32:47 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-20 13:23:25 +0200 |
| commit | b8e42ae13c511855fcba0b6b795d55b37e461665 (patch) | |
| tree | f7090d8218894692ac600da6e7d6e62c382d1731 /mpvcore/mplayer.c | |
| parent | 234d967bed3784657279052e23fdfa751ae1e7fc (diff) | |
| download | mpv-b8e42ae13c511855fcba0b6b795d55b37e461665.tar.bz2 mpv-b8e42ae13c511855fcba0b6b795d55b37e461665.tar.xz | |
mixer: restore volume with playback resume
Note that this is intentionally never done if the AO or softvolume is
different, or if the current volume control method is thought to control
system wide volume (such as ALSA) or otherwise user controllable (such
as PulseAudio). The intention is to keep things robust and to avoid
messing with the user's audio settings as far as possible, while still
providing the ability to resume volume if it makes sense.
Diffstat (limited to 'mpvcore/mplayer.c')
| -rw-r--r-- | mpvcore/mplayer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index fafb88d022..00229364e6 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -809,8 +809,7 @@ static const char *backup_properties[] = { "speed", "edition", "pause", - //"volume", - //"mute", + "volume-restore-data", "audio-delay", //"balance", "fullscreen", |