summaryrefslogtreecommitdiffstats
path: root/defaultopts.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-18 21:41:22 +0200
committerwm4 <wm4@nowhere>2012-09-23 14:57:01 +0200
commit425ac31a3b07cbef79891d01a3655b9c6d7efa32 (patch)
tree840de031a7a68d781fcc5d4df8f70061e12abc29 /defaultopts.c
parentc57883b71b959d7d5c1c1bade8b4234017c11d1e (diff)
downloadmpv-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 'defaultopts.c')
-rw-r--r--defaultopts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/defaultopts.c b/defaultopts.c
index 672dbd5f5c..422841ad65 100644
--- a/defaultopts.c
+++ b/defaultopts.c
@@ -3,6 +3,7 @@
#include "config.h"
#include "defaultopts.h"
#include "options.h"
+#include "mixer.h"
void set_default_mplayer_options(struct MPOpts *opts)
{
@@ -10,7 +11,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
.audio_driver_list = NULL,
.video_driver_list = NULL,
.fixed_vo = 1,
- .softvol = 1,
+ .softvol = SOFTVOL_AUTO,
.softvol_max = 200,
.ao_buffersize = -1,
.vo_wintitle = "mplayer - ${filename}",