[PD-cvs] externals/iemlib/src/iem_mp3 mp3play~.c,1.1,1.2
IOhannes m zmölnig
zmoelnig at users.sourceforge.net
Sun Nov 12 13:57:32 CET 2006
Update of /cvsroot/pure-data/externals/iemlib/src/iem_mp3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6334/iem_mp3
Modified Files:
mp3play~.c
Log Message:
reduced compiler warnings by avoiding variable shadowing
Index: mp3play~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iemlib/src/iem_mp3/mp3play~.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mp3play~.c 8 Nov 2006 16:24:19 -0000 1.1
--- mp3play~.c 12 Nov 2006 12:57:30 -0000 1.2
***************
*** 772,776 ****
static int decodeMP3(struct iemmp3Struct *mp, char *in, int isize, char *out, int osize, int *done)
{
! int len,error=1;
iemmp3_gmp = mp;
--- 772,776 ----
static int decodeMP3(struct iemmp3Struct *mp, char *in, int isize, char *out, int osize, int *done)
{
! int len,err=1;
iemmp3_gmp = mp;
***************
*** 837,842 ****
if(mp->fr.error_protection)
getbits(16);
! do_layer3(&mp->fr,(unsigned char *) out,done,&error);
! if(!error)
return MP3_EX;
--- 837,842 ----
if(mp->fr.error_protection)
getbits(16);
! do_layer3(&mp->fr,(unsigned char *) out,done,&err);
! if(!err)
return MP3_EX;
***************
*** 988,1000 ****
for(cb=3;cb<13;cb++)
{
! int l = (*bdf++) >> 1;
for(lwin=0;lwin<3;lwin++)
{
! *mp++ = l;
*mp++ = i + lwin;
*mp++ = lwin;
*mp++ = cb;
}
! i += 6*l;
}
iemmp3_mapend[j][0] = mp;
--- 988,1000 ----
for(cb=3;cb<13;cb++)
{
! int l1 = (*bdf++) >> 1;
for(lwin=0;lwin<3;lwin++)
{
! *mp++ = l1;
*mp++ = i + lwin;
*mp++ = lwin;
*mp++ = cb;
}
! i += 6*l1;
}
iemmp3_mapend[j][0] = mp;
***************
*** 1004,1016 ****
for(i=0,cb=0;cb<13;cb++)
{
! int l = (*bdf++) >> 1;
for(lwin=0;lwin<3;lwin++)
{
! *mp++ = l;
*mp++ = i + lwin;
*mp++ = lwin;
*mp++ = cb;
}
! i += 6*l;
}
iemmp3_mapend[j][1] = mp;
--- 1004,1016 ----
for(i=0,cb=0;cb<13;cb++)
{
! int l1 = (*bdf++) >> 1;
for(lwin=0;lwin<3;lwin++)
{
! *mp++ = l1;
*mp++ = i + lwin;
*mp++ = lwin;
*mp++ = cb;
}
! i += 6*l1;
}
iemmp3_mapend[j][1] = mp;
***************
*** 1176,1190 ****
{
unsigned long head;
! int error=1;
! head = read_buf_byte(mp,&error);
head <<= 8;
! head |= read_buf_byte(mp,&error);
head <<= 8;
! head |= read_buf_byte(mp,&error);
head <<= 8;
! head |= read_buf_byte(mp,&error);
mp->header = head;
! return(error);
}
--- 1176,1190 ----
{
unsigned long head;
! int err=1;
! head = read_buf_byte(mp,&err);
head <<= 8;
! head |= read_buf_byte(mp,&err);
head <<= 8;
! head |= read_buf_byte(mp,&err);
head <<= 8;
! head |= read_buf_byte(mp,&err);
mp->header = head;
! return(err);
}
More information about the Pd-cvs
mailing list