summaryrefslogtreecommitdiffstats
path: root/mpg123_artsplugin
diff options
context:
space:
mode:
Diffstat (limited to 'mpg123_artsplugin')
-rw-r--r--mpg123_artsplugin/mpg123/dct64.c8
-rw-r--r--mpg123_artsplugin/mpg123/dct64_i386.c12
-rw-r--r--mpg123_artsplugin/mpg123/decode.c2
-rw-r--r--mpg123_artsplugin/mpg123/decode_2to1.c2
-rw-r--r--mpg123_artsplugin/mpg123/decode_4to1.c2
-rw-r--r--mpg123_artsplugin/mpg123/decode_i386.c2
-rw-r--r--mpg123_artsplugin/mpg123/decode_ntom.c2
-rw-r--r--mpg123_artsplugin/mpg123/layer1.c10
-rw-r--r--mpg123_artsplugin/mpg123/layer3.c56
9 files changed, 48 insertions, 48 deletions
diff --git a/mpg123_artsplugin/mpg123/dct64.c b/mpg123_artsplugin/mpg123/dct64.c
index 59c19676..c3447a7f 100644
--- a/mpg123_artsplugin/mpg123/dct64.c
+++ b/mpg123_artsplugin/mpg123/dct64.c
@@ -18,8 +18,8 @@ void dct64(real *out0,real *out1,real *samples)
real bufs[64];
{
- register int i,j;
- register real *b1,*b2,*bs,*costab;
+ int i,j;
+ real *b1,*b2,*bs,*costab;
b1 = samples;
bs = bufs;
@@ -102,8 +102,8 @@ void dct64(real *out0,real *out1,real *samples)
{
- register real *b1;
- register int i;
+ real *b1;
+ int i;
for(b1=bufs,i=8;i;i--,b1+=4)
b1[2] += b1[3];
diff --git a/mpg123_artsplugin/mpg123/dct64_i386.c b/mpg123_artsplugin/mpg123/dct64_i386.c
index 6d42c79d..92b33aba 100644
--- a/mpg123_artsplugin/mpg123/dct64_i386.c
+++ b/mpg123_artsplugin/mpg123/dct64_i386.c
@@ -12,7 +12,7 @@
static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
{
{
- register real *costab = pnts[0];
+ real *costab = pnts[0];
b1[0x00] = samples[0x00] + samples[0x1F];
b1[0x01] = samples[0x01] + samples[0x1E];
@@ -58,7 +58,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
{
- register real *costab = pnts[1];
+ real *costab = pnts[1];
b2[0x00] = b1[0x00] + b1[0x0F];
b2[0x01] = b1[0x01] + b1[0x0E];
@@ -104,7 +104,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
}
{
- register real *costab = pnts[2];
+ real *costab = pnts[2];
b1[0x00] = b2[0x00] + b2[0x07];
b1[0x07] = (b2[0x00] - b2[0x07]) * costab[0];
@@ -144,8 +144,8 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
}
{
- register real const cos0 = pnts[3][0];
- register real const cos1 = pnts[3][1];
+ real const cos0 = pnts[3][0];
+ real const cos1 = pnts[3][1];
b2[0x00] = b1[0x00] + b1[0x03];
b2[0x03] = (b1[0x00] - b1[0x03]) * cos0;
@@ -189,7 +189,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
}
{
- register real const cos0 = pnts[4][0];
+ real const cos0 = pnts[4][0];
b1[0x00] = b2[0x00] + b2[0x01];
b1[0x01] = (b2[0x00] - b2[0x01]) * cos0;
diff --git a/mpg123_artsplugin/mpg123/decode.c b/mpg123_artsplugin/mpg123/decode.c
index 0c7036a8..328bf83a 100644
--- a/mpg123_artsplugin/mpg123/decode.c
+++ b/mpg123_artsplugin/mpg123/decode.c
@@ -152,7 +152,7 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
{
- register int j;
+ int j;
real *window = decwin + 16 - bo1;
for (j=16;j;j--,window+=0x10,samples+=step)
diff --git a/mpg123_artsplugin/mpg123/decode_2to1.c b/mpg123_artsplugin/mpg123/decode_2to1.c
index 2eb5e07d..43bc67b0 100644
--- a/mpg123_artsplugin/mpg123/decode_2to1.c
+++ b/mpg123_artsplugin/mpg123/decode_2to1.c
@@ -151,7 +151,7 @@ int synth_2to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
}
{
- register int j;
+ int j;
real *window = decwin + 16 - bo1;
for (j=8;j;j--,b0+=0x10,window+=0x30)
diff --git a/mpg123_artsplugin/mpg123/decode_4to1.c b/mpg123_artsplugin/mpg123/decode_4to1.c
index 00f6b038..c1564cd7 100644
--- a/mpg123_artsplugin/mpg123/decode_4to1.c
+++ b/mpg123_artsplugin/mpg123/decode_4to1.c
@@ -152,7 +152,7 @@ int synth_4to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
}
{
- register int j;
+ int j;
real *window = decwin + 16 - bo1;
for (j=4;j;j--,b0+=0x30,window+=0x70)
diff --git a/mpg123_artsplugin/mpg123/decode_i386.c b/mpg123_artsplugin/mpg123/decode_i386.c
index d39795f8..a16bdb09 100644
--- a/mpg123_artsplugin/mpg123/decode_i386.c
+++ b/mpg123_artsplugin/mpg123/decode_i386.c
@@ -170,7 +170,7 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
}
{
- register int j;
+ int j;
real *window = decwin + 16 - bo1;
for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)
diff --git a/mpg123_artsplugin/mpg123/decode_ntom.c b/mpg123_artsplugin/mpg123/decode_ntom.c
index 41ca0dc0..5d724400 100644
--- a/mpg123_artsplugin/mpg123/decode_ntom.c
+++ b/mpg123_artsplugin/mpg123/decode_ntom.c
@@ -184,7 +184,7 @@ int synth_ntom(real *bandPtr,int channel,unsigned char *out,int *pnt)
{
- register int j;
+ int j;
real *window = decwin + 16 - bo1;
for (j=16;j;j--,window+=0x10)
diff --git a/mpg123_artsplugin/mpg123/layer1.c b/mpg123_artsplugin/mpg123/layer1.c
index a33335ab..f5df2bb3 100644
--- a/mpg123_artsplugin/mpg123/layer1.c
+++ b/mpg123_artsplugin/mpg123/layer1.c
@@ -58,13 +58,13 @@ void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT],
int i,n;
int smpb[2*SBLIMIT]; /* values: 0-65535 */
int *sample;
- register unsigned int *ba;
- register unsigned int *sca = (unsigned int *) scale_index;
+ unsigned int *ba;
+ unsigned int *sca = (unsigned int *) scale_index;
if(fr->stereo) {
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;i<jsbound;i++) {
if ((n = *ba++))
@@ -100,7 +100,7 @@ void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT],
fraction[0][i] = fraction[1][i] = 0.0;
}
else {
- register real *f0 = fraction[0];
+ real *f0 = fraction[0];
ba = balloc;
for (sample=smpb,i=0;i<SBLIMIT;i++)
if ((n = *ba++))
diff --git a/mpg123_artsplugin/mpg123/layer3.c b/mpg123_artsplugin/mpg123/layer3.c
index b4f33510..3c91232b 100644
--- a/mpg123_artsplugin/mpg123/layer3.c
+++ b/mpg123_artsplugin/mpg123/layer3.c
@@ -387,7 +387,7 @@ static int III_get_side_info(struct III_sideinfo *si,int stereo,
for (gr=0; gr<tab[0]; gr++) {
for (ch=0; ch<stereo; ch++) {
- register struct gr_info_s *gr_info = &(si->ch[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;i<SSLIMIT*gr_info->maxb;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;i<SSLIMIT*gr_info->maxb;i++)
*in0++ = *in1++;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 11:12:25 +0000