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

if no audioOutput specified, we no attempt to detect if there exists a usable oss or alsa device

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3057 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2005-03-12 03:10:09 +00:00
parent 1865193575
commit 8583a3bc4e
9 changed files with 148 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/audioOutputs/audioOutput_oss.c
View File

@@ -291,10 +291,38 @@ static int oss_statDevice(char * device, int * stErrno) {
return 0;
}
static int oss_testDefault() {
int fd;
fd = open("/dev/sound/dsp", O_WRONLY);
if(fd) {
close(fd);
return 0;
}
WARNING("Error opening OSS device \"/dev/sound/dsp\": %s\n",
strerror(errno));
fd = open("/dev/dsp", O_WRONLY);
if(fd) {
close(fd);
return 0;
}
WARNING("Error opening OSS device \"/dev/dsp\": %s\n",
strerror(errno));
return -1;
}
static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
BlockParam * bp = getBlockParam(param, "device");
BlockParam * bp = NULL;
if(param) bp = getBlockParam(param, "device");
OssData * od = newOssData();
audioOutput->data = od;
if(!bp) {
@@ -307,8 +335,14 @@ static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
if(ret[0] == 0) od->device = strdup("/dev/sound/dsp");
else if(ret[1] == 0) od->device = strdup("/dev/dsp");
else {
ERROR("Error trying to open default OSS device "
"specified at line %i\n", param->line);
if(param) {
ERROR("Error trying to open default OSS device "
"specified at line %i\n", param->line);
}
else {
ERROR("Error trying to open default OSS "
"device\n");
}
if(ret[0] == ret[1] == OSS_STAT_DOESN_T_EXIST) {
ERROR("Neither /dev/dsp nor /dev/sound/dsp "
@@ -501,6 +535,7 @@ static int oss_playAudio(AudioOutput * audioOutput, char * playChunk,
AudioOutputPlugin ossPlugin =
{
"oss",
oss_testDefault,
oss_initDriver,
oss_finishDriver,
oss_openDevice,
@@ -521,6 +556,7 @@ AudioOutputPlugin ossPlugin =
NULL,
NULL,
NULL,
NULL,
NULL /* sendMetadataFunc */
};