--- orig-Makefile	2000-05-11 19:48:32.000000000 -0700
+++ Makefile	2006-08-27 12:51:15.000000000 -0700
@@ -25,14 +25,14 @@
 PG = -pg
 #PG = -fomit-frame-pointer
 OPTIM = -O9
 #OPTIM = -O -g
 REQUIRED = -DMFCMISC -DUNIX -DNDEBUG -DINLINE=inline
-ARCH = -march=pentium 
+#ARCH = -march=pentium 
 #Following TWEAKS are for gcc2.95.2 YMMV.
-TWEAKS = -finline-functions -fexpensive-optimizations -ffast-math -malign-double \
-	-mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \
+TWEAKS = -finline-functions -fexpensive-optimizations -ffast-math \
+	-funroll-loops -funroll-all-loops -pipe \
 	-fschedule-insns2 -fno-strength-reduce
 #EXTRATWEAKS = -DVBRDEBUG
 WARNING = -Wall -Wstrict-prototypes -Wmissing-prototypes
 WORKING = -DVBR -DIOFIX
 CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(EXTRATWEAKS) $(WARNING) $(WORKING)
--- orig-critband.h	2000-08-02 02:01:32.000000000 -0700
+++ critband.h	2006-08-27 12:54:48.000000000 -0700
@@ -1,342 +1,342 @@
-
-static const int FirstCriticalBand[7][27] = {
-/* 1cb0, 25 entries */
-25,
-1,
-2,
-3,
-5,
-6,
-8,
-9,
-11,
-13,
-15,
-17,
-20,
-23,
-27,
-32,
-37,
-45,
-52,
-62,
-74,
-88,
-108,
-132,
-180,
-232,
-0,
-/* 1cb1, 26 entries */
-26,
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-9,
-10,
-12,
-14,
-16,
-19,
-21,
-25,
-29,
-35,
-41,
-50,
-58,
-68,
-82,
-100,
-124,
-164,
-216,
-/* 1cb2, 24 entries */
-24,
-1,
-3,
-5,
-7,
-9,
-11,
-13,
-15,
-18,
-21,
-24,
-27,
-32,
-37,
-44,
-52,
-62,
-74,
-88,
-104,
-124,
-148,
-184,
-240,
-0, 0,
-/* 1cb3, 0 entries (all dummies) */
-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,  
-/* 1cb4, 23 entries */
-23,
-2,
-5,
-7,
-10,
-12,
-15,
-18,
-21,
-25,
-29,
-34,
-39,
-46,
-54,
-62,
-74,
-88,
-104,
-124,
-148,
-176,
-212,
-240,
-0, 0, 0,
-/* 1cb5, 23 entries */
-23,
-2,
-4,
-7,
-9,
-11,
-14,
-17,
-20,
-23,
-27,
-31,
-36,
-42,
-50,
-58,
-68,
-82,
-96,
-116,
-136,
-164,
-196,
-240,
-0, 0, 0,
-/* 1cb6, 21 entries */
-21,
-3,
-7,
-10,
-13,
-17,
-21,
-25,
-30,
-35,
-40,
-47,
-54,
-62,
-74,
-86,
-104,
-124,
-144,
-172,
-204,
-240,
-0, 0, 0, 0, 0
-};
-
-
-const int SecondCriticalBand[7][28] = {
-/* 2cb0, 27 entries */
-27, 
-1,
-2,
-3,
-5,
-7,
-10,
-13,
-16,
-19,
-22,
-26,
-30,
-35,
-40,
-46,
-54,
-64,
-76,
-90,
-104,
-124,
-148,
-176,
-216,
-264,
-360,
-464,
-/* 2cb1, 27 entries */
-27,
-1,
-2,
-3,
-5,
-7,
-9,
-12,
-14,
-17,
-20,
-24,
-27,
-32,
-37,
-42,
-50,
-58,
-70,
-82,
-100,
-116,
-136,
-164,
-200,
-248,
-328,
-432,
-/* 2cb2, 25 entries */
-25,
-1,
-3,
-6,
-10,
-13,
-17,
-21,
-25,
-30,
-35,
-41,
-47,
-54,
-64,
-74,
-88,
-104,
-124,
-148,
-176,
-208,
-248,
-296,
-368,
-480,
-0, 0,
-/* 2cb3, 0 entries (all dummies) */
-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,  
-/* 2cb4, 24 entries */
-24,
-1,
-5,
-9,
-14,
-19,
-25,
-30,
-36,
-43,
-50,
-58,
-68,
-78,
-92,
-108,
-124,
-148,
-176,
-208,
-248,
-296,
-352,
-424,
-480,
-0, 0, 0,
-/* 2cb5, 24 entries */
-24,
-1,
-4,
-9,
-13,
-18,
-23,
-28,
-33,
-39,
-46,
-54,
-62,
-72,
-84,
-100,
-116,
-136,
-164,
-192,
-232,
-272,
-328,
-392,
-480,
-0, 0, 0,
-/* 2cb6, 22 entries */
-22,
-1,
-6,
-13,
-20,
-27,
-34,
-42,
-50,
-60,
-70,
-80,
-94,
-108,
-124,
-148,
-172,
-208,
-248,
-288,
-344,
-408,
-480,
-0, 0, 0, 0, 0
-};
-
+
+static const int FirstCriticalBand[7][27] = {
+/* 1cb0, 25 entries */
+{25,
+1,
+2,
+3,
+5,
+6,
+8,
+9,
+11,
+13,
+15,
+17,
+20,
+23,
+27,
+32,
+37,
+45,
+52,
+62,
+74,
+88,
+108,
+132,
+180,
+232,
+0},
+/* 1cb1, 26 entries */
+{26,
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+9,
+10,
+12,
+14,
+16,
+19,
+21,
+25,
+29,
+35,
+41,
+50,
+58,
+68,
+82,
+100,
+124,
+164,
+216},
+/* 1cb2, 24 entries */
+{24,
+1,
+3,
+5,
+7,
+9,
+11,
+13,
+15,
+18,
+21,
+24,
+27,
+32,
+37,
+44,
+52,
+62,
+74,
+88,
+104,
+124,
+148,
+184,
+240,
+0, 0},
+/* 1cb3, 0 entries (all dummies) */
+{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},
+/* 1cb4, 23 entries */
+{23,
+2,
+5,
+7,
+10,
+12,
+15,
+18,
+21,
+25,
+29,
+34,
+39,
+46,
+54,
+62,
+74,
+88,
+104,
+124,
+148,
+176,
+212,
+240,
+0, 0, 0},
+/* 1cb5, 23 entries */
+{23,
+2,
+4,
+7,
+9,
+11,
+14,
+17,
+20,
+23,
+27,
+31,
+36,
+42,
+50,
+58,
+68,
+82,
+96,
+116,
+136,
+164,
+196,
+240,
+0, 0, 0},
+/* 1cb6, 21 entries */
+{21,
+3,
+7,
+10,
+13,
+17,
+21,
+25,
+30,
+35,
+40,
+47,
+54,
+62,
+74,
+86,
+104,
+124,
+144,
+172,
+204,
+240,
+0, 0, 0, 0, 0}
+};
+
+
+const int SecondCriticalBand[7][28] = {
+/* 2cb0, 27 entries */
+{27, 
+1,
+2,
+3,
+5,
+7,
+10,
+13,
+16,
+19,
+22,
+26,
+30,
+35,
+40,
+46,
+54,
+64,
+76,
+90,
+104,
+124,
+148,
+176,
+216,
+264,
+360,
+464},
+/* 2cb1, 27 entries */
+{27,
+1,
+2,
+3,
+5,
+7,
+9,
+12,
+14,
+17,
+20,
+24,
+27,
+32,
+37,
+42,
+50,
+58,
+70,
+82,
+100,
+116,
+136,
+164,
+200,
+248,
+328,
+432},
+/* 2cb2, 25 entries */
+{25,
+1,
+3,
+6,
+10,
+13,
+17,
+21,
+25,
+30,
+35,
+41,
+47,
+54,
+64,
+74,
+88,
+104,
+124,
+148,
+176,
+208,
+248,
+296,
+368,
+480,
+0, 0},
+/* 2cb3, 0 entries (all dummies) */
+{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},
+/* 2cb4, 24 entries */
+{24,
+1,
+5,
+9,
+14,
+19,
+25,
+30,
+36,
+43,
+50,
+58,
+68,
+78,
+92,
+108,
+124,
+148,
+176,
+208,
+248,
+296,
+352,
+424,
+480,
+0, 0, 0},
+/* 2cb5, 24 entries */
+{24,
+1,
+4,
+9,
+13,
+18,
+23,
+28,
+33,
+39,
+46,
+54,
+62,
+72,
+84,
+100,
+116,
+136,
+164,
+192,
+232,
+272,
+328,
+392,
+480,
+0, 0, 0},
+/* 2cb6, 22 entries */
+{22,
+1,
+6,
+13,
+20,
+27,
+34,
+42,
+50,
+60,
+70,
+80,
+94,
+108,
+124,
+148,
+172,
+208,
+248,
+288,
+344,
+408,
+480,
+0, 0, 0, 0, 0}
+};
+
--- orig-get_audio.c	2000-08-16 03:04:58.000000000 -0700
+++ get_audio.c	2006-08-27 12:49:00.000000000 -0700
@@ -46,17 +46,17 @@
         {
           fprintf( stderr, "byte order not determined\n" );
           exit( 1 );
         }
     }
-  if ( NativeByteOrder != order_littleEndian || (glopts.byteswap==TRUE))
+  if ( (NativeByteOrder != order_littleEndian) ^ (glopts.byteswap==TRUE))
     SwapBytesInWords( sample_buffer, samples_read );
 
   samples_to_read -= samples_read;
   if (samples_read < frame_size && samples_read > 0)
     {
-      fprintf(stderr, "Insufficient PCM input for one frame - fillout with zeros\n");
+      fprintf(stderr, "\nInsufficient PCM input for one frame - fillout with zeros\n");
       for (; samples_read < frame_size; sample_buffer[samples_read++] = 0);
       samples_to_read = 0;
     }
   return(samples_read);
 }
--- orig-psycho_I.c	2000-08-02 02:10:10.000000000 -0700
+++ psycho_I.c	2006-08-27 12:49:00.000000000 -0700
@@ -293,11 +293,11 @@
     {    /* calculate power density spectrum */
       if (energy[i] < 1E-20)
         power[i].x = -200.0 + POWERNORM;
       else
         power[i].x = 10 * log10(energy[i]) + POWERNORM;
-      power[i].next = STOP;
+      power[i].next = LAST;
       power[i].type = FALSE;
     }
 
   /* Combined LONDONs pick_max criteria.
      Not really sure of the difference between LONDON and the other one 
@@ -376,11 +376,11 @@
               power[first].x = add_db(power[first].x, tmp);
             }
           for(j=1;j<=run;j++)
             {
               power[first-j].x = power[first+j].x = DBMIN;
-              power[first-j].next = power[first+j].next = STOP;
+              power[first-j].next = power[first+j].next = LAST;
               power[first-j].type = power[first+j].type = FALSE;
             }
           last_but_one=last;
           last = first;
           first = power[first].next;
@@ -390,11 +390,11 @@
           int ll;
           if(last == LAST); /* *tone = power[first].next; dpwe */
           else power[last].next = power[first].next;
           ll = first;
           first = power[first].next;
-          power[ll].next = STOP;
+          power[ll].next = LAST;
         }
     }
 }
 
 /****************************************************************
--- orig-toolame.c	2000-08-16 03:03:24.000000000 -0700
+++ toolame.c	2006-08-27 12:49:00.000000000 -0700
@@ -164,13 +164,14 @@
   stereo = fr_ps.stereo;
   error_protection = info.error_protection;
 
   while ( get_audio(musicin, buffer, num_samples, stereo, &info) > 0 )
     {
-      if (++frameNum%10==0)
-        fprintf(stderr, "[%4u]\r", frameNum);
-      fflush(stderr);
+      if (0==(127&++frameNum)) {
+        fputc('.', stderr);
+        fflush(stderr);
+      }
       win_buf[0] = &buffer[0][0];
       win_buf[1] = &buffer[1][0];
 
 #ifdef VBR
       //info.bitrate_index=12;
