[Mplayer-cvslog] CVS: main/libaf af.c,1.21,1.22 af_channels.c,1.9,1.10 af_resample.c,1.16,1.17

[Anders Johansson CVS]

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var/tmp.root/cvs-serv27068

Modified Files:
	af.c af_channels.c af_resample.c 
Log Message:
sig 11 fix in reinit and resample + spelling error fixes

Index: af.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- af.c	31 Dec 2002 15:14:13 -0000	1.21
+++ af.c	2 Jan 2003 03:00:44 -0000	1.22
@@ -287,7 +287,7 @@
     }
     // Check if there are any filters left in the list
     if(NULL == af){
-      if(!af_append(s,s->first,"dummy")) 
+      if(!(af=af_append(s,s->first,"dummy"))) 
 	return -1; 
     }
     else

Index: af_channels.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_channels.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- af_channels.c	28 Dec 2002 13:59:53 -0000	1.9
+++ af_channels.c	2 Jan 2003 03:00:44 -0000	1.10
@@ -20,7 +20,7 @@
 }af_channels_t;
 
 // Local function for copying data
-void copy(void* in, void* out, int ins, int inos,int outs, int outos, int len, int bps)
+static void copy(void* in, void* out, int ins, int inos,int outs, int outos, int len, int bps)
 {
   switch(bps){
   case 1:{
@@ -86,7 +86,7 @@
 {
   int i;
   if((s->nr < 1) || (s->nr > AF_NCH)){
-    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	   " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
     return AF_ERROR;
   }
@@ -149,14 +149,14 @@
       int ch = 0;
       // Sanity check
       if((s->nr < 1) || (s->nr > AF_NCH)){
-	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	     " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
       }	
       s->router = 1;
       // Scan for pairs on commandline
       while((*cp == ':') && (ch < s->nr)){
 	sscanf(cp, ":%i:%i%n" ,&s->route[ch][FR], &s->route[ch][TO], &n);
-	af_msg(AF_MSG_DEBUG0,"[channels] Routing from channel %i to" 
+	af_msg(AF_MSG_VERBOSE,"[channels] Routing from channel %i to" 
 	       " channel %i\n",s->route[ch][FR],s->route[ch][TO]);
 	cp = &cp[n];
 	ch++;

Index: af_resample.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_resample.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- af_resample.c	28 Dec 2002 13:59:53 -0000	1.16
+++ af_resample.c	2 Jan 2003 03:00:44 -0000	1.17
@@ -132,7 +132,7 @@
     size_t 	   tsz = (s->type==TYPE_INT) ? sizeof(int16_t) : sizeof(float);
 
     // Make sure this filter isn't redundant 
-    if(af->data->rate == n->rate)
+    if((af->data->rate == n->rate) || (af->data->rate == 0))
       return AF_DETACH;
 
     // If linear interpolation