diff options
author | wm4 <wm4@nowhere> | 2012-09-18 21:41:22 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-09-23 14:57:01 +0200 |
commit | 425ac31a3b07cbef79891d01a3655b9c6d7efa32 (patch) | |
tree | 840de031a7a68d781fcc5d4df8f70061e12abc29 /mixer.c | |
parent | c57883b71b959d7d5c1c1bade8b4234017c11d1e (diff) | |
download | mpv-425ac31a3b07cbef79891d01a3655b9c6d7efa32.tar.bz2 mpv-425ac31a3b07cbef79891d01a3655b9c6d7efa32.tar.xz |
softvol, ao_pulse: prefer ao_pulse volume control by default
--softvol is enabled by default. For most audio outputs, this is a good
thing, as they have either their own (bad) soft volume implementation,
or control the system mixer. With ao_pulse, the situation is a bit
different: it supports per-application volume (i.e. volume control is
not really global). More importantly, ao_pulse uses a rather large audio
buffer, and changing the volume with mplayer's volume filter has a large
delay. With the native ao_pulse volume control, it's instant, because
PulseAudio's audio filtering happens at a later stage in its processing
pipeline (inaccessible for mplayer).
This means native volume control should really be allowed for ao_pulse,
while it's the reverse for other audio outputs. Make --softvol a choice
option, and add a new "auto" choice. This is default and will use PA's
volume control with ao_pulse, and mplayer's volume filter otherwise
(i.e. the old softvol behavior).
Diffstat (limited to 'mixer.c')
-rw-r--r-- | mixer.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -32,10 +32,15 @@ static void checkvolume(struct mixer *mixer) if (!mixer->ao) return; + if (mixer->softvol == SOFTVOL_AUTO) { + mixer->softvol = mixer->ao->per_application_mixer + ? SOFTVOL_NO : SOFTVOL_YES; + } + ao_control_vol_t vol; if (mixer->softvol || CONTROL_OK != ao_control(mixer->ao, AOCONTROL_GET_VOLUME, &vol)) { - mixer->softvol = true; + mixer->softvol = SOFTVOL_YES; if (!mixer->afilter) return; float db_vals[AF_NCH]; |