fix some blocking stop when trying to stop/seek during filling buffer
git-svn-id: https://svn.musicpd.org/mpd/trunk@1077 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
c180d2f95e
commit
ec3a9b66fe
@ -527,11 +527,11 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
|
||||
while((ret = decodeNextFrameHeader(data))==DECODE_CONT &&
|
||||
!dc->seek && !dc->stop);
|
||||
if(ret==DECODE_SKIP) skip = 1;
|
||||
else if(ret==DECODE_BREAK) break;
|
||||
else if(ret==DECODE_BREAK || dc->stop || dc->seek) break;
|
||||
if(!data->muteFrame) {
|
||||
while((ret = decodeNextFrame(data))==DECODE_CONT &&
|
||||
!dc->seek && !dc->stop);
|
||||
if(ret==DECODE_BREAK) break;
|
||||
if(ret==DECODE_BREAK || dc->seek || dc->stop) break;
|
||||
}
|
||||
if(!skip && ret==DECODE_OK) break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user