diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-05-21 22:31:07 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-05-21 22:31:07 +0000 |
| commit | 547e358796b9d82041b94f18f9ddcb972b8f1e7e (patch) | |
| tree | a9a49eb760ebf7d3f77f2dffac74902996574b95 /src/mp3_decode.c | |
| parent | aea1ae9b9ec6d2e8d00d11ee59047a8e71afe123 (diff) | |
| download | mpd-547e358796b9d82041b94f18f9ddcb972b8f1e7e.tar.gz mpd-547e358796b9d82041b94f18f9ddcb972b8f1e7e.tar.xz mpd-547e358796b9d82041b94f18f9ddcb972b8f1e7e.zip | |
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
Diffstat (limited to 'src/mp3_decode.c')
| -rw-r--r-- | src/mp3_decode.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |