From e7ac0652b06ab98ddd0800d76129ab5154da9053 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 6 Apr 2002 14:51:03 +0000 Subject: [PATCH] fixed rest of warning for gcc 3 in /gst. Original commit message from CVS: fixed rest of warning for gcc 3 in /gst. fixed some Makefiles: s/-m486/-mcpu=i486/ disabled mpegaudioparse plugin. What good is this rotten code for anyway? --- gst/synaesthesia/synaescope.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gst/synaesthesia/synaescope.c b/gst/synaesthesia/synaescope.c index ae5ea7e03c..fcf34cdca9 100644 --- a/gst/synaesthesia/synaescope.c +++ b/gst/synaesthesia/synaescope.c @@ -147,10 +147,11 @@ static void synaescope_coreGo(void) { do { /*Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; */ if (*ptr) - - if (*ptr & 0xf0f0f0f0) + { + if (*ptr & 0xf0f0f0f0) + { *ptr = *ptr - ((*ptr & 0xf0f0f0f0) >> 4) - ((*ptr & 0xe0e0e0e0) >> 5); - else { + } else { *ptr = (*ptr * 14 >> 4) & 0x0f0f0f0f; /*Should be 29/32 to be consistent. Who cares. This is totally */ /* hacked anyway. */ @@ -160,12 +161,13 @@ static void synaescope_coreGo(void) { /*subptr[2] = (int)subptr[0] * 29 / 32; */ /*subptr[3] = (int)subptr[0] * 29 / 32; */ } + } ptr++; } while(ptr < end); heightFactor = FFT_BUFFER_SIZE/2 / syn_height + 1; actualHeight = FFT_BUFFER_SIZE/2 / heightFactor; - heightAdd = syn_height + actualHeight >> 1; + heightAdd = (syn_height + actualHeight) >> 1; /* Correct for window size */ brightFactor2 = (brightFactor/65536.0/FFT_BUFFER_SIZE)*