summaryrefslogtreecommitdiffstats
path: root/options/options.h
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 /options/options.h
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 'options/options.h')
-rw-r--r--options/options.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/options/options.h b/options/options.h
index 5dcc642222..3e8474fd75 100644
--- a/options/options.h
+++ b/options/options.h
@@ -89,9 +89,8 @@ typedef struct MPOpts {
int ao_null_fallback;
int force_vo;
int softvol;
- float mixer_init_volume;
- int mixer_init_mute;
- char *mixer_restore_volume_data;
+ float softvol_volume;
+ int softvol_mute;
float softvol_max;
int gapless_audio;
double audio_buffer;