oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

don't open device in initDriver! instead we just stat() for the device

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3007 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2005-03-05 03:36:24 +00:00
parent 349539740b
commit 82ff4c321c
1 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/audioOutputs/audioOutput_oss.c
View File

@@ -65,6 +65,37 @@ static void freeOssData(OssData * od) {
free(od); free(od);
} }
#define OSS_STAT_NO_ERROR 0
#define OSS_STAT_NOT_CHAR_DEV -1
#define OSS_STAT_NO_PERMS -2
#define OSS_STAT_DOESN_T_EXIST -3
#define OSS_STAT_OTHER -4
static int oss_statDevice(char * device, int * stErrno) {
struct stat st;
if(0 == lstat(device, &st)) {
if(!S_ISCHR(st.st_mode)) {
return OSS_STAT_NOT_CHAR_DEV;
}
}
else {
*stErrno = errno;
switch(errno) {
case ENOENT:
case ENOTDIR:
return OSS_STAT_DOESN_T_EXIST;
case EACCES:
return OSS_STAT_NO_PERMS;
default:
return OSS_STAT_OTHER;
}
}
return 0;
}
static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) { static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
BlockParam * bp = getBlockParam(param, "device"); BlockParam * bp = getBlockParam(param, "device");
OssData * od = newOssData(); OssData * od = newOssData();
@@ -72,30 +103,47 @@ static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
audioOutput->data = od; audioOutput->data = od;
if(!bp) { if(!bp) {
int fd; int err[2];
int ret[2];
if(0 <= (fd = open("/dev/sound/dsp", O_WRONLY))) { ret[0] = oss_statDevice("/dev/sound/dsp", err);
od->device = strdup("/dev/sound/dsp"); ret[1] = oss_statDevice("/dev/dsp", err+1);
close(fd);
} if(ret[0] == 0) od->device = strdup("/dev/sound/dsp");
else if(0 <= (fd = open("/dev/dsp", O_WRONLY))) { else if(ret[1] == 0) od->device = strdup("/dev/dsp");
od->device = strdup("/dev/dsp");
close(fd);
}
else { else {
ERROR("Error trying to open default OSS device " ERROR("Error trying to open default OSS device "
"specified at line %i\n", param->line); "specified at line %i\n", param->line);
ERROR("Specify a OSS device and/or check your "
"permissions\n"); if(ret[0] == ret[1] == OSS_STAT_DOESN_T_EXIST) {
ERROR("Neither /dev/dsp nor /dev/sound/dsp "
"were found\n");
}
else if(ret[0] == OSS_STAT_NOT_CHAR_DEV) {
ERROR("/dev/sound/dsp is not a char device");
}
else if(ret[1] == OSS_STAT_NOT_CHAR_DEV) {
ERROR("/dev/dsp is not a char device");
}
else if(ret[0] == OSS_STAT_NO_PERMS) {
ERROR("no permission to access /dev/sound/dsp");
}
else if(ret[1] == OSS_STAT_NO_PERMS) {
ERROR("no permission to access /dev/dsp");
}
else if(ret[0] == OSS_STAT_OTHER) {
ERROR("Error accessing /dev/sound/dsp: %s",
strerror(err[0]));
}
else if(ret[1] == OSS_STAT_OTHER) {
ERROR("Error accessing /dev/dsp: %s",
strerror(err[1]));
}
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
od->fd = -1;
return 0;
} }
else od->device = strdup(bp->value);
od->device = strdup(bp->value);
return 0; return 0;
} }
@@ -116,17 +164,18 @@ static int oss_openDevice(AudioOutput * audioOutput)
int i = AFMT_S16_LE; int i = AFMT_S16_LE;
#endif #endif
if((od->fd = open(od->device, O_WRONLY)) < 0) if((od->fd = open(od->device, O_WRONLY)) < 0) goto fail;
goto fail;
if(ioctl(od->fd, SNDCTL_DSP_SETFMT, &i)) if(ioctl(od->fd, SNDCTL_DSP_SETFMT, &i)) goto fail;
goto fail;
if(ioctl(od->fd, SNDCTL_DSP_CHANNELS, &audioFormat->channels)) i = audioFormat->channels;
goto fail; if(ioctl(od->fd, SNDCTL_DSP_CHANNELS, &i)) goto fail;
if(ioctl(od->fd, SNDCTL_DSP_SPEED, &audioFormat->sampleRate))
goto fail; i = audioFormat->sampleRate;
if(ioctl(od->fd, SNDCTL_DSP_SAMPLESIZE, &audioFormat->bits)) if(ioctl(od->fd, SNDCTL_DSP_SPEED, &i)) goto fail;
goto fail;
/*i = 1; if (ioctl(od->fd,SNDCTL_DSP_STEREO,&i)) err != 32; */ i = audioFormat->bits;
if(ioctl(od->fd, SNDCTL_DSP_SAMPLESIZE, &i)) goto fail;
audioOutput->open = 1; audioOutput->open = 1;