diff Plugins/Input/mpg123/layer3.c @ 701:d539e5c5f730 trunk

[svn] Fixes of the remaining GCC 4.1 warnings from external contributor Diego "Flameeyes" Petteno (Gentoo).

--- a/Plugins/Input/mpg123/layer3.c	Sun Feb 26 10:21:49 2006 -0800
+++ b/Plugins/Input/mpg123/layer3.c	Sun Feb 26 13:08:35 2006 -0800
@@ -618,7 +618,7 @@
   int part2remain = gr_info->part2_3_length - part2bits;
   int *me;
 
-  int num = mpg123_getbitoffset(&bsi);
+  size_t num = mpg123_getbitoffset(&bsi);
   long mask;
   /* we must split this, because for num==0 the shift is undefined if you do it in one step */
   mask  = ((unsigned long) mpg123_getbits(&bsi,num))<<BITSHIFT;
@@ -1661,7 +1661,8 @@
 
     real *tspnt = (real *) tsOut;
     real *rawout1, *rawout2;
-    int bt, sb = 0;
+    int bt;
+    size_t sb = 0;
 
     {
         int b = blc[ch];
@@ -1774,8 +1775,7 @@
                 return 0;
 
             if (ms_stereo) {
-                int i;
-                int maxb = sideinfo.ch[0].gr[gr].maxb;
+                unsigned int i, maxb = sideinfo.ch[0].gr[gr].maxb;
 
                 if (sideinfo.ch[1].gr[gr].maxb > maxb)
                     maxb = sideinfo.ch[1].gr[gr].maxb;
@@ -1801,7 +1801,7 @@
             switch (single) {
             case 3:
                 {
-                    register int i;
+                    register unsigned int i;
                     register real *in0 = (real *) hybridIn[0],
                         *in1 = (real *) hybridIn[1];
                     for (i = 0; i < SSLIMIT * gr_info->maxb; i++, in0++)
@@ -1810,7 +1810,7 @@
                 break;
             case 1:
                 {
-                    register int i;
+                    register unsigned int i;
                     register real *in0 = (real *) hybridIn[0],
                         *in1 = (real *) hybridIn[1];
                     for (i = 0; i < SSLIMIT * gr_info->maxb; i++)