diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-01 12:00:00 +0100 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-02 19:19:28 +0100 |
commit | 0374ddb79d4e20aa73ef91496beb2c0811c34ca7 (patch) | |
tree | c9066550112a2b905c2e87351c10bd484ebe04ba /libaf/af_volume.c | |
parent | e0aef8cf1275cc988007fcb2a099cdd9f92fa374 (diff) |
audio: untypedef af_data and rename it to mp_audio
this is to have something specular to mp_image
Diffstat (limited to 'libaf/af_volume.c')
-rw-r--r-- | libaf/af_volume.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libaf/af_volume.c b/libaf/af_volume.c index 4e6a3b40f6..8ce60b5eac 100644 --- a/libaf/af_volume.c +++ b/libaf/af_volume.c @@ -66,10 +66,10 @@ 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->nch = ((af_data_t*)arg)->nch; + af->data->rate = ((struct mp_audio*)arg)->rate; + af->data->nch = ((struct mp_audio*)arg)->nch; - if(s->fast && (((af_data_t*)arg)->format != (AF_FORMAT_FLOAT_NE))){ + if(s->fast && (((struct mp_audio*)arg)->format != (AF_FORMAT_FLOAT_NE))){ af->data->format = AF_FORMAT_S16_NE; af->data->bps = 2; } @@ -82,7 +82,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; } - return af_test_output(af,(af_data_t*)arg); + return af_test_output(af,(struct mp_audio*)arg); case AF_CONTROL_COMMAND_LINE:{ float v=0.0; float vol[AF_NCH]; @@ -138,9 +138,9 @@ static void uninit(struct af_instance_s* af) } // Filter data through filter -static af_data_t* play(struct af_instance_s* af, af_data_t* data) +static struct mp_audio* play(struct af_instance_s* af, struct mp_audio* data) { - af_data_t* c = data; // Current working data + struct mp_audio* c = data; // Current working data af_volume_t* s = (af_volume_t*)af->setup; // Setup for this instance register int nch = c->nch; // Number of channels register int i = 0; @@ -203,7 +203,7 @@ static int af_open(af_instance_t* af){ af->uninit=uninit; af->play=play; 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_volume_t)); if(af->data == NULL || af->setup == NULL) return AF_ERROR; |