From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscd/libwm/audio/audio_sun.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kscd/libwm/audio') diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c index bee50905..93ce78d2 100644 --- a/kscd/libwm/audio/audio_sun.c +++ b/kscd/libwm/audio/audio_sun.c @@ -54,13 +54,13 @@ * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -199,7 +199,7 @@ sun_audio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WM_CDM_PLAYING; @@ -284,11 +284,11 @@ sun_audio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -367,7 +367,7 @@ sun_audio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); -- cgit v1.2.1