From 1a0ccbf88f49c83a44a10a711c87037d4b55c3c3 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Mon, 12 Sep 2005 18:40:42 +0000 Subject: [PATCH] wshadow --- audio.cc | 14 +++++++------- thread.cc | 6 +++--- voptions.cc | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/audio.cc b/audio.cc index 25a270f..d47bf48 100644 --- a/audio.cc +++ b/audio.cc @@ -45,7 +45,7 @@ Audio* Audio::getInstance() return instance; } -int Audio::init(UCHAR streamType) +int Audio::init(UCHAR tstreamType) { if (initted) return 0; initted = 1; @@ -53,7 +53,7 @@ int Audio::init(UCHAR streamType) // if ((fdAudio = open("/dev/adec_mpg", O_RDWR | O_NONBLOCK)) < 0) return 0; if ((fdAudio = open("/dev/adec_mpg", O_WRONLY)) < 0) return 0; - this->streamType = streamType; + streamType = tstreamType; if (!initAllParams()) { @@ -188,22 +188,22 @@ int Audio::reset() return 1; } -int Audio::setVolume(int volume) +int Audio::setVolume(int tvolume) { // parameter: 0 for silence, 20 for full - if ((volume < 0) || (volume > 20)) return 0; + if ((tvolume < 0) || (tvolume > 20)) return 0; // volume = 2 * (20 - volume); // Right, that one was rubbish... 0-10 were almost // inaudible, 11-20 did what should have been done // over the whole 0-20 range - volume = 20 - volume; + tvolume = 20 - tvolume; - unsigned long vol = (volume << 24) | (volume << 16); + unsigned long vol = (tvolume << 24) | (tvolume << 16); Log::getInstance()->log("Audio", Log::DEBUG, "%lx", vol); - Log::getInstance()->log("Audio", Log::DEBUG, "%i", volume); + Log::getInstance()->log("Audio", Log::DEBUG, "%i", tvolume); if (ioctl(fdAudio, AV_SET_AUD_VOLUME, &vol) != 0) return 0; return 1; diff --git a/thread.cc b/thread.cc index 13cc674..9384858 100644 --- a/thread.cc +++ b/thread.cc @@ -24,9 +24,9 @@ void threadInternalStart(void *arg) { // I don't want signals - sigset_t sigset; - sigfillset(&sigset); - pthread_sigmask(SIG_BLOCK, &sigset, NULL); + sigset_t sigs; + sigfillset(&sigs); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); Thread *t = (Thread *)arg; t->threadInternalStart2(); diff --git a/voptions.cc b/voptions.cc index 0227d89..d8e15dd 100644 --- a/voptions.cc +++ b/voptions.cc @@ -161,7 +161,7 @@ void VOptions::draw() { View::draw(); - WSymbol ws; + WSymbol wsy; Colour cl; drawText("Remote control type", 10, 45, Colour::LIGHTTEXT); @@ -177,14 +177,14 @@ void VOptions::draw() if (i == selectedOption) cl = Colour::SELECTHIGHLIGHT; else cl = Colour::BUTTONBACKGROUND; - ws.nextSymbol = WSymbol::LEFTARROW; - ws.nextColour = cl; + wsy.nextSymbol = WSymbol::LEFTARROW; + wsy.nextColour = cl; - ws.setScreenPos(screenX + 312, screenY + 47 + (i * 30)); - ws.draw(); - ws.nextSymbol = WSymbol::RIGHTARROW; - ws.setScreenPos(screenX + 482, screenY + 47 + (i * 30)); - ws.draw(); + wsy.setScreenPos(screenX + 312, screenY + 47 + (i * 30)); + wsy.draw(); + wsy.nextSymbol = WSymbol::RIGHTARROW; + wsy.setScreenPos(screenX + 482, screenY + 47 + (i * 30)); + wsy.draw(); optionBox[i].draw(); optionBox[i].show(); } -- 2.39.5