Skip to content
Snippets Groups Projects
Commit 1f1c1563 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Bug fixes to renaming encoders/decoders

parent 798b5d29
No related branches found
No related tags found
No related merge requests found
...@@ -147,6 +147,13 @@ static int do_ioctl(struct labcomm2014_decoder *d, ...@@ -147,6 +147,13 @@ static int do_ioctl(struct labcomm2014_decoder *d,
ioctl_action, args); ioctl_action, args);
} }
static int do_decode_one(struct labcomm2014_decoder *d)
{
struct decoder *id = d->context;
return id->next->decode_one(id->next);
}
static const struct labcomm2014_sample_ref *do_index_to_sample_ref( static const struct labcomm2014_sample_ref *do_index_to_sample_ref(
struct labcomm2014_decoder *d, int index) struct labcomm2014_decoder *d, int index)
{ {
...@@ -201,12 +208,12 @@ struct labcomm2014_decoder *labcomm2014_renaming_decoder_new( ...@@ -201,12 +208,12 @@ struct labcomm2014_decoder *labcomm2014_renaming_decoder_new(
return NULL; return NULL;
} else { } else {
result->decoder.context = result; result->decoder.context = result;
result->decoder.reader = NULL; result->decoder.reader = d->reader;
result->decoder.error = d->error; result->decoder.error = d->error;
result->decoder.memory = d->memory; result->decoder.memory = d->memory;
result->decoder.scheduler = d->scheduler; result->decoder.scheduler = d->scheduler;
result->decoder.free = do_free; result->decoder.free = do_free;
result->decoder.decode_one = d->decode_one; result->decoder.decode_one = do_decode_one;
result->decoder.sample_register = do_sample_register; result->decoder.sample_register = do_sample_register;
result->decoder.ref_register = do_ref_register; result->decoder.ref_register = do_ref_register;
result->decoder.ioctl = do_ioctl; result->decoder.ioctl = do_ioctl;
......
...@@ -263,7 +263,7 @@ struct labcomm2014_encoder *labcomm2014_renaming_encoder_new( ...@@ -263,7 +263,7 @@ struct labcomm2014_encoder *labcomm2014_renaming_encoder_new(
return NULL; return NULL;
} else { } else {
result->encoder.context = result; result->encoder.context = result;
result->encoder.writer = NULL; result->encoder.writer = e->writer;
result->encoder.error = e->error; result->encoder.error = e->error;
result->encoder.memory = e->memory; result->encoder.memory = e->memory;
result->encoder.scheduler = e->scheduler; result->encoder.scheduler = e->scheduler;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment