1 files changed, 10 insertions, 10 deletions

diff --git a/libaf/af_volnorm.c b/libaf/af_volnorm.c
index f7698e784c..80a9d31471 100644
--- a/libaf/af_volnorm.c
+++ b/libaf/af_volnorm.c
@@ -87,17 +87,17 @@ 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(((af_data_t*)arg)->format == (AF_FORMAT_S16_NE)){
+    if(((struct mp_audio*)arg)->format == (AF_FORMAT_S16_NE)){
       af->data->format = AF_FORMAT_S16_NE;
       af->data->bps    = 2;
     }else{
       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:{
     int   i = 0;
     float target = DEFAULT_TARGET;
@@ -120,7 +120,7 @@ static void uninit(struct af_instance_s* af)
     free(af->setup);
 }
 
-static void method1_int16(af_volnorm_t *s, af_data_t *c)
+static void method1_int16(af_volnorm_t *s, struct mp_audio *c)
 {
   register int i = 0;
   int16_t *data = (int16_t*)c->audio;	// Audio data
@@ -162,7 +162,7 @@ static void method1_int16(af_volnorm_t *s, af_data_t *c)
   s->lastavg = (1.0 - SMOOTH_LASTAVG) * s->lastavg + SMOOTH_LASTAVG * newavg;
 }
 
-static void method1_float(af_volnorm_t *s, af_data_t *c)
+static void method1_float(af_volnorm_t *s, struct mp_audio *c)
 {
   register int i = 0;
   float *data = (float*)c->audio;	// Audio data
@@ -199,7 +199,7 @@ static void method1_float(af_volnorm_t *s, af_data_t *c)
   s->lastavg = (1.0 - SMOOTH_LASTAVG) * s->lastavg + SMOOTH_LASTAVG * newavg;
 }
 
-static void method2_int16(af_volnorm_t *s, af_data_t *c)
+static void method2_int16(af_volnorm_t *s, struct mp_audio *c)
 {
   register int i = 0;
   int16_t *data = (int16_t*)c->audio;	// Audio data
@@ -249,7 +249,7 @@ static void method2_int16(af_volnorm_t *s, af_data_t *c)
   s->idx = (s->idx + 1) % NSAMPLES;
 }
 
-static void method2_float(af_volnorm_t *s, af_data_t *c)
+static void method2_float(af_volnorm_t *s, struct mp_audio *c)
 {
   register int i = 0;
   float *data = (float*)c->audio;	// Audio data
@@ -296,7 +296,7 @@ static void method2_float(af_volnorm_t *s, af_data_t *c)
 }
 
 // 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_volnorm_t *s = af->setup;
 
@@ -324,7 +324,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_volnorm_t));
   if(af->data == NULL || af->setup == NULL)
     return AF_ERROR;