[Mplayer-cvslog] CVS: main/libao2 ao_mpegpes.c,1.11,1.12 ao_null.c,1.8,1.9 ao_oss.c,1.30,1.31 ao_plugin.c,1.20,1.21 pl_delay.c,1.5,1.6 pl_resample.c,1.7,1.8

[Arpi of Ize]

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

Modified Files:
	ao_mpegpes.c ao_null.c ao_oss.c ao_plugin.c pl_delay.c 
	pl_resample.c 
Log Message:
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug


Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ao_mpegpes.c	30 Aug 2002 13:34:08 -0000	1.11
+++ ao_mpegpes.c	22 Sep 2002 02:33:24 -0000	1.12
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_DVB
 #include <sys/ioctl.h>
 #endif

Index: ao_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_null.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ao_null.c	3 May 2002 18:42:43 -0000	1.8
+++ ao_null.c	22 Sep 2002 02:33:24 -0000	1.9
@@ -19,7 +19,7 @@
 struct	timeval last_tv;
 int	buffer;
 
-static int drain(){
+static void drain(){
  
     struct timeval now_tv;
     int temp, temp2;

Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ao_oss.c	28 Aug 2002 19:37:13 -0000	1.30
+++ ao_oss.c	22 Sep 2002 02:33:24 -0000	1.31
@@ -55,7 +55,7 @@
 	case AOCONTROL_SET_VOLUME:
 	{
 	    ao_control_vol_t *vol = (ao_control_vol_t *)arg;
-	    int fd, v, mcmd, devs;
+	    int fd, v, devs;
 
 	    if(ao_data.format == AFMT_AC3)
 		return CONTROL_TRUE;

Index: ao_plugin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_plugin.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ao_plugin.c	10 Jun 2002 12:10:52 -0000	1.20
+++ ao_plugin.c	22 Sep 2002 02:33:24 -0000	1.21
@@ -148,15 +148,15 @@
   ao_plugin_data.delay_mult=1;
   ao_plugin_data.delay_fix=0;
 
-  for(i=0;i<NPL,plugin(i);i++){
+  for(i=0;i<NPL && plugin(i);i++){
     use_plugin[i]=plugin(i)->init();
     if(!use_plugin[i]) plugin(i)->uninit();
   }
   npl=i;
-  for(i=0;i<npl,plugin(i);i++)
+  for(i=0;i<npl && plugin(i);i++)
     if(!use_plugin[i+unused]){
       unused++;
-      for(x=i;x<npl,plugin(x+1);x++) plugin(x)=plugin(x+1);
+      for(x=i;x<npl && plugin(x+1);x++) plugin(x)=plugin(x+1);
       plugin(x)=NULL;
       npl--;
       i--;

Index: pl_delay.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/pl_delay.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pl_delay.c	30 May 2002 11:53:51 -0000	1.5
+++ pl_delay.c	22 Sep 2002 02:33:24 -0000	1.6
@@ -55,7 +55,6 @@
 // open & setup audio device
 // return: 1=success 0=fail
 static int init(){
-  int i=0;
   float time_delay; // The time in [s] this plugin delays the output data
   
   /* If the output format of any of the below parameters differs from

Index: pl_resample.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/pl_resample.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pl_resample.c	21 Feb 2002 16:05:09 -0000	1.7
+++ pl_resample.c	22 Sep 2002 02:33:24 -0000	1.8
@@ -172,7 +172,7 @@
   }
   if(pl_resample.up>pl_resample.dn)
     return upsample();
-  if(pl_resample.up<pl_resample.dn)
+//  if(pl_resample.up<pl_resample.dn)
     return downsample();
 }