mirror of https://github.com/mpv-player/mpv
audio: change default preference order of AO drivers
Now PulseAudio is preferred over ALSA, which in turn is preferred over OSS. This should give best results on all systems. On systems with PulseAudio, we will always use it natively, rather than through the suboptimal ALSA emulation (which the default ALSA output is normally redirected to when PulseAudio is active; ALSA hardware devices will not be, but to use those the user must set AO explicitly in any case, so changing the defaults makes no difference). The fallback from ao_pulse to ao_alsa causes no noticeable delay on systems without PulseAudio. On systems with ALSA, we won't attempt to use OSS anymore. Also, move OpenAL above SDL. OpenAL should generally work better than SDL.
This commit is contained in:
parent
6cecbf38c1
commit
668654098e
|
@ -74,12 +74,15 @@ static const struct ao_driver * const audio_out_drivers[] = {
|
||||||
#ifdef CONFIG_COREAUDIO
|
#ifdef CONFIG_COREAUDIO
|
||||||
&audio_out_coreaudio,
|
&audio_out_coreaudio,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_OSS_AUDIO
|
#ifdef CONFIG_PULSE
|
||||||
&audio_out_oss,
|
&audio_out_pulse,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ALSA
|
#ifdef CONFIG_ALSA
|
||||||
&audio_out_alsa,
|
&audio_out_alsa,
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CONFIG_OSS_AUDIO
|
||||||
|
&audio_out_oss,
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_ALSA5
|
#ifdef CONFIG_ALSA5
|
||||||
&audio_out_alsa5,
|
&audio_out_alsa5,
|
||||||
#endif
|
#endif
|
||||||
|
@ -96,20 +99,17 @@ static const struct ao_driver * const audio_out_drivers[] = {
|
||||||
#ifdef CONFIG_ESD
|
#ifdef CONFIG_ESD
|
||||||
&audio_out_esd,
|
&audio_out_esd,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PULSE
|
|
||||||
&audio_out_pulse,
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_JACK
|
#ifdef CONFIG_JACK
|
||||||
&audio_out_jack,
|
&audio_out_jack,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_NAS
|
#ifdef CONFIG_NAS
|
||||||
&audio_out_nas,
|
&audio_out_nas,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
&audio_out_sdl,
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_OPENAL
|
#ifdef CONFIG_OPENAL
|
||||||
&audio_out_openal,
|
&audio_out_openal,
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_SDL
|
||||||
|
&audio_out_sdl,
|
||||||
#endif
|
#endif
|
||||||
&audio_out_mpegpes,
|
&audio_out_mpegpes,
|
||||||
#ifdef CONFIG_IVTV
|
#ifdef CONFIG_IVTV
|
||||||
|
|
Loading…
Reference in New Issue