From 547e358796b9d82041b94f18f9ddcb972b8f1e7e Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Fri, 21 May 2004 22:31:07 +0000 Subject: do input buffering in while sleeping loop of sending stuff to output buffer git-svn-id: https://svn.musicpd.org/mpd/trunk@1125 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/mp3_decode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mp3_decode.c') diff --git a/src/mp3_decode.c b/src/mp3_decode.c index 716ad70a2..eab53d5ba 100644 --- a/src/mp3_decode.c +++ b/src/mp3_decode.c @@ -494,7 +494,9 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) { if(data->outputPtr==data->outputBufferEnd) { long ret; - ret = sendDataToOutputBuffer(cb,dc, + ret = sendDataToOutputBuffer(cb, + data->inStream, + dc, data->outputBuffer, MP3_DATA_OUTPUT_BUFFER_SIZE, data->elapsedTime, @@ -584,7 +586,7 @@ int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) { while(mp3Read(&data,cb,dc)!=DECODE_BREAK); /* send last little bit if not dc->stop */ if(data.outputPtr!=data.outputBuffer && data.flush) { - if(sendDataToOutputBuffer(cb,dc,data.outputBuffer, + if(sendDataToOutputBuffer(cb,NULL,dc,data.outputBuffer, data.outputPtr-data.outputBuffer, data.elapsedTime,data.bitRate/1000) == 0) { -- cgit v1.2.3