? a.patch Index: mpeglayer3.cc =================================================================== RCS file: /home/kde/kdemultimedia/mpeglib/lib/splay/mpeglayer3.cc,v retrieving revision 1.4 diff -u -r1.4 mpeglayer3.cc --- mpeglayer3.cc 2000/08/30 20:23:32 1.4 +++ mpeglayer3.cc 2000/09/20 17:13:05 @@ -35,7 +35,7 @@ #ifdef PI #undef PI #endif -#define PI M_PI +#define PI MY_PI #define PI_12 (PI/12.0) #define PI_18 (PI/18.0) #define PI_24 (PI/24.0) @@ -120,8 +120,8 @@ win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*i+1))/ cos(PI_72*(double)(2*i+19)); */ - win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*(i+0)+1))/cos(M_PI * (double) (2*(i+0) +19) / 72.0 ); - win[0][i+18] = win[3][i+18] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 ); + win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*(i+0)+1))/cos(MY_PI * (double) (2*(i+0) +19) / 72.0 ); + win[0][i+18] = win[3][i+18] = 0.5 * sin( MY_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( MY_PI * (double) (2*(i+18)+19) / 72.0 ); } /* for(;i<36;i++) { @@ -131,14 +131,14 @@ */ for(i=0;i<6;i++) { - win[1][i+18]=0.5/cos(M_PI*(double)(2*(i+18)+19)/72.0); - win[3][i+12]=0.5/cos(M_PI*(double)(2*(i+12)+19)/72.0); - win[1][i+24]=0.5*sin(PI_24*(double)(2*i+13))/cos(M_PI*(double)(2*(i+24)+19)/72.0); + win[1][i+18]=0.5/cos(MY_PI*(double)(2*(i+18)+19)/72.0); + win[3][i+12]=0.5/cos(MY_PI*(double)(2*(i+12)+19)/72.0); + win[1][i+24]=0.5*sin(PI_24*(double)(2*i+13))/cos(MY_PI*(double)(2*(i+24)+19)/72.0); win[1][i+30]=win[3][i]=0.0; - win[3][i+6 ]=0.5*sin(PI_24*(double)(2*i+1))/cos(M_PI*(double)(2*(i+6)+19)/72.0); + win[3][i+6 ]=0.5*sin(PI_24*(double)(2*i+1))/cos(MY_PI*(double)(2*(i+6)+19)/72.0); } for(i=0;i<12;i++) - win[2][i]=0.5*sin(PI_24*(double)(2*i+1))/cos(M_PI*(double)(2*i+7)/24.0); + win[2][i]=0.5*sin(PI_24*(double)(2*i+1))/cos(MY_PI*(double)(2*i+7)/24.0); } for(int i=0;i<9;i++)