From ef2468c353358aa89a32d7f596ae4f635e797304 Mon Sep 17 00:00:00 2001
From: Stéphane Loeuillet <gstreamer@leroutier.net>
Date: Mon, 7 Jun 2004 13:40:08 +0000
Subject: configure.ac: OSS portability

Original commit message from CVS:
* configure.ac: OSS portability
* ext/arts/gst_arts.c: idem
* sys/oss/gstosselement.c: idem
* sys/oss/gstossmixer.c: idem
* sys/oss/gstosssink.c: idem
* sys/oss/gstosssrc.c: idem
* sys/oss/oss_probe.c: idem
- check for soundcard.h in different places for some BSD
---
 sys/oss/gstosselement.c | 29 ++++++++++++++++++++++++++++-
 sys/oss/gstossmixer.c   | 13 +++++++++++++
 sys/oss/gstosssink.c    | 15 ++++++++++++++-
 sys/oss/gstosssrc.c     | 15 ++++++++++++++-
 sys/oss/oss_probe.c     | 19 ++++++++++++++++++-
 5 files changed, 87 insertions(+), 4 deletions(-)

(limited to 'sys')

diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 4c3512f1..0e57d47f 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -29,11 +29,24 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <sys/soundcard.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+#include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include <gst/propertyprobe/propertyprobe.h>
 
 #include "gstosselement.h"
@@ -987,7 +1000,21 @@ gst_osselement_change_state (GstElement * element)
 
 
 #if 0
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
 #include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c
index 39b0d7c7..274d1205 100644
--- a/sys/oss/gstossmixer.c
+++ b/sys/oss/gstossmixer.c
@@ -30,7 +30,20 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
 #include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstossmixer.h"
 
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index befb57fd..1f9e6ff9 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -24,11 +24,24 @@
 #include "config.h"
 #endif
 #include <sys/ioctl.h>
-#include <sys/soundcard.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+#include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include "gstosssink.h"
 
 /* elementfactory information */
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 5b44823c..31d9fc1c 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -26,12 +26,25 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/soundcard.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+#include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include <gstosssrc.h>
 #include <gstosselement.h>
 #include <gst/audio/audioclock.h>
diff --git a/sys/oss/oss_probe.c b/sys/oss/oss_probe.c
index 741bb4c7..5b0d1284 100644
--- a/sys/oss/oss_probe.c
+++ b/sys/oss/oss_probe.c
@@ -1,5 +1,8 @@
 
-#include <sys/soundcard.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -7,6 +10,20 @@
 #include <sys/ioctl.h>
 #include <glib.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+#include <sys/soundcard.h>
+#else
+
+#ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#include <soundcard.h>
+#else
+
+#include <machine/soundcard.h>
+
+#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 typedef struct _Probe Probe;
 struct _Probe
 {
-- 
cgit