First attempt at ifdeffing out as much of the encoder stuff as possible from Speex. Gives a smaller binary and allows me to remove a couple more files from SOURCES.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15394 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 19 deletions

diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c
index c67197144c..cd6da32476 100644
--- a/apps/codecs/libspeex/sb_celp.c
+++ b/apps/codecs/libspeex/sb_celp.c
@@ -185,7 +185,7 @@ static const float h0[64] = {
 
 extern const spx_word16_t lpc_window[];
 
-#if 0 
+#ifndef SPEEX_DISABLE_ENCODER 
 void *sb_encoder_init(const SpeexMode *m)
 {
    int i;
@@ -751,18 +751,6 @@ int sb_encode(void *state, void *vin, SpeexBits *bits)
 
    return 1;
 }
-#else
-void *sb_encoder_init(const SpeexMode *m)
-{
-    return NULL;
-}
-void sb_encoder_destroy(void *state)
-{
-}
-int sb_encode(void *state, void *vin, SpeexBits *bits)
-{
-    return 1;
-}
 #endif
 
 
@@ -1127,7 +1115,7 @@ int sb_decode(void *state, SpeexBits *bits, void *vout)
    return 0;
 }
 
-#if 0
+#ifndef SPEEX_DISABLE_ENCODER
 int sb_encoder_ctl(void *state, int request, void *ptr)
 {
    SBEncState *st;
@@ -1375,11 +1363,6 @@ int sb_encoder_ctl(void *state, int request, void *ptr)
    }
    return 0;
 }
-#else
-int sb_encoder_ctl(void *state, int request, void *ptr)
-{
-    return 0;
-}
 #endif
 
 int sb_decoder_ctl(void *state, int request, void *ptr)