# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1126163744 0
# Node ID fcfb783a3ca24a905ac8ab2508b1b285ca80260d
# Parent  0f9d463bf09c43e94474c341029881818df9d4dd
Commercial-OSS-on-Solaris patch...

--ryan.



Date: Sun, 14 Aug 2005 23:06:40 -0500
From: Shawn Walker <binarycrusader@gmail.com>
To: sdl@libsdl.org
Subject: [SDL] [PATCH] Audio Detection Bug

When using the OSS commercial drivers under Solaris 10, SDL will not
properly initialise OSS audio support (dsp) if /dev/sound exists.
Under Solaris (as far as I understand) /dev/sound is provided as a
means of accessing a BSD style audio device, not the OSS device.

SDL assumes that if /dev/sound exists, then it must be running on a
Linux 2.4 system and should make the dsp device path /dev/sound/dsp.
This is wrong. When using the OSS commercial drivers under Solaris,
the dsp device is always referenced as /dev/dsp normally.

My proposed fix is to stat the dsp device in /dev/sound to make sure
it exists, before assuming /dev/sound/dsp as the audio device:

http://icculus.org/~eviltypeguy/SDL_audiodev.patch

I'm sure there may be a better way to do it, but the above patch is
what worked for me.

--=20
Shawn Walker, Software and Systems Analyst
binarycrusader@gmail.com - http://binarycrusader.blogspot.com/

diff -r 0f9d463bf09c -r fcfb783a3ca2 src/audio/SDL_audiodev.c
--- a/src/audio/SDL_audiodev.c	Thu Sep 08 06:49:20 2005 +0000
+++ b/src/audio/SDL_audiodev.c	Thu Sep 08 07:15:44 2005 +0000
@@ -68,8 +68,8 @@
 			struct stat sb;
 
 			/* Added support for /dev/sound/\* in Linux 2.4 */
-			if ( (stat("/dev/sound", &sb) == 0) &&
-			     S_ISDIR(sb.st_mode) ) {
+			if ( ((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode)) &&
+				 ((stat(_PATH_DEV_DSP24, &sb) == 0) && S_ISCHR(sb.st_mode)) ) {
 				audiodev = _PATH_DEV_DSP24;
 			} else {
 				audiodev = _PATH_DEV_DSP;