Gapless works again (I think). Bit of cleaning up as well.

git-svn-id: http://svn.xiph.org/trunk/speex@11342 0101bb08-14d6-0310-b084-bc0e0c8e3800

1 files changed, 4 insertions, 4 deletions

diff --git a/libspeex/nb_celp.c b/libspeex/nb_celp.c
index 18f7bee..bd50d26 100644
--- a/libspeex/nb_celp.c
+++ b/libspeex/nb_celp.c
@@ -1732,11 +1732,11 @@ int nb_decode(void *state, SpeexBits *bits, void *vout)
 #ifdef NEW_ENHANCER
    if (st->lpc_enh_enabled && SUBMODE(comb_gain)>0 && !st->count_lost)
    {
-      multicomb(st->exc-40, out, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
-      multicomb(st->exc+40, out+80, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
+      multicomb(st->exc-st->subframeSize, out, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
+      multicomb(st->exc+st->subframeSize, out+2*st->subframeSize, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
    } else {
       for (i=0;i<st->frameSize;i++)
-         out[i]=PSHR32(st->exc[i-40],SIG_SHIFT);
+         out[i]=PSHR32(st->exc[i-st->subframeSize],SIG_SHIFT);
    }
 #endif
    
@@ -2106,7 +2106,7 @@ int nb_decoder_ctl(void *state, int request, void *ptr)
       (*(int*)ptr)=0;
 #endif
       break;
-      case SPEEX_GET_PI_GAIN:
+   case SPEEX_GET_PI_GAIN:
       {
          int i;
          spx_word32_t *g = (spx_word32_t*)ptr;