aboutsummaryrefslogtreecommitdiffstats
path: root/src/flac_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/flac_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/flac_decode.c')
-rw-r--r--src/flac_decode.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/flac_decode.c b/src/flac_decode.c
index 7c5b5238b..a5af3e132 100644
--- a/src/flac_decode.c
+++ b/src/flac_decode.c
@@ -146,15 +146,15 @@ int flac_decode(OutputBuffer * cb, DecoderControl *dc) {
if(dc->seek) {
FLAC__uint64 sampleToSeek = dc->seekWhere*
dc->audioFormat.sampleRate+0.5;
- clearOutputBuffer(cb);
if(FLAC__seekable_stream_decoder_seek_absolute(flacDec,
sampleToSeek))
{
+ clearOutputBuffer(cb);
data.time = ((float)sampleToSeek)/
dc->audioFormat.sampleRate;
data.position = 0;
}
- dc->seekChunk = cb->end;
+ else dc->seekError = 1;
dc->seek = 0;
}
}
@@ -173,7 +173,10 @@ int flac_decode(OutputBuffer * cb, DecoderControl *dc) {
flushOutputBuffer(data.cb);
}
- if(dc->seek) dc->seek = 0;
+ /*if(dc->seek) {
+ dc->seekError = 1;
+ dc->seek = 0;
+ } */
if(dc->stop) {
dc->state = DECODE_STATE_STOP;