# HG changeset patch # User vitor # Date 1211388185 0 # Node ID 1acb9df14634518740bd18d7edbc942bd2bdfa89 # Parent e271c9b997b1e7e358cd5557a554275cc03bf8ba Simplify add_wav() diff -r e271c9b997b1 -r 1acb9df14634 ra144.c --- a/ra144.c Wed May 21 16:41:58 2008 +0000 +++ b/ra144.c Wed May 21 16:43:05 2008 +0000 @@ -129,30 +129,21 @@ static void add_wav(int n, int f, int m1, int m2, int m3, const short *s1, const short *s2, const short *s3, short *dest) { - int a, b, c, i; + int a = 0; + int b, c, i; const short *ptr, *ptr2; ptr = wavtable1 + n * 9; ptr2 = wavtable2 + n * 9; - if (f != 0) - a = ((*ptr) * m1) >> ((*ptr2) + 1); - else - a = 0; + if (f) + a = (ptr[0] * m1) >> (ptr2[0] + 1); - ptr++; - ptr2++; - b = ((*ptr) * m2) >> ((*ptr2) + 1); - ptr++; - ptr2++; - c = ((*ptr) * m3) >> ((*ptr2) + 1); + b = (ptr[1] * m2) >> (ptr2[1] + 1); + c = (ptr[2] * m3) >> (ptr2[2] + 1); - if (f != 0) for (i=0; i < BLOCKSIZE; i++) dest[i] = ((*(s1++)) * a + (*(s2++)) * b + (*(s3++)) * c) >> 12; - else - for (i=0; i < BLOCKSIZE; i++) - dest[i] = ((*(s2++)) * b + (*(s3++)) * c) >> 12; }