1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
From: Daniel Svensson <dsvensson@gmail.com>
Date: Thu, 30 Jan 2014 01:03:26 +0100
Subject: OTHER: Let the compiler figure out what to inline.
No change in CPU usage on Linux, and skipping inline unbreaks
the build on Mac OS X.
---
src/plugins/equalizer/iir.c | 2 +-
src/plugins/equalizer/iir.h | 6 +++---
src/plugins/equalizer/iir_fpu.c | 2 +-
src/plugins/equalizer/iir_sse.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/equalizer/iir.c b/src/plugins/equalizer/iir.c
index 0518147..6ce9e5d 100644
--- a/src/plugins/equalizer/iir.c
+++ b/src/plugins/equalizer/iir.c
@@ -65,7 +65,7 @@ void config_iir(int srate, int bands, int original)
/* Round function provided by Frank Klemm which saves around 100K
* CPU cycles in my PIII for each call to the IIR function with 4K samples
*/
-__inline__ int round_trick(float floatvalue_to_round)
+int round_trick(float floatvalue_to_round)
{
float floattmp ;
int rounded_value ;
diff --git a/src/plugins/equalizer/iir.h b/src/plugins/equalizer/iir.h
index d6ae98f..95e4b5e 100644
--- a/src/plugins/equalizer/iir.h
+++ b/src/plugins/equalizer/iir.h
@@ -57,13 +57,13 @@ void set_gain(int index, int chn, float val);
void set_preamp(int chn, float val);
-__inline__ int iir(void *d, int length, int nch, int extra_filtering);
+int iir(void *d, int length, int nch, int extra_filtering);
#ifdef ARCH_X86
-__inline__ int round_trick(float floatvalue_to_round);
+int round_trick(float floatvalue_to_round);
#endif
#ifdef ARCH_PPC
-__inline__ int round_ppc(float x);
+int round_ppc(float x);
#endif
#define EQ_CHANNELS 2
diff --git a/src/plugins/equalizer/iir_fpu.c b/src/plugins/equalizer/iir_fpu.c
index 119193e..3b4f55f 100644
--- a/src/plugins/equalizer/iir_fpu.c
+++ b/src/plugins/equalizer/iir_fpu.c
@@ -55,7 +55,7 @@ void clean_history(void)
di = 0;
}
-__inline__ int iir(void *d, int length, int nch, int extra_filtering)
+int iir(void *d, int length, int nch, int extra_filtering)
{
/* FTZ_ON; */
short *data = d;
diff --git a/src/plugins/equalizer/iir_sse.c b/src/plugins/equalizer/iir_sse.c
index 64054a2..878e8a9 100644
--- a/src/plugins/equalizer/iir_sse.c
+++ b/src/plugins/equalizer/iir_sse.c
@@ -100,7 +100,7 @@ static void setup_gain(int count_start)
gain[count_start/4][j].f[count_start%4] = 0.;
}
-__inline__ int iir(void *d, int length, int nch, int extra_filtering)
+int iir(void *d, int length, int nch, int extra_filtering)
{
/* Turn ON Flush-to-zero mode to avoid exceptions on underflow */
FTZ_ON;
|