summaryrefslogtreecommitdiffstats
path: root/audio/mixer.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-22 18:35:03 +0200
committerwm4 <wm4@nowhere>2015-05-22 18:35:03 +0200
commit68bbab0e42e141896545f1f6e9699bcad2d685f8 (patch)
tree902133bbc58bf9b8ce91c537d5290dc301dcc91d /audio/mixer.h
parenteb296d4fde98966854e239eb1ac0eed0c57f696f (diff)
downloadmpv-68bbab0e42e141896545f1f6e9699bcad2d685f8.tar.bz2
mpv-68bbab0e42e141896545f1f6e9699bcad2d685f8.tar.xz
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.
Diffstat (limited to 'audio/mixer.h')
-rw-r--r--audio/mixer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/mixer.h b/audio/mixer.h
index 5aaf605e08..4e2ff350ff 100644
--- a/audio/mixer.h
+++ b/audio/mixer.h
@@ -44,7 +44,7 @@ void mixer_setmute(struct mixer *mixer, bool mute);
bool mixer_getmute(struct mixer *mixer);
void mixer_getbalance(struct mixer *mixer, float *bal);
void mixer_setbalance(struct mixer *mixer, float bal);
-float mixer_getneutralvolume(struct mixer *mixer);
+float mixer_getmaxvolume(struct mixer *mixer);
char *mixer_get_volume_restore_data(struct mixer *mixer);
#endif /* MPLAYER_MIXER_H */