aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-04 20:50:32 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-04 20:50:32 +0000
commit7be523c015a18ffcfbdd9511e225609729b25a0c (patch)
treed05228745e0110c10838ea228fb17740b12327df
parent4893e94dae7ee3a2c126df6e82f732223becefce (diff)
downloadmpd-7be523c015a18ffcfbdd9511e225609729b25a0c.tar.gz
mpd-7be523c015a18ffcfbdd9511e225609729b25a0c.tar.xz
mpd-7be523c015a18ffcfbdd9511e225609729b25a0c.zip
clean up a bit
git-svn-id: https://svn.musicpd.org/mpd/trunk@195 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/mp3_decode.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index e417e0a04..780c3814c 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -290,17 +290,14 @@ int decodeFirstFrame(mp3DecodeData * data) {
memset(&xing,0,sizeof(struct xing));
xing.flags = 0;
- skip = 0;
while(1) {
- printf("HERE 1\n");
+ skip = 0;
while((ret = decodeNextFrameHeader(data))==DECODE_CONT);
if(ret==DECODE_SKIP) skip = 1;
- if(ret==DECODE_BREAK) return -1;
+ else if(ret==DECODE_BREAK) return -1;
while((ret = decodeNextFrame(data))==DECODE_CONT);
if(ret==DECODE_BREAK) return -1;
- if(ret==DECODE_SKIP) skip = 1;
- else if(skip && ret==DECODE_OK) skip = 0;
- else if(!skip && ret==DECODE_OK) break;
+ if(!skip && ret==DECODE_OK) break;
}
if(parse_xing(&xing,data->stream.anc_ptr,data->stream.anc_bitlen)) {