Changeset 110 for mppenc/trunk/src/mppenc.c

Timestamp:

11/10/06 23:07:17 (18 years ago)

Author:

zorg

Message:

Cosmetics
Remove one annoying warning

File:

• mppenc/trunk/src/mppenc.c (modified) (5 diffs)

mppenc/trunk/src/mppenc.c

@@ -184 +184 @@
              "  --thumb          (--quality 3.00)   low/medium quality    (~  90 kbps)\n"
              "  --radio          (--quality 4.00)   medium quality        (~ 130 kbps)\n"
-             "  --standard       (--quality 5.00)   high quality, (dflt)  (~ 180 kbps)\n"
+             "  --standard       (--quality 5.00)   high quality  (dflt)  (~ 180 kbps)\n"
              "   (or --normal)\n"
              "  --extreme        (--quality 6.00)   excellent quality     (~ 210 kbps)\n"
@@ -219 +219 @@
              "                   ean/upc, year, releasedate, genre, media, index, isrc,\n"
              "                   abstract, bibliography, introplay, media, language, ...\n"
-             "  --unicode        unicode input from console\n"
+             "  --unicode        unicode input from console (unix only)\n"
              "\n" );
 
@@ -241 +241 @@
     stderr_printf (
              "  --scale x,y      scale input signal, separate for each channel\n" );
+    stderr_printf (
+             "\n" );
 
     stderr_printf (
@@ -761 +763 @@
 
 static void
-Allocate ( const int MaxBand, int* res, float* x, int* scf, const float* comp, const float* smr, const SCFTriple* Pow, const int* Transient )
+Allocate ( const int MaxBand, int* res, float* x, int* scf, const float* comp, const float* smr, const float* Pow[32], const int* Transient )
 {
     int    Band;
@@ -1798 +1800 @@
             }
 
-            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, (const SCFTriple*) Power_L, Transient );   // allocate bits for left + right channel
-            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, (const SCFTriple*) Power_R, Transient );
+            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, (const float**) Power_L, Transient );   // allocate bits for left + right channel
+            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, (const float**) Power_R, Transient );
 
             Quantisierung ( Max_Band, Res_L, Res_R, X, Q );             // quantize samples