From 9d5ad23abdc5e9a67975bfab58fea5b8b3bd0120 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 6 Jun 2001 19:34:23 +0000
Subject: Added alsa 0.5 compilation. Only one driver will be enabled at same
 time, this is temporary.

CVS patchset: 131
CVS date: 2001/06/06 19:34:23
---
 src/audio_out/Makefile.am        |  5 +++--
 src/audio_out/audio_alsa05_out.c | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index e740f0bb9..28b7dfc5d 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,6 +1,6 @@
 CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS)
 
-EXTRA_DIST = audio_alsa_out.c audio_esd_out.c
+EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -30,7 +30,8 @@ lib_LTLIBRARIES = xineplug_ao_out_oss.la $(alsa_module)
 xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c resample.c
 xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c resample.c
+xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c audio_alsa05_out.c \
+	resample.c
 xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS)
 xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module
 
diff --git a/src/audio_out/audio_alsa05_out.c b/src/audio_out/audio_alsa05_out.c
index 28304cbf6..88e2f17b0 100644
--- a/src/audio_out/audio_alsa05_out.c
+++ b/src/audio_out/audio_alsa05_out.c
@@ -24,9 +24,12 @@
  * for the SPDIF AC3 sync part
  * (c) 2000 Andy Lo A Foe <andy@alsaplayer.org>
  *
- * $Id: audio_alsa05_out.c,v 1.1 2001/06/06 16:41:35 joachim_koenig Exp $
+ * $Id: audio_alsa05_out.c,v 1.2 2001/06/06 19:34:23 f1rmb Exp $
  */
 
+/* required for swab() */
+#define _XOPEN_SOURCE 500
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -36,13 +39,12 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
-
+#include <inttypes.h>
+#include <unistd.h>
 #include <sys/asoundlib.h>
-//#include <linux/asound.h>
-//#include <linux/asequencer.h>
-//#include <linux/asoundid.h>
 
-#include <inttypes.h>
+#if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR <= 5)
+
 #include "xine_internal.h"
 #include "monitor.h"
 #include "audio_out.h"
@@ -917,3 +919,5 @@ ao_functions_t *init_audio_out_plugin(config_values_t *config) {
 
   return &audio_alsaout;
 }
+
+#endif
-- 
cgit v1.2.3