From 6db8697910438fd063598f66a73b68d2dcd70a36 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Jan 2020 20:17:37 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro --- kmix/ksmallslider.cpp | 8 ++-- kscd/cddaslave.c | 4 +- kscd/kscdmagic/core.cpp | 4 +- kscd/kscdmagic/xlib.c | 2 +- kscd/kscdmagic/xlibwrap.cpp | 18 +++---- kscd/libwm/cddaslave.c | 4 +- kscd/libwm/plat_sun.c | 2 +- mpeglib/lib/decoder/tplayPlugin.cpp | 2 +- mpeglib/lib/mpegplay/jrevdct.cpp | 12 ++--- mpeglib/lib/splay/dct36_12.cpp | 8 ++-- mpeglib/lib/splay/dct64.cpp | 6 +-- mpeglib/lib/splay/dct64_down.cpp | 8 ++-- mpeglib/lib/splay/huffmanlookup.cpp | 2 +- mpeglib/lib/splay/mpegAudioBitWindow.cpp | 2 +- mpeglib/lib/splay/mpegAudioBitWindow.h | 8 ++-- mpeglib/lib/splay/mpegAudioStream.h | 6 +-- mpeglib/lib/splay/mpeglayer1.cpp | 2 +- mpeglib/lib/splay/mpeglayer2.cpp | 22 ++++----- mpeglib/lib/splay/mpeglayer3.cpp | 30 ++++++------ mpeglib/lib/splay/synth_Down.cpp | 8 ++-- mpeglib/lib/splay/synth_Std.cpp | 14 +++--- mpeglib/lib/util/audio/audioIO_BeOS.cpp | 2 +- mpeglib/lib/util/render/dither/colorTable8Bit.cpp | 4 +- mpg123_artsplugin/mpg123/dct64.c | 8 ++-- mpg123_artsplugin/mpg123/dct64_i386.c | 12 ++--- mpg123_artsplugin/mpg123/decode.c | 2 +- mpg123_artsplugin/mpg123/decode_2to1.c | 2 +- mpg123_artsplugin/mpg123/decode_4to1.c | 2 +- mpg123_artsplugin/mpg123/decode_i386.c | 2 +- mpg123_artsplugin/mpg123/decode_ntom.c | 2 +- mpg123_artsplugin/mpg123/layer1.c | 10 ++-- mpg123_artsplugin/mpg123/layer3.c | 56 +++++++++++----------- noatun/library/conversion.cpp | 2 +- noatun/library/noatunarts/Equalizer_impl.cpp | 12 ++--- .../noatunarts/StereoVolumeControl_impl.cpp | 12 ++--- noatun/modules/kjofol-skin/kjwidget.cpp | 2 +- noatun/modules/kjofol-skin/kjwidget.h | 2 +- noatun/modules/winskin/vis/realFFT.cpp | 8 ++-- 38 files changed, 156 insertions(+), 156 deletions(-) diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index c976d3cb..5a67a8b6 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -165,7 +165,7 @@ void gradient( TQPainter &p, bool hor, const TQRect &rect, const TQColor &ca, co int rDiff, gDiff, bDiff; int rca, gca, bca, rcb, gcb, bcb; - register int x, y; + int x, y; if ((rect.width()<=0) || (rect.height()<=0)) return; @@ -173,9 +173,9 @@ void gradient( TQPainter &p, bool hor, const TQRect &rect, const TQColor &ca, co gDiff = (gcb = cb.green()) - (gca = ca.green()); bDiff = (bcb = cb.blue()) - (bca = ca.blue()); - register int rl = rca << 16; - register int gl = gca << 16; - register int bl = bca << 16; + int rl = rca << 16; + int gl = gca << 16; + int bl = bca << 16; int rcdelta = ((1<<16) / ((!hor) ? rect.height() : rect.width())) * rDiff; int gcdelta = ((1<<16) / ((!hor) ? rect.height() : rect.width())) * gDiff; diff --git a/kscd/cddaslave.c b/kscd/cddaslave.c index 6b65c640..685023e8 100644 --- a/kscd/cddaslave.c +++ b/kscd/cddaslave.c @@ -258,8 +258,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block) { long i; long *buf32 = (long *)rawbuf; - register short *buf16 = (short *)rawbuf; - register int aval; + short *buf16 = (short *)rawbuf; + int aval; /* * Loudness transformation. Basically this is a self-adjusting diff --git a/kscd/kscdmagic/core.cpp b/kscd/kscdmagic/core.cpp index 937ac8b9..1b03534f 100644 --- a/kscd/kscdmagic/core.cpp +++ b/kscd/kscdmagic/core.cpp @@ -116,7 +116,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) { } void fadeFade() { - register unsigned long *ptr = (unsigned long*)ucoutput; + unsigned long *ptr = (unsigned long*)ucoutput; int i = outWidth*outHeight*2/4; do { //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; @@ -322,7 +322,7 @@ int coreGo() { // Asger Alstrupt's optimized 32 bit fade // (alstrup@diku.dk) - /*register unsigned long *ptr = (unsigned long*)output; + /*unsigned long *ptr = (unsigned long*)output; i = outWidth*outHeight*2/4; do { //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c index b28a0650..115b89ac 100644 --- a/kscd/kscdmagic/xlib.c +++ b/kscd/kscdmagic/xlib.c @@ -141,7 +141,7 @@ void draw_screen(xdisplay * d) #ifdef MITSHM int alloc_shm_image(xdisplay * new) { - register char *ptr; + char *ptr; int temp, size = 0, i; ptr = DisplayString(new->display); if (!ptr || (*ptr == ':') || !strncmp(ptr, "localhost:", 10) || diff --git a/kscd/kscdmagic/xlibwrap.cpp b/kscd/kscdmagic/xlibwrap.cpp index d885c727..e0ff74ba 100644 --- a/kscd/kscdmagic/xlibwrap.cpp +++ b/kscd/kscdmagic/xlibwrap.cpp @@ -138,24 +138,24 @@ void inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit) { } void screenShow(void) { - register unsigned long *ptr2 = (unsigned long*)ucoutput; + unsigned long *ptr2 = (unsigned long*)ucoutput; unsigned long *ptr1 = (unsigned long*)d->back; int i = outWidth*outHeight/4; if (lowColor) do { - register unsigned int const r1 = *(ptr2++); - register unsigned int const r2 = *(ptr2++); + unsigned int const r1 = *(ptr2++); + unsigned int const r2 = *(ptr2++); //if (r1 || r2) { #ifdef LITTLEENDIAN - register unsigned int const v = + unsigned int const v = mapping[((r1&0xe0ul)>>5)|((r1&0xe000ul)>>10)] |mapping[((r1&0xe00000ul)>>21)|((r1&0xe0000000ul)>>26)]*256U; *(ptr1++) = v | mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]*65536U |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*16777216U; #else - register unsigned int const v = + unsigned int const v = mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)] |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; *(ptr1++) = v | @@ -168,12 +168,12 @@ void screenShow(void) { do { // Asger Alstrup Nielsen's (alstrup@diku.dk) // optimized 32 bit screen loop - register unsigned int const r1 = *(ptr2++); - register unsigned int const r2 = *(ptr2++); + unsigned int const r1 = *(ptr2++); + unsigned int const r2 = *(ptr2++); //if (r1 || r2) { #ifdef LITTLEENDIAN - register unsigned int const v = + unsigned int const v = ((r1 & 0x000000f0ul) >> 4) | ((r1 & 0x0000f000ul) >> 8) | ((r1 & 0x00f00000ul) >> 12) @@ -184,7 +184,7 @@ void screenShow(void) { | ((r2 & 0x00f00000ul) << 16 -12) | ((r2 & 0xf0000000ul) << 16 -16); #else - register unsigned int const v = + unsigned int const v = ((r2 & 0x000000f0ul) >> 4) | ((r2 & 0x0000f000ul) >> 8) | ((r2 & 0x00f00000ul) >> 12) diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c index b378f95d..35e14e0f 100644 --- a/kscd/libwm/cddaslave.c +++ b/kscd/libwm/cddaslave.c @@ -307,8 +307,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block) { long i; long *buf32 = (long *)rawbuf; - register short *buf16 = (short *)rawbuf; - register int aval; + short *buf16 = (short *)rawbuf; + int aval; /* * Loudness transformation. Basically this is a self-adjusting diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c index bb87a8e2..824da881 100644 --- a/kscd/libwm/plat_sun.c +++ b/kscd/libwm/plat_sun.c @@ -807,7 +807,7 @@ int internal_audio = 1; codec_init( void ) { - register int i; + int i; char* ctlname; audio_info_t foo; audio_device_t aud_dev; diff --git a/mpeglib/lib/decoder/tplayPlugin.cpp b/mpeglib/lib/decoder/tplayPlugin.cpp index 01c44cbc..150b1ba2 100644 --- a/mpeglib/lib/decoder/tplayPlugin.cpp +++ b/mpeglib/lib/decoder/tplayPlugin.cpp @@ -169,7 +169,7 @@ void TplayPlugin::config(const char* key,const char* value,void* user_data) { void TplayPlugin::swap_block(char * buffer, int blocksize) { - register int i; + int i; char c, *p; p = buffer; diff --git a/mpeglib/lib/mpegplay/jrevdct.cpp b/mpeglib/lib/mpegplay/jrevdct.cpp index 4ffe48ab..5ca0050c 100644 --- a/mpeglib/lib/mpegplay/jrevdct.cpp +++ b/mpeglib/lib/mpegplay/jrevdct.cpp @@ -320,8 +320,8 @@ void init_pre_idct() { void j_rev_dct_sparse (DCTBLOCK data, int pos) { short int val; - register int *dp; - register int v; + int *dp; + int v; int quant; // cout << "j_rev_dct_sparse"<>=1; if(!(level || ((unsigned)pointtreelen))) { - register int xx,yy; + int xx,yy; xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment yy=(h->ylen<<1); diff --git a/mpeglib/lib/splay/mpegAudioBitWindow.cpp b/mpeglib/lib/splay/mpegAudioBitWindow.cpp index 5e63f1fc..b31be447 100644 --- a/mpeglib/lib/splay/mpegAudioBitWindow.cpp +++ b/mpeglib/lib/splay/mpegAudioBitWindow.cpp @@ -34,7 +34,7 @@ void MpegAudioBitWindow::wrap(void) { point&=(WINDOWSIZE-1); if(p>=point) { - for(register int i=4;i>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; - //register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; + //int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; bitindex++; return r; } // no range check version inline int getbits9_f(int bits) { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]); @@ -119,7 +119,7 @@ class MpegAudioBitWindow { // range check version int getbits9(int bits) { - register unsigned short a; + unsigned short a; { int offset=(bitindex>>3)&(WINDOWSIZE-1); a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]); diff --git a/mpeglib/lib/splay/mpegAudioStream.h b/mpeglib/lib/splay/mpegAudioStream.h index 9e4accc3..dba02379 100644 --- a/mpeglib/lib/splay/mpegAudioStream.h +++ b/mpeglib/lib/splay/mpegAudioStream.h @@ -59,7 +59,7 @@ class MpegAudioStream { } inline int getbits9(int bits) { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; @@ -73,7 +73,7 @@ class MpegAudioStream { } inline int getbits8() { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; @@ -88,7 +88,7 @@ class MpegAudioStream { } inline int getbit() { - register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; bitindex++; return r; diff --git a/mpeglib/lib/splay/mpeglayer1.cpp b/mpeglib/lib/splay/mpeglayer1.cpp index a32951c4..2d939d9d 100644 --- a/mpeglib/lib/splay/mpeglayer1.cpp +++ b/mpeglib/lib/splay/mpeglayer1.cpp @@ -46,7 +46,7 @@ void Mpegtoraw::extractlayer1(void) int bitalloc[MAXCHANNEL][MAXSUBBAND], sample[MAXCHANNEL][MAXSUBBAND]; - register int i,j; + int i,j; int s=stereobound,l; diff --git a/mpeglib/lib/splay/mpeglayer2.cpp b/mpeglib/lib/splay/mpeglayer2.cpp index 4012ff27..1b907a07 100644 --- a/mpeglib/lib/splay/mpeglayer2.cpp +++ b/mpeglib/lib/splay/mpeglayer2.cpp @@ -86,8 +86,8 @@ void Mpegtoraw::extractlayer2(void) { // Bitalloc { - register int i; - register const int *t=bitalloclengthtable[tableindex]; + int i; + const int *t=bitalloclengthtable[tableindex]; for(i=0;i>2][i]; + REAL t=scalefactor[LS][l>>2][i]; fraction[LS][0][i]*=t; fraction[LS][1][i]*=t; fraction[LS][2][i]*=t; @@ -411,7 +411,7 @@ void Mpegtoraw::extractlayer2(void) { fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i]; } - register REAL t=scalefactor[RS][l>>2][i]; + REAL t=scalefactor[RS][l>>2][i]; fraction[RS][0][i]*=t; fraction[RS][1][i]*=t; fraction[RS][2][i]*=t; @@ -428,7 +428,7 @@ void Mpegtoraw::extractlayer2(void) { fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i]; } - register REAL t=scalefactor[LS][l>>2][i]; + REAL t=scalefactor[LS][l>>2][i]; fraction[LS][0][i]*=t; fraction[LS][1][i]*=t; fraction[LS][2][i]*=t; diff --git a/mpeglib/lib/splay/mpeglayer3.cpp b/mpeglib/lib/splay/mpeglayer3.cpp index eeb09697..3abed128 100644 --- a/mpeglib/lib/splay/mpeglayer3.cpp +++ b/mpeglib/lib/splay/mpeglayer3.cpp @@ -337,7 +337,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr) {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}}; layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); - register layer3scalefactor *sf=(&scalefactors[ch]); + layer3scalefactor *sf=(&scalefactors[ch]); int l0,l1; { @@ -479,7 +479,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch) int sb[54]; int extendedmode=mpegAudioHeader->getExtendedmode(); layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]); - register layer3scalefactor *sf=(&scalefactors[ch]); + layer3scalefactor *sf=(&scalefactors[ch]); { int blocktypenumber,sc; @@ -641,7 +641,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y) level>>=1; if(!(level || ((unsigned)pointtreelen))) { - register int xx,yy; + int xx,yy; xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment yy=(h->ylen<<1); @@ -670,7 +670,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h, { if(h->val[point][0]==0) { /*end of tree*/ - register int t=h->val[point][1]; + int t=h->val[point][1]; if(t&8)*v=1-(wgetbit()<<1); else *v=0; if(t&4)*w=1-(wgetbit()<<1); else *w=0; @@ -754,7 +754,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT]) for(i=0;is[cb+1]-sfBandIndex->s[cb])>>1; - for(register int k=0;k<3;k++) + for(int k=0;k<3;k++) { - register REAL factor; - register int count=cb_width; + REAL factor; + int count=cb_width; // maplay12 opt. if(index+(count<<1) > arrayEnd) { if (index >= arrayEnd) break; @@ -1328,7 +1328,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) do{ if(is_pos[i]==7) { - register REAL t=in[LS][0][i]; + REAL t=in[LS][0][i]; in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; } @@ -1358,7 +1358,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) { int i=maxArray-1; do{ - register REAL t=in[LS][0][i]; + REAL t=in[LS][0][i]; in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; @@ -1488,7 +1488,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr, int version=mpegAudioHeader->getVersion(); int frequency=mpegAudioHeader->getFrequency(); int mpeg25=mpegAudioHeader->getLayer25(); - register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); + layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); if(gi->generalflag) { if(gi->mixed_block_flag) { @@ -1591,12 +1591,12 @@ void Mpegtoraw::extractlayer3(void) { } // read main data. if(issync()) { - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbyte()); } } else { // read main data. - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbits8()); } } @@ -1681,13 +1681,13 @@ void Mpegtoraw::extractlayer3_2(void) { } // read main data. if(issync()) { - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbyte()); } } else { // read main data. - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbits8()); } } diff --git a/mpeglib/lib/splay/synth_Down.cpp b/mpeglib/lib/splay/synth_Down.cpp index fbe3887b..e5a2f2e0 100644 --- a/mpeglib/lib/splay/synth_Down.cpp +++ b/mpeglib/lib/splay/synth_Down.cpp @@ -39,8 +39,8 @@ void Synthesis::computebuffer_Down(REAL *fraction, inline void Synthesis::generatesingle_Down(void) { int i; - register REAL r, *vp; - register const REAL *dp; + REAL r, *vp; + const REAL *dp; i=32/2; dp=filter; @@ -121,8 +121,8 @@ inline void Synthesis::generate_Down(void) { int i; REAL r1,r2; - register REAL *vp1,*vp2; - register const REAL *dp; + REAL *vp1,*vp2; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; diff --git a/mpeglib/lib/splay/synth_Std.cpp b/mpeglib/lib/splay/synth_Std.cpp index 6ea1d027..121e1afb 100644 --- a/mpeglib/lib/splay/synth_Std.cpp +++ b/mpeglib/lib/splay/synth_Std.cpp @@ -39,8 +39,8 @@ inline void Synthesis::computebuffer_Std(REAL *fraction, inline void Synthesis::generatesingle_Std(void) { int i; - register REAL r, *vp; - register const REAL *dp; + REAL r, *vp; + const REAL *dp; i=32; dp=filter; @@ -120,8 +120,8 @@ inline void Synthesis::generate_old(void) { int i; REAL r1,r2; - register REAL *vp1,*vp2; - register const REAL *dp; + REAL *vp1,*vp2; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; @@ -195,14 +195,14 @@ inline void Synthesis::generate_Std(void) int i; REAL r1,r2; - register REAL *vp1; - register const REAL *dp; + REAL *vp1; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; // we calculate cp2 from vp1 because they are both // in the same array. code was: - // register REAL* vp2 + // REAL* vp2 //vp2=calcbuffer[RS][currentcalcbuffer]+calcbufferoffset; i=32; diff --git a/mpeglib/lib/util/audio/audioIO_BeOS.cpp b/mpeglib/lib/util/audio/audioIO_BeOS.cpp index ae4cf5a1..ff73cd57 100644 --- a/mpeglib/lib/util/audio/audioIO_BeOS.cpp +++ b/mpeglib/lib/util/audio/audioIO_BeOS.cpp @@ -126,7 +126,7 @@ int audioRead(char *buffer, int count) { //printf("acquiring ok_to_read (%d bytes)\n", count); if (acquire_sem(ok_to_read)==B_NO_ERROR) { - for (register int i=0; i < count;i++) { + for (int i=0; i < count;i++) { *(buffer++)+=*(readbase++); } bytes_in_streambuf-=count; diff --git a/mpeglib/lib/util/render/dither/colorTable8Bit.cpp b/mpeglib/lib/util/render/dither/colorTable8Bit.cpp index 57c533de..fa3aa84d 100644 --- a/mpeglib/lib/util/render/dither/colorTable8Bit.cpp +++ b/mpeglib/lib/util/render/dither/colorTable8Bit.cpp @@ -59,7 +59,7 @@ void ColorTable8Bit::init8BitColor() { for (i=0; istereo) { int jsbound = fr->jsbound; - register real *f0 = fraction[0]; - register real *f1 = fraction[1]; + real *f0 = fraction[0]; + real *f1 = fraction[1]; ba = balloc; for (sample=smpb,i=0;ich[ch].gr[gr]); + struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]); gr_info->part2_3_length = getbits(&bsi,12); gr_info->big_values = getbits(&bsi,9); @@ -662,8 +662,8 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, */ int i,max[4]; int step=0,lwin=3,cb=0; - register real v = 0.0; - register int *m,mc; + real v = 0.0; + int *m,mc; if(gr_info->mixed_block_flag) { max[3] = -1; @@ -683,7 +683,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, int lp = l[i]; struct newhuff *h = ht+gr_info->table_select[i]; for(;lp;lp--,mc--) { - register int x,y; + int x,y; if( (!mc) ) { mc = *m++; xrpnt = ((real *) xr) + (*m++); @@ -699,7 +699,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, } } { - register short *val = h->table; + short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { if (mask < 0) @@ -763,7 +763,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, for(;l3 && (part2remain+num > 0);l3--) { struct newhuff *h = htc+gr_info->count1table_select; - register short *val = h->table,a; + short *val = h->table,a; REFRESH_MASK; while((a=*val++)<0) { @@ -849,7 +849,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, int i,max = -1; int cb = 0; int *m = map[sfreq][2]; - register real v = 0.0; + real v = 0.0; int mc = 0; /* @@ -876,7 +876,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, } { - register short *val = h->table; + short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { if (mask < 0) @@ -943,7 +943,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, */ for(;l3 && (part2remain+num > 0);l3--) { struct newhuff *h = htc+gr_info->count1table_select; - register short *val = h->table,a; + short *val = h->table,a; REFRESH_MASK; while((a=*val++)<0) { @@ -1191,7 +1191,7 @@ static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info) { for(ss=7;ss>=0;ss--) { /* upper and lower butterfly inputs */ - register real bu = *--xr2,bd = *xr1; + real bu = *--xr2,bd = *xr1; *xr2 = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca); *xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++); } @@ -1247,7 +1247,7 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) #endif { - register real *in = inbuf; + real *in = inbuf; in[17]+=in[16]; in[16]+=in[15]; in[15]+=in[14]; in[14]+=in[13]; in[13]+=in[12]; in[12]+=in[11]; @@ -1415,10 +1415,10 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); } { - register real *out2 = o2; - register real *w = wintab; - register real *out1 = o1; - register real *ts = tsbuf; + real *out2 = o2; + real *w = wintab; + real *out1 = o1; + real *ts = tsbuf; MACRO(0); MACRO(1); @@ -1453,11 +1453,11 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \ MACRO0(v); } - register const real *c = COS9; - register real *out2 = o2; - register real *w = wintab; - register real *out1 = o1; - register real *ts = tsbuf; + const real *c = COS9; + real *out2 = o2; + real *w = wintab; + real *out1 = o1; + real *ts = tsbuf; real ta33,ta66,tb33,tb66; @@ -1525,7 +1525,7 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) /* * new DCT12 */ -static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,register real *ts) +static void dct12(real *in,real *rawout1,real *rawout2,real *wi,real *ts) { #define DCT12_PART1 \ in5 = in[5*3]; \ @@ -1560,7 +1560,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe { real in0,in1,in2,in3,in4,in5; - register real *out1 = rawout1; + real *out1 = rawout1; ts[SBLIMIT*0] = out1[0]; ts[SBLIMIT*1] = out1[1]; ts[SBLIMIT*2] = out1[2]; ts[SBLIMIT*3] = out1[3]; ts[SBLIMIT*4] = out1[4]; ts[SBLIMIT*5] = out1[5]; @@ -1596,7 +1596,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe { real in0,in1,in2,in3,in4,in5; - register real *out2 = rawout2; + real *out2 = rawout2; DCT12_PART1 @@ -1630,7 +1630,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe { real in0,in1,in2,in3,in4,in5; - register real *out2 = rawout2; + real *out2 = rawout2; out2[12]=out2[13]=out2[14]=out2[15]=out2[16]=out2[17]=0.0; DCT12_PART1 @@ -1816,16 +1816,16 @@ int do_layer3(struct mpstr *mp,struct frame *fr,int outmode,struct audio_info_st switch(single) { case 3: { - register int i; - register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; + int i; + real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; for(i=0;imaxb;i++,in0++) *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ } break; case 1: { - register int i; - register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; + int i; + real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; for(i=0;imaxb;i++) *in0++ = *in1++; } diff --git a/noatun/library/conversion.cpp b/noatun/library/conversion.cpp index 791b5554..dbbf5b09 100644 --- a/noatun/library/conversion.cpp +++ b/noatun/library/conversion.cpp @@ -136,7 +136,7 @@ void swapEndian(unsigned long length, char *buffer) #else while (length--) { - register char c=*(buffer+1); + char c=*(buffer+1); *(buffer+1)=*buffer; *(buffer)=c; buffer++; buffer++; diff --git a/noatun/library/noatunarts/Equalizer_impl.cpp b/noatun/library/noatunarts/Equalizer_impl.cpp index 9914842a..552c3f91 100644 --- a/noatun/library/noatunarts/Equalizer_impl.cpp +++ b/noatun/library/noatunarts/Equalizer_impl.cpp @@ -209,11 +209,11 @@ public: mBufferLength = samples; } - register float *buffer=mBuffer; - register float *bufferEnd=buffer+samples; + float *buffer=mBuffer; + float *bufferEnd=buffer+samples; while (level32767.5) s=32767; @@ -102,8 +102,8 @@ void RealFFT::fft(short* buffer) { while(A