summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-26 15:52:29 +0200
committerwm4 <wm4@nowhere>2014-09-26 15:52:29 +0200
commitd778130dc483f4f70f385ce60b690781fe556d75 (patch)
tree213ca045d6ddceff035d30a2a255f43c685cf17d
parent4784ca32c9d0fc79b08958c02dd3e826d5154d30 (diff)
downloadmpv-d778130dc483f4f70f385ce60b690781fe556d75.tar.bz2
mpv-d778130dc483f4f70f385ce60b690781fe556d75.tar.xz
audio/out: disable ao_sndio by default
Don't build it, move it down the autoprobe list even if it's enabled. It doesn't work well enough.
-rw-r--r--audio/out/ao.c6
-rw-r--r--wscript3
2 files changed, 5 insertions, 4 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 9e4dd88b5d..8685260204 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -60,9 +60,6 @@ static const struct ao_driver * const audio_out_drivers[] = {
#if HAVE_PULSE
&audio_out_pulse,
#endif
-#if HAVE_SNDIO
- &audio_out_sndio,
-#endif
#if HAVE_ALSA
&audio_out_alsa,
#endif
@@ -88,6 +85,9 @@ static const struct ao_driver * const audio_out_drivers[] = {
#if HAVE_SDL1 || HAVE_SDL2
&audio_out_sdl,
#endif
+#if HAVE_SNDIO
+ &audio_out_sndio,
+#endif
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,
diff --git a/wscript b/wscript
index 267a092b7d..a72e69a9b5 100644
--- a/wscript
+++ b/wscript
@@ -477,7 +477,8 @@ audio_output_features = [
'name': '--sndio',
'desc': 'sndio audio input/output',
'func': check_statement('sndio.h',
- 'struct sio_par par; sio_initpar(&par); const char *s = SIO_DEVANY', lib='sndio')
+ 'struct sio_par par; sio_initpar(&par); const char *s = SIO_DEVANY', lib='sndio'),
+ 'default': 'disable'
}, {
'name': '--pulse',
'desc': 'PulseAudio audio output',