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

cleanup audio code some

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@108 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-02-27 23:05:56 +00:00
parent 8b19235b61
commit 5622edbc98
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/audio.c
View File

@ -131,11 +131,12 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
int initAudio(AudioFormat * audioFormat) { int initAudio(AudioFormat * audioFormat) {
ao_sample_format format; ao_sample_format format;
if(!isCurrentAudioFormat(audioFormat)) {
finishAudio();
}
if(!audio_device) { if(!audio_device) {
if(!isCurrentAudioFormat(audioFormat)) {
finishAudio();
return 0;
}
format.bits = audioFormat->bits; format.bits = audioFormat->bits;
format.rate = audioFormat->sampleRate; format.rate = audioFormat->sampleRate;
format.byte_format = AO_FMT_NATIVE; format.byte_format = AO_FMT_NATIVE;
@ -145,16 +146,11 @@ int initAudio(AudioFormat * audioFormat) {
audio_format.channels = format.channels; audio_format.channels = format.channels;
blockSignals(); blockSignals();
audio_device = ao_open_live(audio_ao_driver_id, &format, audio_device = ao_open_live(audio_ao_driver_id, &format,
audio_ao_options); audio_ao_options);
if(audio_device==NULL) {
unblockSignals();
audioError();
return -1;
}
unblockSignals(); unblockSignals();
if(audio_device==NULL) return -1;
} }
return 0; return 0;
@ -163,13 +159,18 @@ int initAudio(AudioFormat * audioFormat) {
void playAudio(char * playChunk, int size) { void playAudio(char * playChunk, int size) {
int send; int send;
assert(audio_device!=NULL);
if(audio_device==NULL) return 0;
while(size>0) { while(size>0) {
send = audio_write_size>size?size:audio_write_size; send = audio_write_size>size?size:audio_write_size;
ao_play(audio_device,playChunk,send); if(!ao_play(audio_device,playChunk,send)) {
audioError();
ERROR("closing audio device due to write error\n");
finishAudio();
return;
}
playChunk+=send; playChunk+=send;
size-=send; size-=send;