summaryrefslogtreecommitdiffstats
path: root/player/configfiles.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-07-09 18:31:18 +0200
committerwm4 <wm4@nowhere>2016-07-09 18:31:18 +0200
commit995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9 (patch)
tree0442a9134e89408c2d8a791fefc1559d04d2b76f /player/configfiles.c
parentda9590d3681c8779ac50d7722f8b8ad09a47024a (diff)
downloadmpv-995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9.tar.bz2
mpv-995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9.tar.xz
audio: drop --softvol=no and --softvol=auto
Drop the code for switching the volume options and properties between af_volume and AO volume controls. interface-changes.rst mentions the changes in detail. Do this because this was exceedingly complex and had other problems as well. It was also very hard to test. It's just not worth the trouble. Some leftovers like AOCONTROL_HAS_PER_APP_VOLUME will be removed at a later point. Fixes #3322.
Diffstat (limited to 'player/configfiles.c')
-rw-r--r--player/configfiles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/player/configfiles.c b/player/configfiles.c
index 3c42331de0..7356a9a81b 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -208,7 +208,8 @@ static const char *const backup_properties[] = {
"options/speed",
"options/edition",
"options/pause",
- "volume-restore-data",
+ "volume",
+ "mute",
"options/audio-delay",
//"balance",
"options/fullscreen",