summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2007-11-16 14:30:51 +0000
committerThom Johansen <thomj@rockbox.org>2007-11-16 14:30:51 +0000
commit869a7e7ca67332c358c96c3b6ac591ee062528c0 (patch)
tree6f25fcd6979a58fe97e4c185708c3d9f8394deac
parent5398125fb30bf4326b29b5a7207ec0a517f09ff0 (diff)
downloadrockbox-869a7e7ca67332c358c96c3b6ac591ee062528c0.tar.gz
rockbox-869a7e7ca67332c358c96c3b6ac591ee062528c0.tar.bz2
rockbox-869a7e7ca67332c358c96c3b6ac591ee062528c0.zip
Trim some stuff and move some defines to a more logical place.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15637 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libspeex/config-speex.h16
-rw-r--r--apps/codecs/libspeex/rockbox.h11
2 files changed, 12 insertions, 15 deletions
diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h
index 31ebe80741..1378fc2a69 100644
--- a/apps/codecs/libspeex/config-speex.h
+++ b/apps/codecs/libspeex/config-speex.h
@@ -3,9 +3,6 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Make use of ARM4 assembly optimizations */
-/* #undef ARM4_ASM */
-
/* Make use of ARM4E assembly optimizations */
#if defined(CPU_ARM)
#define ARM4_ASM
@@ -31,7 +28,7 @@
/* Debug fixed-point implementation */
/* #undef FIXED_DEBUG */
-/* Compile as fixed-point */
+/* Compile target codec as fixed point */
#define FIXED_POINT
/* Define to 1 if you have the <dlfcn.h> header file. */
@@ -159,15 +156,4 @@
#define restrict __restrict
#define RELEASE 1
-#define OVERRIDE_SPEEX_ALLOC 1
-#define OVERRIDE_SPEEX_ALLOC_SCRATCH 1
-#define OVERRIDE_SPEEX_REALLOC 1
-#define OVERRIDE_SPEEX_FREE 1
-#define OVERRIDE_SPEEX_FREE_SCRATCH 1
-#define OVERRIDE_SPEEX_MOVE 1
-#define OVERRIDE_SPEEX_FATAL 1
-#define OVERRIDE_SPEEX_WARNING 1
-#define OVERRIDE_SPEEX_WARNING_INT 1
-#define OVERRIDE_SPEEX_NOTIFY 1
-#define OVERRIDE_SPEEX_PUTC 1
diff --git a/apps/codecs/libspeex/rockbox.h b/apps/codecs/libspeex/rockbox.h
index 368f1fb2d2..0f8c6d932f 100644
--- a/apps/codecs/libspeex/rockbox.h
+++ b/apps/codecs/libspeex/rockbox.h
@@ -38,57 +38,68 @@
extern struct codec_api* ci;
+#define OVERRIDE_SPEEX_ALLOC 1
static inline void *speex_alloc (int size)
{
return codec_calloc(size, 1);
}
+#define OVERRIDE_SPEEX_ALLOC_SCRATCH 1
static inline void *speex_alloc_scratch (int size)
{
return codec_calloc(size,1);
}
+#define OVERRIDE_SPEEX_REALLOC 1
static inline void *speex_realloc (void *ptr, int size)
{
return codec_realloc(ptr, size);
}
+#define OVERRIDE_SPEEX_FREE 1
static inline void speex_free (void *ptr)
{
codec_free(ptr);
}
+#define OVERRIDE_SPEEX_FREE_SCRATCH 1
static inline void speex_free_scratch (void *ptr)
{
codec_free(ptr);
}
+#define OVERRIDE_SPEEX_MOVE 1
static inline void *speex_move (void *dest, void *src, int n)
{
return memmove(dest,src,n);
}
+#define OVERRIDE_SPEEX_FATAL 1
static inline void _speex_fatal(const char *str, const char *file, int line)
{
DEBUGF("Fatal error: %s\n", str);
//exit(1);
}
+#define OVERRIDE_SPEEX_WARNING 1
static inline void speex_warning(const char *str)
{
DEBUGF("warning: %s\n", str);
}
+#define OVERRIDE_SPEEX_WARNING_INT 1
static inline void speex_warning_int(const char *str, int val)
{
DEBUGF("warning: %s %d\n", str, val);
}
+#define OVERRIDE_SPEEX_NOTIFY 1
static inline void speex_notify(const char *str)
{
DEBUGF("notice: %s\n", str);
}
+#define OVERRIDE_SPEEX_PUTC 1
static inline void _speex_putc(int ch, void *file)
{
//FILE *f = (FILE *)file;