comparison src/audio/SDL_audiodev.c @ 1138:fcfb783a3ca2

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/
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 08 Sep 2005 07:15:44 +0000
parents 974ba6ae0fa3
children c9b51268668f
comparison
equal deleted inserted replaced
1137:0f9d463bf09c 1138:fcfb783a3ca2
66 audiodev = _PATH_DEV_AUDIO; 66 audiodev = _PATH_DEV_AUDIO;
67 } else { 67 } else {
68 struct stat sb; 68 struct stat sb;
69 69
70 /* Added support for /dev/sound/\* in Linux 2.4 */ 70 /* Added support for /dev/sound/\* in Linux 2.4 */
71 if ( (stat("/dev/sound", &sb) == 0) && 71 if ( ((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode)) &&
72 S_ISDIR(sb.st_mode) ) { 72 ((stat(_PATH_DEV_DSP24, &sb) == 0) && S_ISCHR(sb.st_mode)) ) {
73 audiodev = _PATH_DEV_DSP24; 73 audiodev = _PATH_DEV_DSP24;
74 } else { 74 } else {
75 audiodev = _PATH_DEV_DSP; 75 audiodev = _PATH_DEV_DSP;
76 } 76 }
77 } 77 }