aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-20 04:04:10 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-20 04:04:10 +0000
commit05889aa3e337ac264c185dd60cec5e5071fe0a31 (patch)
tree302805ee762c1f8e9105eaab507442a72ab05d0d
parent52d4200cb1f841932dc097127258c522dd018a13 (diff)
downloadmpd-05889aa3e337ac264c185dd60cec5e5071fe0a31.tar.gz
mpd-05889aa3e337ac264c185dd60cec5e5071fe0a31.tar.xz
mpd-05889aa3e337ac264c185dd60cec5e5071fe0a31.zip
more little mp3 seeking fixes
git-svn-id: https://svn.musicpd.org/mpd/trunk@1107 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/mp3_decode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index c2dd1f8f4..7b40461a9 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -509,7 +509,7 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
}
}
- if(dc->seek) {
+ if(dc->seek && data->inStream->seekable) {
long i = 0;
data->muteFrame = MUTEFRAME_SEEK;
while(i<data->highestFrame && dc->seekWhere >
@@ -525,12 +525,12 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
clearOutputBuffer(cb);
dc->seekChunk = cb->end;
data->currentFrame = i;
- data->muteFrame = 0;
}
+ data->muteFrame = 0;
dc->seek = 0;
}
- else if(!data->inStream->seekable) dc->seek = 0;
}
+ else if(dc->seek && !data->inStream->seekable) dc->seek = 0;
}
while(1) {