[MPlayer-cvslog] CVS: main/libao2 ao_alsa5.c, 1.22, 1.23 ao_nas.c, 1.18, 1.19 ao_sgi.c, 1.9, 1.10 ao_sun.c, 1.32, 1.33 ao_win32.c, 1.20, 1.21 pl_format.c, 1.9, 1.10

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv8096/libao2

Modified Files:
	ao_alsa5.c ao_nas.c ao_sgi.c ao_sun.c ao_win32.c pl_format.c 
Log Message:
100l, buf etc. in af_fmt2str call are already pointers...


Index: ao_alsa5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa5.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ao_alsa5.c	27 Dec 2004 18:10:30 -0000	1.22
+++ ao_alsa5.c	27 Dec 2004 19:43:13 -0000	1.23
@@ -53,7 +53,7 @@
     char buf[128];
 
     mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_ALSA5_InitInfo, rate_hz,
-	channels, af_fmt2str(format));
+	channels, af_fmt2str(format, buf, 128));
 
     alsa_handler = NULL;
 
@@ -112,7 +112,7 @@
 	    ao_data.bps *= 2;
 	    break;
 	case -1:
-	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_ALSA5_InvalidFormatReq,af_fmt2str(format,&buf,128));
+	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_ALSA5_InvalidFormatReq,af_fmt2str(format,buf,128));
 	    return(0);
 	default:
 	    break;

Index: ao_nas.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_nas.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ao_nas.c	27 Dec 2004 18:16:55 -0000	1.18
+++ ao_nas.c	27 Dec 2004 19:43:13 -0000	1.19
@@ -393,7 +393,7 @@
 	memset(nas_data, 0, sizeof(struct ao_nas_data));
 
 	mp_msg(MSGT_AO, MSGL_V, "ao2: %d Hz  %d chans  %s\n",rate,channels,
-		af_fmt2str(format,&buf,128));
+		af_fmt2str(format,buf,128));
 
 	ao_data.format = format;
 	ao_data.samplerate = rate;

Index: ao_sgi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sgi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ao_sgi.c	27 Dec 2004 18:10:30 -0000	1.9
+++ ao_sgi.c	27 Dec 2004 19:43:13 -0000	1.10
@@ -43,7 +43,7 @@
 static int init(int rate, int channels, int format, int flags) {
 
   char buf[128];  
-  mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str(format, &buf, 128));
+  mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str(format, buf, 128));
   
   { /* from /usr/share/src/dmedia/audio/setrate.c */
   

Index: ao_sun.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sun.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ao_sun.c	27 Dec 2004 18:10:30 -0000	1.32
+++ ao_sun.c	27 Dec 2004 19:43:13 -0000	1.33
@@ -546,7 +546,7 @@
 
     if (!ok) {
 	mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_UnsupSampleRate,
-	       channels, af_fmt2str(format, &buf, 128), rate);
+	       channels, af_fmt2str(format, buf, 128), rate);
 	return 0;
     }
 

Index: ao_win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_win32.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ao_win32.c	27 Dec 2004 18:10:30 -0000	1.20
+++ ao_win32.c	27 Dec 2004 19:43:13 -0000	1.21
@@ -156,7 +156,7 @@
 		case AF_FORMAT_S8:
 			break;
 		default:
-			mp_msg(MSGT_AO, MSGL_V,"ao_win32: format %s not supported defaulting to Signed 16-bit Little-Endian\n",af_fmt2str(format, &buf, 128));
+			mp_msg(MSGT_AO, MSGL_V,"ao_win32: format %s not supported defaulting to Signed 16-bit Little-Endian\n",af_fmt2str(format, buf, 128));
 			format=AF_FORMAT_S16_LE;
 	}   
 	//fill global ao_data 

Index: pl_format.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/pl_format.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pl_format.c	27 Dec 2004 17:30:14 -0000	1.9
+++ pl_format.c	27 Dec 2004 19:43:13 -0000	1.10
@@ -137,8 +137,8 @@
 
   // Tell the world what we are up to
   printf("[pl_format] Input format: %s, output format: %s \n",
-	 af_fmt2str(ao_plugin_data.format, &buf1, 128),
-	 af_fmt2str(ao_plugin_cfg.pl_format_type, &buf2, 128));
+	 af_fmt2str(ao_plugin_data.format, buf1, 128),
+	 af_fmt2str(ao_plugin_cfg.pl_format_type, buf2, 128));
 
   // We are changing the format
   ao_plugin_data.format=ao_plugin_cfg.pl_format_type;