First shot at the continuous balance code. Analysis is not correct yet.

Monty

svn path=/trunk/vorbis/; revision=80

1 files changed, 1 insertions, 14 deletions

diff --git a/lib/synthesis.c b/lib/synthesis.c
index 96687bc9..52dd538f 100644
--- a/lib/synthesis.c
+++ b/lib/synthesis.c
@@ -28,6 +28,7 @@ int vorbis_synthesis(vorbis_block *vb){
   int i;
   vorbis_info *vi=&vb->vd->vi;
   double *window=vb->vd->window[vb->W][vb->lW][vb->nW];
+  lpc_lookup *vl=&vb->vd->vl[vb->W];
 
   /* get the LSP params back to LPC params. This will be for each
      spectral floor curve */
@@ -41,20 +42,6 @@ int vorbis_synthesis(vorbis_block *vb){
     vorbis_lpc_apply(vb->pcm[i],vb->pcmend,vb->lpc[vi->floormap[i]],
     vb->amp[vi->floormap[i]],vi->floororder);*/
   
-  /* XXXX Mix back from C+D stereo now */
-  {
-    int i;
-    int n=vb->pcmend;
-    double *C=vb->pcm[0]+n/2;
-    double *D=vb->pcm[1]+n/2;
-    double *L=vb->pcm[0];
-    double *R=vb->pcm[1];
-    for(i=0;i<n/2;i++){
-      L[i]=C[i]+D[i];
-      R[i]=C[i]-D[i];
-    }
-  }    
-
   for(i=0;i<vb->pcm_channels;i++)
     mdct_backward(&vb->vd->vm[vb->W],vb->pcm[i],vb->pcm[i],window);
   _ve_envelope_apply(vb,1);