[libtremor] fixed C89 incompatibilities

This commit is contained in:
EkeEke 2013-06-17 22:40:54 +02:00
parent aede1b9299
commit 0825f0f2d8
3 changed files with 4 additions and 22 deletions

View File

@ -1,5 +0,0 @@
make -f Makefile.wii
make -f Makefile.gc
rm *.elf
cp genplus_wii.dol boot.dol
pause

View File

@ -237,10 +237,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
pcmbundle,zerobundle,ch_in_bundle); pcmbundle,zerobundle,ch_in_bundle);
} }
//for(j=0;j<vi->channels;j++)
//_analysis_output("coupled",seq+j,vb->pcm[j],-8,n/2,0,0);
/* channel coupling */ /* channel coupling */
for(i=info->coupling_steps-1;i>=0;i--){ for(i=info->coupling_steps-1;i>=0;i--){
ogg_int32_t *pcmM=vb->pcm[info->coupling_mag[i]]; ogg_int32_t *pcmM=vb->pcm[info->coupling_mag[i]];
@ -269,9 +265,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
} }
} }
//for(j=0;j<vi->channels;j++)
//_analysis_output("residue",seq+j,vb->pcm[j],-8,n/2,0,0);
/* compute and apply spectral envelope */ /* compute and apply spectral envelope */
for(i=0;i<vi->channels;i++){ for(i=0;i<vi->channels;i++){
ogg_int32_t *pcm=vb->pcm[i]; ogg_int32_t *pcm=vb->pcm[i];
@ -280,9 +273,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
inverse2(vb,look->floor_look[submap],floormemo[i],pcm); inverse2(vb,look->floor_look[submap],floormemo[i],pcm);
} }
//for(j=0;j<vi->channels;j++)
//_analysis_output("mdct",seq+j,vb->pcm[j],-24,n/2,0,1);
/* transform the PCM data; takes PCM vector, vb; modifies PCM vector */ /* transform the PCM data; takes PCM vector, vb; modifies PCM vector */
/* only MDCT right now.... */ /* only MDCT right now.... */
for(i=0;i<vi->channels;i++){ for(i=0;i<vi->channels;i++){
@ -290,9 +280,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
mdct_backward(n,pcm,pcm); mdct_backward(n,pcm,pcm);
} }
//for(j=0;j<vi->channels;j++)
//_analysis_output("imdct",seq+j,vb->pcm[j],-24,n,0,0);
/* window the data */ /* window the data */
for(i=0;i<vi->channels;i++){ for(i=0;i<vi->channels;i++){
ogg_int32_t *pcm=vb->pcm[i]; ogg_int32_t *pcm=vb->pcm[i];
@ -304,9 +291,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
} }
//for(j=0;j<vi->channels;j++)
//_analysis_output("window",seq+j,vb->pcm[j],-24,n,0,0);
seq+=vi->channels; seq+=vi->channels;
/* all done! */ /* all done! */
return(0); return(0);

View File

@ -56,7 +56,7 @@ void _vorbis_apply_window(ogg_int32_t *d,const void *window_p[2],
long *blocksizes, long *blocksizes,
int lW,int W,int nW){ int lW,int W,int nW){
LOOKUP_T *window[2]={window_p[0],window_p[1]}; LOOKUP_T *window[2];
long n=blocksizes[W]; long n=blocksizes[W];
long ln=blocksizes[lW]; long ln=blocksizes[lW];
long rn=blocksizes[nW]; long rn=blocksizes[nW];
@ -69,6 +69,9 @@ void _vorbis_apply_window(ogg_int32_t *d,const void *window_p[2],
int i,p; int i,p;
window[0]=window_p[0];
window[1]=window_p[1];
for(i=0;i<leftbegin;i++) for(i=0;i<leftbegin;i++)
d[i]=0; d[i]=0;