aboutsummaryrefslogtreecommitdiffstats
path: root/src/ogg_decode.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-30 13:33:13 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-30 13:33:13 +0000
commitd80093fed6c084e38a4c3808e62649bd723adc5b (patch)
treec44e0ba8d87662d78e8e0ad1b9b90a174aee02fb /src/ogg_decode.c
parentc4396a6be687907583972cb64c42a2923a5bf5c9 (diff)
downloadmpd-d80093fed6c084e38a4c3808e62649bd723adc5b.tar.gz
mpd-d80093fed6c084e38a4c3808e62649bd723adc5b.tar.xz
mpd-d80093fed6c084e38a4c3808e62649bd723adc5b.zip
fixed seek, its now blocking again
git-svn-id: https://svn.musicpd.org/mpd/trunk@1237 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/ogg_decode.c')
-rw-r--r--src/ogg_decode.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ogg_decode.c b/src/ogg_decode.c
index 60f310fba..22ae07727 100644
--- a/src/ogg_decode.c
+++ b/src/ogg_decode.c
@@ -219,8 +219,8 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
if(0 == ov_time_seek_page(&vf,dc->seekWhere)) {
clearOutputBuffer(cb);
chunkpos = 0;
- dc->seekChunk = cb->end;
}
+ else dc->seekError = 1;
dc->seek = 0;
}
ret = ov_read(&vf, chunk+chunkpos,
@@ -251,7 +251,7 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
}
if(!dc->stop && chunkpos > 0) {
- sendDataToOutputBuffer(cb, NULL, dc, 0, chunk, chunkpos,
+ sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable, chunk, chunkpos,
ov_time_tell(&vf), bitRate);
}
@@ -259,7 +259,10 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
flushOutputBuffer(cb);
- if(dc->seek) dc->seek = 0;
+ /*if(dc->seek) {
+ dc->seekError = 1;
+ dc->seek = 0;
+ }*/
if(dc->stop) {
dc->state = DECODE_STATE_STOP;