Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trim some stuff and move some defines to a more logical place.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15637 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2007-11-16 14:30:51 +00:00
parent 5398125fb3
commit 869a7e7ca6
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/codecs/libspeex/config-speex.h
View file

@ -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

11
apps/codecs/libspeex/rockbox.h
View file

@ -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;