incremental commit. bassrumble should be dead, as most (but not all) flutter

svn path=/branches/branch_monty_20010708/vorbis/; revision=1713

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/modes/mode_A.h b/lib/modes/mode_A.h
index 6b4e4b58..b9751667 100644
--- a/lib/modes/mode_A.h
+++ b/lib/modes/mode_A.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.14.4.5.2.6 2001/08/08 04:20:06 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.14.4.5.2.7 2001/08/08 05:17:18 xiphmont Exp $
 
  ********************************************************************/
 
@@ -179,8 +179,8 @@ static vorbis_info_psy _psy_set_A0={
   5, 5, 10,
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
-  {-20,-20,-20,-20,-20,-20,-20,-10,  0,  0,  0,  0,  0,  1,  1,  2,  3},
-  {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.7f,.8f,.9f,.9f,.9f},
+  {-30,-30,-30,-30,-30,-30,-30,-20,  0,  0,  0,  0,  0,  1,  1,  2,  3},
+  {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.8f,.9f,.9f,.9f},
 
   95.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
@@ -196,7 +196,7 @@ static vorbis_info_psy _psy_set_A={
   0.f,
 
   /* tonemask */
-  1,  0.f,&_vp_tonemask_A,
+  1,  0.f,&_vp_tonemask_consbass_A,
   /* peakattp */
   1,  &_vp_peakatt_A,
 
@@ -206,7 +206,7 @@ static vorbis_info_psy _psy_set_A={
       10,10,100,
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
-  { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0},
+  {  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0},
   {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
 
   95.f,  /* even decade + 5 is important; saves an rint() later in a
diff --git a/lib/res0.c b/lib/res0.c
index 61f0fa94..3e03cbac 100644
--- a/lib/res0.c
+++ b/lib/res0.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.32.2.5 2001/08/08 04:19:58 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.32.2.6 2001/08/08 05:17:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -562,7 +562,7 @@ static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
     }
   }
 
-  {
+  /*{
     long total=0;
     long totalbits=0;
     fprintf(stderr,"%d :: ",vb->mode);
@@ -573,7 +573,7 @@ static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
     }
 
     fprintf(stderr,":: %ld:%1.2g\n",total,(double)totalbits/total);
-  }
+    }*/
   return(0);
 }