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

minor little changes to audio junk

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2278 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-10-20 16:16:50 +00:00
parent 608ac668db
commit ce5773848c
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/audio.c
View File

@@ -250,6 +250,19 @@ int openAudioDevice(AudioFormat * audioFormat) {
return 0; return 0;
} }
void audioError() {
#ifdef HAVE_AUDIO
if(errno==AO_ENOTLIVE) {
ERROR("not a live ao device\n");
}
else if(errno==AO_EOPENDEVICE) {
ERROR("not able to open audio device\n");
}
else if(errno==AO_EBADOPTION) {
ERROR("bad driver option\n");
}
#endif
}
int playAudio(char * playChunk, int size) { int playAudio(char * playChunk, int size) {
#ifdef HAVE_AUDIO #ifdef HAVE_AUDIO
@@ -293,17 +306,3 @@ void closeAudioDevice() {
} }
#endif #endif
} }
void audioError() {
#ifdef HAVE_AUDIO
if(errno==AO_ENOTLIVE) {
ERROR("not a live ao device\n");
}
else if(errno==AO_EOPENDEVICE) {
ERROR("not able to open audio device\n");
}
else if(errno==AO_EBADOPTION) {
ERROR("bad driver option\n");
}
#endif
}

2
src/audio.h
View File

@@ -51,8 +51,6 @@ void closeAudioDevice();
int isAudioDeviceOpen(); int isAudioDeviceOpen();
void audioError();
int isCurrentAudioFormat(AudioFormat * audioFormat); int isCurrentAudioFormat(AudioFormat * audioFormat);
#endif #endif

14
src/audioOutput_ao.c
View File

@@ -44,6 +44,18 @@ static AoData * newAoData() {
return ret; return ret;
} }
static void audioOutputAo_error() {
if(errno==AO_ENOTLIVE) {
ERROR("not a live ao device\n");
}
else if(errno==AO_EOPENDEVICE) {
ERROR("not able to open audio device\n");
}
else if(errno==AO_EBADOPTION) {
ERROR("bad driver option\n");
}
}
static void audioOutputAo_initDriver(AudioOutput * audioOutput) { static void audioOutputAo_initDriver(AudioOutput * audioOutput) {
ao_info * ai; ao_info * ai;
char * dup; char * dup;
@@ -183,7 +195,7 @@ static int audioOutputAo_play(AudioOutput * audioOutput, char * playChunk,
send = ad->writeSize > size ? size : ad->writeSize; send = ad->writeSize > size ? size : ad->writeSize;
if(ao_play(ad->device, playChunk, send)==0) { if(ao_play(ad->device, playChunk, send)==0) {
audioError(); audioOutputAo_error();
ERROR("closing audio device due to write error\n"); ERROR("closing audio device due to write error\n");
audioOutputAo_closeDevice(audioOutput); audioOutputAo_closeDevice(audioOutput);
return -1; return -1;