diff libaf/af.c @ 14818:663c1ea5f595

finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants

--- a/libaf/af.c	Fri Feb 25 11:07:21 2005 +0000
+++ b/libaf/af.c	Fri Feb 25 11:11:07 2005 +0000
@@ -265,8 +265,7 @@
 	    return rv;
 	}
 	// Insert format filter
-	if(((af->prev?af->prev->data->format:s->input.format) != in.format) || 
-	   ((af->prev?af->prev->data->bps:s->input.bps) != in.bps)){
+	if((af->prev?af->prev->data->format:s->input.format) != in.format){
 	  // Create format filter
 	  if(NULL == (new = af_prepend(s,af,"format")))
 	    return AF_ERROR;
@@ -438,8 +437,7 @@
     }
     
     // Check output format fix if not OK
-    if((s->last->data->format != s->output.format) || 
-       (s->last->data->bps != s->output.bps)){
+    if(s->last->data->format != s->output.format){
       if(strcmp(s->last->info->name,"format"))
 	af = af_append(s,s->last,"format");
       else
@@ -457,7 +455,6 @@
       return -1;
 
     if((s->last->data->format != s->output.format) || 
-       (s->last->data->bps    != s->output.bps)    ||
        (s->last->data->nch    != s->output.nch)    || 
        (s->last->data->rate   != s->output.rate))  {
       // Something is stuffed audio out will not work 
@@ -698,3 +695,7 @@
   }
 }
 
+void af_fix_parameters(af_data_t *data)
+{
+    data->bps = af_fmt2bits(data->format)/8;
+}