[MPlayer-dev-eng] [patch] prefer ALSA over OSS

[Adrian Bunk]

On Sat, Apr 28, 2007 at 05:04:37PM +0200, Reimar Döffinger wrote:
>...
> Alsa 0.5 certainly shouldn't be preferred over OSS.

This makes sense (although ALSA 0.5 is so ancient that I doubt it matters).

Updated patch below.

> Greetings,
> Reimar Döffinger

cu
Adrian


<--  snip  -->


In Linux kernel 2.6, ALSA is the default sound system.
It contains an in-kernel OSS emulation, but using ALSA directly is 
better (at least for non-ancient ALSA versions).

MPlayer supports both ALSA and OSS, and this patch changes the order to 
check for ALSA >= 0.9 before checking for OSS.

--- libao2/audio_out.c.old	2007-04-28 17:06:59.000000000 +0200
+++ libao2/audio_out.c	2007-04-28 17:07:36.000000000 +0200
@@ -84,15 +84,15 @@
 #ifdef MACOSX
 	&audio_out_macosx,
 #endif
-#ifdef USE_OSS_AUDIO
-        &audio_out_oss,
-#endif
 #ifdef HAVE_ALSA1X
 	&audio_out_alsa,
 #endif
 #ifdef HAVE_ALSA9
 	&audio_out_alsa,
 #endif
+#ifdef USE_OSS_AUDIO
+        &audio_out_oss,
+#endif
 #ifdef HAVE_ALSA5
 	&audio_out_alsa5,
 #endif