From 27edf28be2772229a7974a007313ea30d92c3ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mpg123_artsplugin/mpg123/buffer.c | 2 +- mpg123_artsplugin/mpg123/common.c | 2 +- mpg123_artsplugin/mpg123/layer3.c | 80 +++++++++++++++++++------------------- mpg123_artsplugin/mpg123/xfermem.h | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) (limited to 'mpg123_artsplugin/mpg123') diff --git a/mpg123_artsplugin/mpg123/buffer.c b/mpg123_artsplugin/mpg123/buffer.c index 33b4c92b..3c85b654 100644 --- a/mpg123_artsplugin/mpg123/buffer.c +++ b/mpg123_artsplugin/mpg123/buffer.c @@ -95,7 +95,7 @@ void buffer_loop(struct audio_info_struct *ai, sigset_t *oldsigset) catchsignal (SIGINT, catch_interrupt); catchsignal (SIGUSR1, catch_usr1); - sigproctqmask (SIG_SETMASK, oldsigset, NULL); + sigprocmask (SIG_SETMASK, oldsigset, NULL); #ifndef NO_DECODE_AUDIO if (param.outmode == DECODE_AUDIO) { if (audio_open(ai) < 0) { diff --git a/mpg123_artsplugin/mpg123/common.c b/mpg123_artsplugin/mpg123/common.c index cd7cc121..65d658fd 100644 --- a/mpg123_artsplugin/mpg123/common.c +++ b/mpg123_artsplugin/mpg123/common.c @@ -114,7 +114,7 @@ void (*catchsignal(int signum, void(*handler)()))() #endif new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_tqmask); + sigemptyset(&new_sa.sa_mask); new_sa.sa_flags = 0; if (sigaction(signum, &new_sa, &old_sa) == -1) return ((void (*)()) -1); diff --git a/mpg123_artsplugin/mpg123/layer3.c b/mpg123_artsplugin/mpg123/layer3.c index b012047a..b4f33510 100644 --- a/mpg123_artsplugin/mpg123/layer3.c +++ b/mpg123_artsplugin/mpg123/layer3.c @@ -612,7 +612,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; #define BITSHIFT ((sizeof(long)-1)*8) #define REFRESH_MASK \ while(num < BITSHIFT) { \ - tqmask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ + mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ num += 8; \ part2remain -= 8; } @@ -626,10 +626,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, int *me; int num=getbitoffset(&bsi); - long tqmask; + long mask; /* we must split this, because for num==0 the shift is undefined if you do it in one step */ - tqmask = ((unsigned long) getbits(&bsi,num))<table; REFRESH_MASK; while((y=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= y; num--; - tqmask <<= 1; + mask <<= 1; } x = y >> 4; y &= 0xf; @@ -713,23 +713,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(x == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; - x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); - tqmask <<= 1; + mask <<= 1; } else if(x) { max[lwin] = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -737,23 +737,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(y == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; - y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); - tqmask <<= 1; + mask <<= 1; } else if(y) { max[lwin] = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -767,10 +767,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= a; num--; - tqmask <<= 1; + mask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -800,12 +800,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(tqmask < 0) + if(mask < 0) *xrpnt = -v; else *xrpnt = v; num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -879,10 +879,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, register short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= y; num--; - tqmask <<= 1; + mask <<= 1; } x = y >> 4; y &= 0xf; @@ -891,23 +891,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if (x == 15 && h->linbits) { max = cb; REFRESH_MASK; - x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); - tqmask <<= 1; + mask <<= 1; } else if(x) { max = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); @@ -915,23 +915,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if (y == 15 && h->linbits) { max = cb; REFRESH_MASK; - y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); - tqmask <<= 1; + mask <<= 1; } else if(y) { max = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); @@ -947,10 +947,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= a; num--; - tqmask <<= 1; + mask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -978,12 +978,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(tqmask < 0) + if(mask < 0) *xrpnt++ = -v; else *xrpnt++ = v; num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); diff --git a/mpg123_artsplugin/mpg123/xfermem.h b/mpg123_artsplugin/mpg123/xfermem.h index 8d94c863..ae7e5afd 100644 --- a/mpg123_artsplugin/mpg123/xfermem.h +++ b/mpg123_artsplugin/mpg123/xfermem.h @@ -6,7 +6,7 @@ * * This is a stand-alone module which implements a unidirectional, * fast pipe using mmap(). Its primary use is to transfer large - * amounts of data from a tqparent process to its child process, + * amounts of data from a parent process to its child process, * with a buffer in between which decouples blocking conditions * on both sides. Control information is transferred between the * processes through a socketpair. See xftest.c for an example on -- cgit v1.2.1