[Mplayer-cvslog] CVS: main/libao2 afmt.c,1.3,1.4 afmt.h,1.3,1.4

[Alex Beregszaszi]

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

Modified Files:
	afmt.c afmt.h 
Log Message:
added float

Index: afmt.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/afmt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- afmt.c	7 Jun 2002 22:43:25 -0000	1.3
+++ afmt.c	17 Nov 2002 17:35:31 -0000	1.4
@@ -42,6 +42,8 @@
 	case AFMT_S32_BE:
 	    return("Signed 32-bit (Big-Endian)");
 #endif
+	case AFMT_FLOAT:
+	    return("Floating Point");
     }
     return("Unknown");
 }
@@ -50,6 +52,12 @@
 int audio_out_format_bits(int format){
     switch (format)
     {
+	case AFMT_S16_LE:
+	case AFMT_S16_BE:
+	case AFMT_U16_LE:
+	case AFMT_U16_BE: 
+	return 16;//16 bits
+
 /*
   the following two formats are not available with old linux kernel
   headers (e.g. in 2.2.16)
@@ -62,12 +70,8 @@
 	case AFMT_S32_BE:
 	return 32;
 #endif
-
-	case AFMT_U16_LE:
-	case AFMT_U16_BE: 
-	case AFMT_S16_LE:
-	case AFMT_S16_BE:
-	return 16;//16 bits
+	case AFMT_FLOAT:
+	return 32;
 	
 	case AFMT_MU_LAW:
 	case AFMT_A_LAW:

Index: afmt.h
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/afmt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- afmt.h	12 Oct 2002 20:01:46 -0000	1.3
+++ afmt.h	17 Nov 2002 17:35:31 -0000	1.4
@@ -47,3 +47,7 @@
 #  define AFMT_S32_NE	AFMT_S32_LE
 # endif
 #endif
+
+#ifndef AFMT_FLOAT
+# define AFMT_FLOAT               0x00004000
+#endif