aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-19 02:31:42 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-19 02:31:42 +0000
commitec3a9b66fe42d0bf029cd1e6073a6d9e94f5e397 (patch)
tree5cbd15b693badfc0578aca8be0897eb5c6637630
parentc180d2f95ee8621b743664f0a3c8003682705801 (diff)
downloadmpd-ec3a9b66fe42d0bf029cd1e6073a6d9e94f5e397.tar.gz
mpd-ec3a9b66fe42d0bf029cd1e6073a6d9e94f5e397.tar.xz
mpd-ec3a9b66fe42d0bf029cd1e6073a6d9e94f5e397.zip
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
Diffstat (limited to '')
-rw-r--r--src/mp3_decode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index b1b072e23..7ff63b536 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -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;
}