From a19a79227c8d7c6bc1ad0606c31657602ca23a85 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Tue, 18 May 2004 19:32:05 +0000 Subject: streaming fixes and such, now it seems to work good, what an annoying bug to find git-svn-id: https://svn.musicpd.org/mpd/trunk@1066 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/decode.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/decode.c') diff --git a/src/decode.c b/src/decode.c index 49babb31f..3ab15d00b 100644 --- a/src/decode.c +++ b/src/decode.c @@ -234,13 +234,13 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) { switch(pc->decodeType) { case DECODE_TYPE_URL: #ifdef HAVE_MAD - if(pc->fileSuffix == DECODE_SUFFIX_MP3 || (inStream.mime && - 0 == strcmp(inStream.mime, "audio/mpeg"))) + /*if(pc->fileSuffix == DECODE_SUFFIX_MP3 || (inStream.mime && + 0 == strcmp(inStream.mime, "audio/mpeg")))*/ { ret = mp3_decode(cb,dc,&inStream); break; } - else ret = DECODE_ERROR_UNKTYPE; + /*else ret = DECODE_ERROR_UNKTYPE;*/ #endif case DECODE_TYPE_FILE: #ifdef HAVE_MAD @@ -374,6 +374,9 @@ void decode() { int fadePosition; int nextChunk = -1; int test; + char silence[CHUNK_SIZE]; + + memset(silence,0,CHUNK_SIZE); if(waitOnDecode(pc,dc,cb)<0) return; @@ -533,7 +536,11 @@ void decode() { quit = 1; break; } - else my_usleep(1000); + else { + if(playAudio(silence, CHUNK_SIZE) < 0) { + quit = 1; + } + } } pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ -- cgit v1.2.3