X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=flacdec_filter.c;h=4220b5d61db29b866063f1e6d1769589e1e67f23;hb=8633a2877332e7949b8e2d55d5ebc5a47bda7794;hp=363c73bb15d401c25217d88308b03c12df13aa6f;hpb=7dcaf56321189db230e0697f88ce9d9e225ea3ec;p=paraslash.git diff --git a/flacdec_filter.c b/flacdec_filter.c index 363c73bb..4220b5d6 100644 --- a/flacdec_filter.c +++ b/flacdec_filter.c @@ -25,7 +25,7 @@ struct private_flacdec_data { * We can not consume directly what was copied by the read callback * because we might need to feed unconsumend bytes to the decoder again * after the read callback ran out of data and returned ABORT. So we - * track how many bytes are unconsumed so far. + * track how many bytes have been fed to libflac but are unconsumed so far. */ size_t unconsumed; }; @@ -222,6 +222,7 @@ static int flacdec_post_select(__a_unused struct sched *s, struct task *t) struct private_flacdec_data *pfd = fn->private_data; struct btr_node *btrn = fn->btrn; int ret; + FLAC__StreamDecoderState state; if (output_queue_full(btrn)) return 0; @@ -240,7 +241,6 @@ static int flacdec_post_select(__a_unused struct sched *s, struct task *t) goto out; } pfd->have_more = false; - FLAC__StreamDecoderState state; FLAC__stream_decoder_process_single(pfd->decoder); state = FLAC__stream_decoder_get_state(pfd->decoder); ret = -E_FLACDEC_EOF; @@ -296,7 +296,6 @@ void flacdec_filter_init(struct filter *f) f->open = flacdec_open; f->close = flacdec_close; f->pre_select = flacdec_pre_select; - f->new_post_select = flacdec_post_select; - f->post_select = NULL; + f->post_select = flacdec_post_select; f->execute = flacdec_execute; }