[MPlayer-cvslog] CVS: main/libaf filter.c, 1.5, 1.6 window.c, 1.3, 1.4 window.h, 1.2, 1.3

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var2/tmp/cvs-serv31019

Modified Files:
	filter.c window.c window.h 
Log Message:
less namespace pollution

Index: filter.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/filter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filter.c	10 Oct 2004 14:20:42 -0000	1.5
+++ filter.c	29 Dec 2004 19:41:21 -0000	1.6
@@ -114,19 +114,19 @@
   // Get window coefficients
   switch(flags & WINDOW_MASK){
   case(BOXCAR):
-    boxcar(n,w); break;
+    af_window_boxcar(n,w); break;
   case(TRIANG):
-    triang(n,w); break;
+    af_window_triang(n,w); break;
   case(HAMMING):
-    hamming(n,w); break;
+    af_window_hamming(n,w); break;
   case(HANNING):
-    hanning(n,w); break;
+    af_window_hanning(n,w); break;
   case(BLACKMAN):
-    blackman(n,w); break;
+    af_window_blackman(n,w); break;
   case(FLATTOP):
-    flattop(n,w); break;
+    af_window_flattop(n,w); break;
   case(KAISER):
-    kaiser(n,w,opt); break;
+    af_window_kaiser(n,w,opt); break;
   default:
     return -1;	
   }

Index: window.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- window.c	10 Oct 2004 14:20:42 -0000	1.3
+++ window.c	29 Dec 2004 19:41:21 -0000	1.4
@@ -24,7 +24,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void boxcar(int n, _ftype_t* w)
+void af_window_boxcar(int n, _ftype_t* w)
 {
   int i;
   // Calculate window coefficients
@@ -44,7 +44,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void triang(int n, _ftype_t* w)
+void af_window_triang(int n, _ftype_t* w)
 {
   _ftype_t k1  = (_ftype_t)(n & 1);
   _ftype_t k2  = 1/((_ftype_t)n + k1);
@@ -65,7 +65,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void hanning(int n, _ftype_t* w)
+void af_window_hanning(int n, _ftype_t* w)
 {
   int	   i;
   _ftype_t k = 2*M_PI/((_ftype_t)(n+1)); // 2*pi/(N+1)
@@ -84,7 +84,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void hamming(int n,_ftype_t* w)
+void af_window_hamming(int n,_ftype_t* w)
 {
   int      i;
   _ftype_t k = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@@ -103,7 +103,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void blackman(int n,_ftype_t* w)
+void af_window_blackman(int n,_ftype_t* w)
 {
   int      i;
   _ftype_t k1 = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@@ -123,7 +123,7 @@
 // n window length
 // w buffer for the window parameters
 */
-void flattop(int n,_ftype_t* w)
+void af_window_flattop(int n,_ftype_t* w)
 {
   int      i;
   _ftype_t k1 = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@@ -142,7 +142,7 @@
 */
 #define BIZ_EPSILON 1E-21 // Max error acceptable 
 
-_ftype_t besselizero(_ftype_t x)
+static _ftype_t besselizero(_ftype_t x)
 { 
   _ftype_t temp;
   _ftype_t sum   = 1.0;
@@ -186,7 +186,7 @@
 // 8.960   5.7     0.000275  -90
 // 10.056  6.4     0.000087  -100
 */
-void kaiser(int n, _ftype_t* w, _ftype_t b)
+void af_window_kaiser(int n, _ftype_t* w, _ftype_t b)
 {
   _ftype_t tmp;
   _ftype_t k1  = 1.0/besselizero(b);

Index: window.h
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- window.h	10 Oct 2004 14:20:42 -0000	1.2
+++ window.h	29 Dec 2004 19:41:21 -0000	1.3
@@ -22,12 +22,12 @@
 #ifndef _WINDOW_H
 #define _WINDOW_H	1
 
-extern void boxcar(int n, _ftype_t* w);
-extern void triang(int n, _ftype_t* w);
-extern void hanning(int n, _ftype_t* w);
-extern void hamming(int n,_ftype_t* w);
-extern void blackman(int n,_ftype_t* w);
-extern void flattop(int n,_ftype_t* w);
-extern void kaiser(int n, _ftype_t* w,_ftype_t b);
+extern void af_window_boxcar(int n, _ftype_t* w);
+extern void af_window_triang(int n, _ftype_t* w);
+extern void af_window_hanning(int n, _ftype_t* w);
+extern void af_window_hamming(int n,_ftype_t* w);
+extern void af_window_blackman(int n,_ftype_t* w);
+extern void af_window_flattop(int n,_ftype_t* w);
+extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b);
 
 #endif