From 0374ddb79d4e20aa73ef91496beb2c0811c34ca7 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 1 Nov 2012 12:00:00 +0100 Subject: audio: untypedef af_data and rename it to mp_audio this is to have something specular to mp_image --- libaf/af_extrastereo.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libaf/af_extrastereo.c') diff --git a/libaf/af_extrastereo.c b/libaf/af_extrastereo.c index 347c257137..c1ae719c31 100644 --- a/libaf/af_extrastereo.c +++ b/libaf/af_extrastereo.c @@ -34,8 +34,8 @@ typedef struct af_extrastereo_s float mul; }af_extrastereo_t; -static af_data_t* play_s16(struct af_instance_s* af, af_data_t* data); -static af_data_t* play_float(struct af_instance_s* af, af_data_t* data); +static struct mp_audio* play_s16(struct af_instance_s* af, struct mp_audio* data); +static struct mp_audio* play_float(struct af_instance_s* af, struct mp_audio* data); // Initialization and runtime control static int control(struct af_instance_s* af, int cmd, void* arg) @@ -47,9 +47,9 @@ static int control(struct af_instance_s* af, int cmd, void* arg) // Sanity check if(!arg) return AF_ERROR; - af->data->rate = ((af_data_t*)arg)->rate; + af->data->rate = ((struct mp_audio*)arg)->rate; af->data->nch = 2; - if (((af_data_t*)arg)->format == AF_FORMAT_FLOAT_NE) + if (((struct mp_audio*)arg)->format == AF_FORMAT_FLOAT_NE) { af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; @@ -61,7 +61,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->play = play_s16; } - return af_test_output(af,(af_data_t*)arg); + return af_test_output(af,(struct mp_audio*)arg); } case AF_CONTROL_COMMAND_LINE:{ float f; @@ -87,7 +87,7 @@ static void uninit(struct af_instance_s* af) } // Filter data through filter -static af_data_t* play_s16(struct af_instance_s* af, af_data_t* data) +static struct mp_audio* play_s16(struct af_instance_s* af, struct mp_audio* data) { af_extrastereo_t *s = af->setup; register int i = 0; @@ -109,7 +109,7 @@ static af_data_t* play_s16(struct af_instance_s* af, af_data_t* data) return data; } -static af_data_t* play_float(struct af_instance_s* af, af_data_t* data) +static struct mp_audio* play_float(struct af_instance_s* af, struct mp_audio* data) { af_extrastereo_t *s = af->setup; register int i = 0; @@ -137,7 +137,7 @@ static int af_open(af_instance_t* af){ af->uninit=uninit; af->play=play_s16; af->mul=1; - af->data=calloc(1,sizeof(af_data_t)); + af->data=calloc(1,sizeof(struct mp_audio)); af->setup=calloc(1,sizeof(af_extrastereo_t)); if(af->data == NULL || af->setup == NULL) return AF_ERROR; -- cgit v1.2.3