Skip to content
Permalink
Browse files
Added detection of Open Sound System on Solaris x86
  • Loading branch information
Sam Lantinga committed May 23, 2001
1 parent 04d2109 commit 4e2bc45bcb84f486cd4a6b28d43e5111c851e37f
Showing with 14 additions and 52 deletions.
  1. +5 −14 configure.in
  2. +1 −0 docs.html
  3. +4 −5 src/audio/SDL_audio.c
  4. +4 −5 src/audio/SDL_sysaudio.h
  5. +0 −14 src/audio/dma/SDL_dmaaudio.c
  6. +0 −14 src/audio/dsp/SDL_dspaudio.c
@@ -242,21 +242,7 @@ CheckOSS()
AC_MSG_CHECKING(for OSS audio support)
have_oss=no
AC_TRY_COMPILE([
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h>
#endif
#ifdef __OpenBSD__
#include <soundcard.h>
#endif
#ifdef __USLC__
#include <sys/soundcard.h>
#endif
],[
int arg = SNDCTL_DSP_SETFRAGMENT;
],[
@@ -1146,6 +1132,8 @@ case "$target" in
CheckDummyVideo
CheckNASM
CheckOSS
CheckARTSC
CheckESD
CheckNAS
CheckX11
CheckDGA
@@ -1386,6 +1374,7 @@ case "$target" in
CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
CheckDummyVideo
CheckNASM
CheckOSS
CheckARTSC
CheckESD
CheckNAS
@@ -1488,6 +1477,7 @@ case "$target" in
*-*-hpux*)
ARCH=hpux
CheckDummyVideo
CheckOSS
CheckNAS
CheckX11
CheckGGI
@@ -1531,6 +1521,7 @@ case "$target" in
*-*-aix*)
ARCH=aix
CheckDummyVideo
CheckOSS
CheckNAS
CheckX11
CheckGGI
@@ -16,6 +16,7 @@ <H2>
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.1: Added detection of Open Sound System on Solaris x86
<LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!)
<LI> 1.2.1: Fixed endian detection on IA64 architectures (thanks Bill!)
<LI> 1.2.1: Added --disable-dga configure option to disable DGA
@@ -40,18 +40,17 @@ static char rcsid =

/* Available audio drivers */
static AudioBootStrap *bootstrap[] = {
#if defined(unix) && \
!defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
&& !defined(__bsdi__)
&AUDIO_bootstrap,
#endif
#ifdef OSS_SUPPORT
&DSP_bootstrap,
&DMA_bootstrap,
#endif
#ifdef ALSA_SUPPORT
&ALSA_bootstrap,
#endif
#if (defined(unix) && !defined(__CYGWIN32__)) && \
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
&AUDIO_bootstrap,
#endif
#ifdef ARTSC_SUPPORT
&ARTSC_bootstrap,
#endif
@@ -99,18 +99,17 @@ typedef struct AudioBootStrap {
SDL_AudioDevice *(*create)(int devindex);
} AudioBootStrap;

#if defined(unix) && \
!defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
&& !defined(__bsdi__)
extern AudioBootStrap AUDIO_bootstrap;
#endif
#ifdef OSS_SUPPORT
extern AudioBootStrap DSP_bootstrap;
extern AudioBootStrap DMA_bootstrap;
#endif
#ifdef ALSA_SUPPORT
extern AudioBootStrap ALSA_bootstrap;
#endif
#if (defined(unix) && !defined(__CYGWIN32__)) && \
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
extern AudioBootStrap AUDIO_bootstrap;
#endif
#ifdef ARTSC_SUPPORT
extern AudioBootStrap ARTSC_bootstrap;
#endif
@@ -39,21 +39,7 @@ static char rcsid =
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/mman.h>
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h>
#endif
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#endif
#ifdef __OpenBSD__
#include <soundcard.h>
#endif
#ifdef __USLC__
#include <sys/soundcard.h>
#endif

#ifndef MAP_FAILED
#define MAP_FAILED ((Uint8 *)-1)
@@ -37,21 +37,7 @@ static char rcsid =
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h>
#endif
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#endif
#ifdef __OpenBSD__
#include <soundcard.h>
#endif
#ifdef __USLC__
#include <sys/soundcard.h>
#endif

#include "SDL_audio.h"
#include "SDL_error.h"

0 comments on commit 4e2bc45

Please sign in to comment.