mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix Wshadow compil

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@769 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-09-14 16:08:54 +00:00
parent 2fbf324607
commit e9daa350d1
4 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/framebuffer.cpp
View File

@@ -479,14 +479,14 @@ int CFrameBuffer::setMode(unsigned int /*nxRes*/, unsigned int /*nyRes*/, unsign
xRes = screeninfo.xres; xRes = screeninfo.xres;
yRes = screeninfo.yres; yRes = screeninfo.yres;
bpp = screeninfo.bits_per_pixel; bpp = screeninfo.bits_per_pixel;
fb_fix_screeninfo fix; fb_fix_screeninfo _fix;
if (ioctl(fd, FBIOGET_FSCREENINFO, &fix)<0) { if (ioctl(fd, FBIOGET_FSCREENINFO, &_fix)<0) {
perror("FBIOGET_FSCREENINFO"); perror("FBIOGET_FSCREENINFO");
return -1; return -1;
} }
stride = fix.line_length; stride = _fix.line_length;
printf("FB: %dx%dx%d line length %d. %s nevis GXA accelerator.\n", xRes, yRes, bpp, stride, printf("FB: %dx%dx%d line length %d. %s nevis GXA accelerator.\n", xRes, yRes, bpp, stride,
#ifdef USE_NEVIS_GXA #ifdef USE_NEVIS_GXA
"Using" "Using"

5
src/gui/bouquetlist.cpp
View File

@@ -211,7 +211,6 @@ int CBouquetList::doMenu()
int i = 0; int i = 0;
int select = -1; int select = -1;
static int old_selected = 0; static int old_selected = 0;
int ret = menu_return::RETURN_NONE;
signed int bouquet_id; signed int bouquet_id;
char cnt[5]; char cnt[5];
CZapitBouquet * tmp, * zapitBouquet; CZapitBouquet * tmp, * zapitBouquet;
@@ -232,7 +231,7 @@ int CBouquetList::doMenu()
sprintf(cnt, "%d", i); sprintf(cnt, "%d", i);
if(!zapitBouquet->bUser) { if(!zapitBouquet->bUser) {
menu->addItem(new CMenuForwarder(LOCALE_FAVORITES_COPY, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++); menu->addItem(new CMenuForwarder(LOCALE_FAVORITES_COPY, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++);
ret = menu->exec(NULL, ""); menu->exec(NULL, "");
delete menu; delete menu;
delete selector; delete selector;
printf("CBouquetList::doMenu: %d selected\n", select); printf("CBouquetList::doMenu: %d selected\n", select);
@@ -259,7 +258,7 @@ int CBouquetList::doMenu()
return -1; return -1;
} else { } else {
menu->addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_DELETE, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++); menu->addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_DELETE, true, NULL, selector, cnt, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE), old_selected == i ++);
ret = menu->exec(NULL, ""); menu->exec(NULL, "");
delete menu; delete menu;
delete selector; delete selector;
printf("CBouquetList::doMenu: %d selected\n", select); printf("CBouquetList::doMenu: %d selected\n", select);

2
src/gui/widget/vfdcontroler.cpp
View File

@@ -73,7 +73,7 @@ CVfdControler::CVfdControler(const neutrino_locale_t Name, CChangeObserver* Obse
tmpwidth = g_Font[font_info]->getRenderWidth("15"); tmpwidth = g_Font[font_info]->getRenderWidth("15");
width = w_max((15 + lwidth + 15 + 120 + 10 + tmpwidth + 10 + 15), 0); width = w_max((15 + lwidth + 15 + 120 + 10 + tmpwidth + 10 + 15), 0);
height = h_max(hheight+ mheight* (3+neo_hw)+ +mheight/2, 0); height = h_max(hheight+ mheight* (3+neo_hw) +mheight/2, 0);
x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1); x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1);
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1); y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1);

38
src/zapit/src/zapit.cpp
View File

@@ -919,23 +919,23 @@ bool zapit_parse_command(CBasicMessage::Header &rmsg, int connfd)
} }
case CZapitMessages::CMD_GET_DELIVERY_SYSTEM: { case CZapitMessages::CMD_GET_DELIVERY_SYSTEM: {
CZapitMessages::responseDeliverySystem response; CZapitMessages::responseDeliverySystem _response;
switch (frontend->getInfo()->type) { switch (frontend->getInfo()->type) {
case FE_QAM: case FE_QAM:
response.system = DVB_C; _response.system = DVB_C;
break; break;
case FE_QPSK: case FE_QPSK:
response.system = DVB_S; _response.system = DVB_S;
break; break;
case FE_OFDM: case FE_OFDM:
response.system = DVB_T; _response.system = DVB_T;
break; break;
default: default:
WARN("Unknown type %d", frontend->getInfo()->type); WARN("Unknown type %d", frontend->getInfo()->type);
return false; return false;
} }
CBasicServer::send_data(connfd, &response, sizeof(response)); CBasicServer::send_data(connfd, &_response, sizeof(_response));
break; break;
} }
@@ -967,45 +967,45 @@ bool zapit_parse_command(CBasicMessage::Header &rmsg, int connfd)
} }
case CZapitMessages::CMD_GET_CHANNEL_NAME: { case CZapitMessages::CMD_GET_CHANNEL_NAME: {
t_channel_id requested_channel_id; t_channel_id requested_channel_id;
CZapitMessages::responseGetChannelName response; CZapitMessages::responseGetChannelName _response;
CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id));
if(requested_channel_id == 0) { if(requested_channel_id == 0) {
if(channel) { if(channel) {
strncpy(response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE); strncpy(_response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE);
response.name[CHANNEL_NAME_SIZE-1] = 0; _response.name[CHANNEL_NAME_SIZE-1] = 0;
} else } else
response.name[0] = 0; _response.name[0] = 0;
} else { } else {
tallchans_iterator it = allchans.find(requested_channel_id); tallchans_iterator it = allchans.find(requested_channel_id);
if (it == allchans.end()) if (it == allchans.end())
response.name[0] = 0; _response.name[0] = 0;
else else
strncpy(response.name, it->second.getName().c_str(), CHANNEL_NAME_SIZE); strncpy(_response.name, it->second.getName().c_str(), CHANNEL_NAME_SIZE);
response.name[CHANNEL_NAME_SIZE-1] = 0; _response.name[CHANNEL_NAME_SIZE-1] = 0;
} }
CBasicServer::send_data(connfd, &response, sizeof(response)); CBasicServer::send_data(connfd, &_response, sizeof(_response));
break; break;
} }
case CZapitMessages::CMD_IS_TV_CHANNEL: { case CZapitMessages::CMD_IS_TV_CHANNEL: {
t_channel_id requested_channel_id; t_channel_id requested_channel_id;
CZapitMessages::responseGeneralTrueFalse response; CZapitMessages::responseGeneralTrueFalse _response;
CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id));
tallchans_iterator it = allchans.find(requested_channel_id); tallchans_iterator it = allchans.find(requested_channel_id);
if (it == allchans.end()) { if (it == allchans.end()) {
it = nvodchannels.find(requested_channel_id); it = nvodchannels.find(requested_channel_id);
/* if in doubt (i.e. unknown channel) answer yes */ /* if in doubt (i.e. unknown channel) answer yes */
if (it == nvodchannels.end()) if (it == nvodchannels.end())
response.status = true; _response.status = true;
else else
/* FIXME: the following check is no even remotely accurate */ /* FIXME: the following check is no even remotely accurate */
response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); _response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE);
} else } else
/* FIXME: the following check is no even remotely accurate */ /* FIXME: the following check is no even remotely accurate */
response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); _response.status = (it->second.getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE);
CBasicServer::send_data(connfd, &response, sizeof(response)); CBasicServer::send_data(connfd, &_response, sizeof(_response));
break; break;
} }