From eec0fd8eb0dcc633f0049ea453800bab9983e077 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 8 Sep 2005 07:15:44 +0000 Subject: [PATCH] Commercial-OSS-on-Solaris patch... --ryan. Date: Sun, 14 Aug 2005 23:06:40 -0500 From: Shawn Walker 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/ --- src/audio/SDL_audiodev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c index 46c62a733..fd5a07b31 100644 --- a/src/audio/SDL_audiodev.c +++ b/src/audio/SDL_audiodev.c @@ -68,8 +68,8 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) 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;