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

audio cleanups

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@109 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-02-27 23:13:26 +00:00
parent 5622edbc98
commit 821355361c
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/audio.c
View File

@ -131,12 +131,11 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
int initAudio(AudioFormat * audioFormat) { int initAudio(AudioFormat * audioFormat) {
ao_sample_format format; ao_sample_format format;
if(!audio_device) { if(audio_device && !isCurrentAudioFormat(audioFormat)) {
if(!isCurrentAudioFormat(audioFormat)) { finishAudio();
finishAudio(); }
return 0;
}
if(!audio_device) {
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;
@ -157,24 +156,29 @@ int initAudio(AudioFormat * audioFormat) {
} }
void playAudio(char * playChunk, int size) { int playAudio(char * playChunk, int size) {
int send; int send;
if(audio_device==NULL) return 0; if(audio_device==NULL) {
ERROR("trying to play w/ the audio device being open!\n");
return -1;
}
while(size>0) { while(size>0) {
send = audio_write_size>size?size:audio_write_size; send = audio_write_size>size?size:audio_write_size;
if(!ao_play(audio_device,playChunk,send)) { if(ao_play(audio_device,playChunk,send)==0) {
audioError(); audioError();
ERROR("closing audio device due to write error\n"); ERROR("closing audio device due to write error\n");
finishAudio(); finishAudio();
return; return -1;
} }
playChunk+=send; playChunk+=send;
size-=send; size-=send;
} }
return 0;
} }
void finishAudio() { void finishAudio() {

2
src/audio.h
View File

@ -41,7 +41,7 @@ void finishAudioDriver();
int initAudio(AudioFormat * audioFormat); int initAudio(AudioFormat * audioFormat);
void playAudio(char * playChunk,int size); int playAudio(char * playChunk,int size);
void finishAudio(); void finishAudio();

11
src/decode.c
View File

@ -337,7 +337,9 @@ void decode() {
} }
else doCrossFade = -1; else doCrossFade = -1;
} }
if(pause) playAudio(silence,CHUNK_SIZE); if(pause) {
if(playAudio(silence,CHUNK_SIZE)<0) quit = 1;
}
else if((cb->begin!=cb->end || cb->wrap) && else if((cb->begin!=cb->end || cb->wrap) &&
cb->begin!=cb->next) cb->begin!=cb->next)
{ {
@ -399,8 +401,11 @@ void decode() {
cb->chunkSize[cb->begin], cb->chunkSize[cb->begin],
af, af,
pc->softwareVolume); pc->softwareVolume);
playAudio(cb->chunks+cb->begin*CHUNK_SIZE, if(playAudio(cb->chunks+cb->begin*CHUNK_SIZE,
cb->chunkSize[cb->begin]); cb->chunkSize[cb->begin])<0)
{
quit = 1;
}
cb->begin++; cb->begin++;
if(cb->begin>=buffered_chunks) { if(cb->begin>=buffered_chunks) {
cb->begin = 0; cb->begin = 0;