Index: mppenc/branches/r2d/libmpcpsy/fft4g.c
===================================================================
--- mppenc/branches/r2d/libmpcpsy/fft4g.c	(revision 59)
+++ mppenc/branches/r2d/libmpcpsy/fft4g.c	(revision 60)
@@ -18,5 +18,5 @@
  */
 
-#include "mppenc.h"
+#include "libmpcpsy.h"
 
 /* F U N C T I O N S */
@@ -57,5 +57,4 @@
     float  xi;
 
-    ENTER(30);
     if ( n > 4) {
         bitrv2  ( n, ip + 2, a );
@@ -69,5 +68,4 @@
     a[0] += a[1];
     a[1]  = xi;
-    LEAVE(30);
     return;
 }
@@ -84,5 +82,4 @@
     double  delta;
 
-    ENTER(31);
     ip[0] = nw;
     ip[1] = 1;
@@ -106,5 +103,4 @@
         }
     }
-    LEAVE(31);
     return;
 }
@@ -118,5 +114,4 @@
     double  delta;
 
-    ENTER(32);
     ip[1] = nc;
     if ( nc > 1 ) {
@@ -130,5 +125,4 @@
         }
     }
-    LEAVE(32);
     return;
 }
@@ -142,5 +136,4 @@
     float  xr, xi, yr, yi;
 
-    ENTER(33);
     ip[0] = 0;
     l     = n;
@@ -235,5 +228,4 @@
         }
     }
-    LEAVE(33);
     return;
 }
@@ -246,5 +238,4 @@
     float  x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
 
-    ENTER(34);
     l = 2;
     if ( n > 8 ) {
@@ -291,5 +282,4 @@
         } while ( j += 2, j < l );
     }
-    LEAVE(34);
     return;
 }
@@ -303,5 +293,4 @@
     float  x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
 
-    ENTER(35);
     x0r   = a[ 0] + a[ 2];
     x0i   = a[ 1] + a[ 3];
@@ -401,10 +390,9 @@
         a[j + 15] = wk3r * x0i + wk3i * x0r;
     } while ( j += 16, j < n );
-    LEAVE(35);
-    return;
-}
-
-extern void Cdecl cftmdl_3DNow_1 ( const int n, const int l, float* a, float* w );
-extern void Cdecl cftmdl_3DNow_2 ( const int n, const int l, float* a, float* w );
+    return;
+}
+
+// extern void Cdecl cftmdl_3DNow_1 ( const int n, const int l, float* a, float* w );
+// extern void Cdecl cftmdl_3DNow_2 ( const int n, const int l, float* a, float* w );
 
 
@@ -416,5 +404,4 @@
     float  x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
 
-    ENTER(36);
     m = l << 2;
 
@@ -467,7 +454,5 @@
         a[j3 + 1] = wk1r * (x0i + x0r);
     }
-    LEAVE(36);
-
-    ENTER(39);
+
     k1 = 0;
     m2 = 2 * m;
@@ -542,97 +527,92 @@
         } while ( j += 2, j < l+k+m );
     }
-    LEAVE(39);
-    return;
-}
-
-
-static void
-cftmdl_3DNow ( const int n, const int l, float* a, float* w )
-{
-    int    j, j1, j2, j3, k, k1, m, m2;
-    float  wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
-    float  x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-    ENTER(36);
-    cftmdl_3DNow_1 (n,l,a,w);
-    LEAVE(36);
-
-    ENTER(39);
-    m  = l << 2;
-    k1 = 0;
-    m2 = 2 * m;
-    for ( k = m2; k < n; k += m2 ) {
-        k1  += 2;
-        wk2r = w[k1];
-        wk2i = w[k1 + 1];
-        wk1r = w[2*k1];
-        wk1i = w[2*k1 + 1];
-        wk3r = wk1r - 2 * wk2i * wk1i;
-        wk3i = 2 * wk2i * wk1r - wk1i;
-        j    = k;
-        do {
-            j1        = j  + l;
-            j2        = j1 + l;
-            j3        = j2 + l;
-            x0r       = a[j]      + a[j1];
-            x0i       = a[j + 1]  + a[j1 + 1];
-            x1r       = a[j]      - a[j1];
-            x1i       = a[j + 1]  - a[j1 + 1];
-            x2r       = a[j2]     + a[j3];
-            x2i       = a[j2 + 1] + a[j3 + 1];
-            x3r       = a[j2]     - a[j3];
-            x3i       = a[j2 + 1] - a[j3 + 1];
-            a[j]      = x0r + x2r;
-            a[j + 1]  = x0i + x2i;
-            x0r      -= x2r;
-            x0i      -= x2i;
-            a[j2]     = wk2r * x0r - wk2i * x0i;
-            a[j2 + 1] = wk2r * x0i + wk2i * x0r;
-            x0r       = x1r - x3i;
-            x0i       = x1i + x3r;
-            a[j1]     = wk1r * x0r - wk1i * x0i;
-            a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-            x0r       = x1r + x3i;
-            x0i       = x1i - x3r;
-            a[j3]     = wk3r * x0r - wk3i * x0i;
-            a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-        } while ( j += 2, j < l + k );
-
-        wk1r = w[2*k1 + 2];
-        wk1i = w[2*k1 + 3];
-        wk3r = wk1r - 2 * wk2r * wk1i;
-        wk3i = 2 * wk2r * wk1r - wk1i;
-        j    = k + m;
-        do {
-            j1        = j + l;
-            j2        = j1 + l;
-            j3        = j2 + l;
-            x0r       = a[j]      + a[j1];
-            x0i       = a[j + 1]  + a[j1 + 1];
-            x1r       = a[j]      - a[j1];
-            x1i       = a[j + 1]  - a[j1 + 1];
-            x2r       = a[j2]     + a[j3];
-            x2i       = a[j2 + 1] + a[j3 + 1];
-            x3r       = a[j2]     - a[j3];
-            x3i       = a[j2 + 1] - a[j3 + 1];
-            a[j]      = x0r + x2r;
-            a[j + 1]  = x0i + x2i;
-            x0r      -= x2r;
-            x0i      -= x2i;
-            a[j2]     = -wk2i * x0r - wk2r * x0i;
-            a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
-            x0r       = x1r - x3i;
-            x0i       = x1i + x3r;
-            a[j1]     = wk1r * x0r - wk1i * x0i;
-            a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-            x0r       = x1r + x3i;
-            x0i       = x1i - x3r;
-            a[j3]     = wk3r * x0r - wk3i * x0i;
-            a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-        } while ( j += 2, j < l+k+m );
-    }
-    LEAVE(39);
-    return;
-}
+    return;
+}
+
+
+// static void
+// cftmdl_3DNow ( const int n, const int l, float* a, float* w )
+// {
+//     int    j, j1, j2, j3, k, k1, m, m2;
+//     float  wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
+//     float  x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+//
+//     cftmdl_3DNow_1 (n,l,a,w);
+//
+//     m  = l << 2;
+//     k1 = 0;
+//     m2 = 2 * m;
+//     for ( k = m2; k < n; k += m2 ) {
+//         k1  += 2;
+//         wk2r = w[k1];
+//         wk2i = w[k1 + 1];
+//         wk1r = w[2*k1];
+//         wk1i = w[2*k1 + 1];
+//         wk3r = wk1r - 2 * wk2i * wk1i;
+//         wk3i = 2 * wk2i * wk1r - wk1i;
+//         j    = k;
+//         do {
+//             j1        = j  + l;
+//             j2        = j1 + l;
+//             j3        = j2 + l;
+//             x0r       = a[j]      + a[j1];
+//             x0i       = a[j + 1]  + a[j1 + 1];
+//             x1r       = a[j]      - a[j1];
+//             x1i       = a[j + 1]  - a[j1 + 1];
+//             x2r       = a[j2]     + a[j3];
+//             x2i       = a[j2 + 1] + a[j3 + 1];
+//             x3r       = a[j2]     - a[j3];
+//             x3i       = a[j2 + 1] - a[j3 + 1];
+//             a[j]      = x0r + x2r;
+//             a[j + 1]  = x0i + x2i;
+//             x0r      -= x2r;
+//             x0i      -= x2i;
+//             a[j2]     = wk2r * x0r - wk2i * x0i;
+//             a[j2 + 1] = wk2r * x0i + wk2i * x0r;
+//             x0r       = x1r - x3i;
+//             x0i       = x1i + x3r;
+//             a[j1]     = wk1r * x0r - wk1i * x0i;
+//             a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+//             x0r       = x1r + x3i;
+//             x0i       = x1i - x3r;
+//             a[j3]     = wk3r * x0r - wk3i * x0i;
+//             a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+//         } while ( j += 2, j < l + k );
+//
+//         wk1r = w[2*k1 + 2];
+//         wk1i = w[2*k1 + 3];
+//         wk3r = wk1r - 2 * wk2r * wk1i;
+//         wk3i = 2 * wk2r * wk1r - wk1i;
+//         j    = k + m;
+//         do {
+//             j1        = j + l;
+//             j2        = j1 + l;
+//             j3        = j2 + l;
+//             x0r       = a[j]      + a[j1];
+//             x0i       = a[j + 1]  + a[j1 + 1];
+//             x1r       = a[j]      - a[j1];
+//             x1i       = a[j + 1]  - a[j1 + 1];
+//             x2r       = a[j2]     + a[j3];
+//             x2i       = a[j2 + 1] + a[j3 + 1];
+//             x3r       = a[j2]     - a[j3];
+//             x3i       = a[j2 + 1] - a[j3 + 1];
+//             a[j]      = x0r + x2r;
+//             a[j + 1]  = x0i + x2i;
+//             x0r      -= x2r;
+//             x0i      -= x2i;
+//             a[j2]     = -wk2i * x0r - wk2r * x0i;
+//             a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
+//             x0r       = x1r - x3i;
+//             x0i       = x1i + x3r;
+//             a[j1]     = wk1r * x0r - wk1i * x0i;
+//             a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+//             x0r       = x1r + x3i;
+//             x0i       = x1i - x3r;
+//             a[j3]     = wk3r * x0r - wk3i * x0i;
+//             a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+//         } while ( j += 2, j < l+k+m );
+//     }
+//     return;
+// }
 
 
@@ -643,5 +623,4 @@
     float  wkr, wki, xr, xi, yr, yi;
 
-    ENTER(37);
     m  = n >> 1;
     ks = 2 * nc / m;
@@ -664,5 +643,4 @@
         kk       += ks;
     } while ( j += 2, j < m );
-    LEAVE(37);
     return;
 }
