From 71778bd21ee57d105a58fa93d7a295c5dc0e3b5c Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Sun, 7 Oct 2012 15:04:24 +0200 Subject: [PATCH] pdbox: Always use fixedpoint version of math functions Change-Id: Ie5671d8f425804c9cf3265bad86eadadaf73ea1c --- apps/plugins/pdbox/PDa/extra/bandpass.c | 2 +- apps/plugins/pdbox/PDa/extra/equalizer.c | 2 +- apps/plugins/pdbox/PDa/extra/filters.h | 2 +- apps/plugins/pdbox/PDa/extra/highpass.c | 2 +- apps/plugins/pdbox/PDa/extra/highshelf.c | 2 +- apps/plugins/pdbox/PDa/extra/hlshelf.c | 2 +- apps/plugins/pdbox/PDa/extra/lowpass.c | 2 +- apps/plugins/pdbox/PDa/extra/lowshelf.c | 2 +- apps/plugins/pdbox/PDa/extra/notch.c | 2 +- apps/plugins/pdbox/PDa/src/x_acoustics.c | 2 +- apps/plugins/pdbox/PDa/src/x_arithmetic.c | 2 +- apps/plugins/pdbox/pdbox.h | 4 +++- 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/plugins/pdbox/PDa/extra/bandpass.c b/apps/plugins/pdbox/PDa/extra/bandpass.c index 09bbbacbba..5e4a80a81d 100644 --- a/apps/plugins/pdbox/PDa/extra/bandpass.c +++ b/apps/plugins/pdbox/PDa/extra/bandpass.c @@ -15,7 +15,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/equalizer.c b/apps/plugins/pdbox/PDa/extra/equalizer.c index d252e02bc9..ee88942b56 100644 --- a/apps/plugins/pdbox/PDa/extra/equalizer.c +++ b/apps/plugins/pdbox/PDa/extra/equalizer.c @@ -14,7 +14,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/filters.h b/apps/plugins/pdbox/PDa/extra/filters.h index 2eaf2b09f9..cce140154a 100644 --- a/apps/plugins/pdbox/PDa/extra/filters.h +++ b/apps/plugins/pdbox/PDa/extra/filters.h @@ -12,7 +12,7 @@ #define __GGEE_FILTERS_H__ #ifdef ROCKBOX -#include "math.h" +#include "../../math.h" #else #include #endif diff --git a/apps/plugins/pdbox/PDa/extra/highpass.c b/apps/plugins/pdbox/PDa/extra/highpass.c index 486d101170..c1b5723d7f 100644 --- a/apps/plugins/pdbox/PDa/extra/highpass.c +++ b/apps/plugins/pdbox/PDa/extra/highpass.c @@ -15,7 +15,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/highshelf.c b/apps/plugins/pdbox/PDa/extra/highshelf.c index 1be763e2bb..c252bd6a6e 100644 --- a/apps/plugins/pdbox/PDa/extra/highshelf.c +++ b/apps/plugins/pdbox/PDa/extra/highshelf.c @@ -14,7 +14,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/hlshelf.c b/apps/plugins/pdbox/PDa/extra/hlshelf.c index 61ec3a8a77..fd911250c7 100644 --- a/apps/plugins/pdbox/PDa/extra/hlshelf.c +++ b/apps/plugins/pdbox/PDa/extra/hlshelf.c @@ -5,7 +5,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #else /* ROCKBOX */ #include "../src/m_pd.h" #include diff --git a/apps/plugins/pdbox/PDa/extra/lowpass.c b/apps/plugins/pdbox/PDa/extra/lowpass.c index e88f00bb84..3c2bbb01d8 100644 --- a/apps/plugins/pdbox/PDa/extra/lowpass.c +++ b/apps/plugins/pdbox/PDa/extra/lowpass.c @@ -14,7 +14,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/lowshelf.c b/apps/plugins/pdbox/PDa/extra/lowshelf.c index 3722f8c0d4..03a025934a 100644 --- a/apps/plugins/pdbox/PDa/extra/lowshelf.c +++ b/apps/plugins/pdbox/PDa/extra/lowshelf.c @@ -14,7 +14,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/extra/notch.c b/apps/plugins/pdbox/PDa/extra/notch.c index 90b9ace06b..c2b7276908 100644 --- a/apps/plugins/pdbox/PDa/extra/notch.c +++ b/apps/plugins/pdbox/PDa/extra/notch.c @@ -14,7 +14,7 @@ #include "plugin.h" #include "../../pdbox.h" #include "../src/m_pd.h" -#include "math.h" +#include "../../math.h" #include "filters.h" #else /* ROCKBOX */ #include "../src/m_pd.h" diff --git a/apps/plugins/pdbox/PDa/src/x_acoustics.c b/apps/plugins/pdbox/PDa/src/x_acoustics.c index 7559426bec..1bb62bf1b4 100644 --- a/apps/plugins/pdbox/PDa/src/x_acoustics.c +++ b/apps/plugins/pdbox/PDa/src/x_acoustics.c @@ -11,7 +11,7 @@ #endif #include "m_pd.h" -#include +#include "../../math.h" #define LOGTEN 2.302585092994 float mtof(float f) diff --git a/apps/plugins/pdbox/PDa/src/x_arithmetic.c b/apps/plugins/pdbox/PDa/src/x_arithmetic.c index c3930b1fe8..3512480d05 100644 --- a/apps/plugins/pdbox/PDa/src/x_arithmetic.c +++ b/apps/plugins/pdbox/PDa/src/x_arithmetic.c @@ -12,7 +12,7 @@ inputs to int and their outputs back to float. */ #endif #include "m_pd.h" -#include +#include "../../math.h" /* MSW and OSX don't appear to have single-precision ANSI math */ diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h index ddc6ed2cf4..7f7c4754e0 100644 --- a/apps/plugins/pdbox/pdbox.h +++ b/apps/plugins/pdbox/pdbox.h @@ -170,7 +170,7 @@ void pd_init(void); //#ifndef SIMULATOR /*FIXME: is it a correct replacement??? */ -#if !(CONFIG_PLATFORM & PLATFORM_HOSTED) +/* #if !(CONFIG_PLATFORM & PLATFORM_HOSTED) */ #define floor rb_floor #define atof rb_atof #define atol rb_atol @@ -186,9 +186,11 @@ void pd_init(void); #define atan2 rb_atan2 #define sinh rb_sinh #define tan rb_tan +/* #else #include #endif +*/ #define ftoan rb_ftoan #undef strtok_r