remove additional C++ comments

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

diff --git a/lib/modes/mode_22c_Z.h b/lib/modes/mode_22c_Z.h
index c29f24e..7e31eb3 100644 (file)
--- a/lib/modes/mode_22c_Z.h
+++ b/lib/modes/mode_22c_Z.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes; 22kHz stereo ~32kbps true VBR
- last mod: $Id: mode_22c_Z.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+ last mod: $Id: mode_22c_Z.h,v 1.2 2001/08/21 19:05:08 giles Exp $
 
  ********************************************************************/
 
@@ -107,7 +107,7 @@ static vorbis_info_psy _psy_set_22c_Z0={
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
   {-20,-20,-20,-20,-20,-20,-20, -26,-25,-25,-25,-25,-25, -26,-27,-20,-20},
-  //{-20,-20,-20,-20,-20,-10,-10, -5,  3,  3,  5,  5,  5,  6,  7, 10,  10},
+/*{-20,-20,-20,-20,-20,-10,-10, -5,  3,  3,  5,  5,  5,  6,  7, 10,  10},*/
   {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
 
   95.f,  /* even decade + 5 is important; saves an rint() later in a
@@ -132,11 +132,11 @@ static vorbis_info_psy _psy_set_22c_ZT={
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
   {-20,-20,-20,-20,-20,-20,-20, -26,-25,-25,-25,-25,-25, -26,-27,-20,-20},
-  //{-20,-20,-20,-20,-20,-10,-10, -6,  5,  5,  5,  5,  5,   6,  7, 10, 10},
-  //{1.f,1.f,1.f,1.f,1.f,1.f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.88f,.89f,.9f,.9f},
+/*{-20,-20,-20,-20,-20,-10,-10, -6,  5,  5,  5,  5,  5,   6,  7, 10, 10},
+  {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.88f,.89f,.9f,.9f},
 
-  //{-20,-20,-20,-20,-20,-20,-20,-6,  -3, -3,  0,  0,  0,   3,  5, 10, 10},
-  //{-20,-20,-15,-15,-15,-15,-10,-3,  -3, 0,  0,  0,  2,   4,  6, 10, 10},
+  {-20,-20,-20,-20,-20,-20,-20,-6,  -3, -3,  0,  0,  0,   3,  5, 10, 10},
+  {-20,-20,-15,-15,-15,-15,-10,-3,  -3, 0,  0,  0,  2,   4,  6, 10, 10},*/
   {1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f},
 
 

diff --git a/lib/psytune.c b/lib/psytune.c
index 4f2e59c..61cdad4 100644 (file)
--- a/lib/psytune.c
+++ b/lib/psytune.c
@@ -12,7 +12,7 @@
 
  function: simple utility that runs audio through the psychoacoustics
            without encoding
- last mod: $Id: psytune.c,v 1.16 2001/08/13 01:36:57 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.17 2001/08/21 19:05:06 giles Exp $
 
  ********************************************************************/
 
@@ -51,7 +51,7 @@ static vorbis_info_psy_global _psy_set0G={
 static vp_part _vp_part0[]={
   {    1,9e10f, 9e10f,       1.f,9999.f},
   { 9999,  .75f, 9e10f,       .5f,9999.f},
-  //{ 9999, 1.5f, 9e10f,       .5f,9999.f},
+/*{ 9999, 1.5f, 9e10f,       .5f,9999.f},*/
   {   18,9e10f, 9e10f,       .5f,  30.f},
   { 9999,9e10f, 9e10f,       .5f,  30.f}
 };

diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index d5477bc..710daae 100644 (file)
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.12 2001/08/13 11:33:40 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.13 2001/08/21 19:05:06 giles Exp $
 
  ********************************************************************/
 
@@ -135,7 +135,7 @@ int vorbis_encode_init(vorbis_info *vi,
 
   switch(channels){
   case 2:
-    //if(rate>40000){
+/*     if(rate>40000){ */
 
     if(bpch<35000){
       mode=&info_44c_Z;
@@ -154,7 +154,7 @@ int vorbis_encode_init(vorbis_info *vi,
     }else{
       mode=&info_44c_E;
     }
-    //}
+/*     }       */
 
     break;
   default: