mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for Wextra Wshadow Werror build

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@535 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6571f3dc02
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-04-01 (Thu, 01 Apr 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-04-01 16:10:09 +00:00
parent 893ca997ba
commit 17fc0ebb55
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -3130,7 +3130,7 @@ _repeat:
new_msg = (mode == mode_standby) ? NeutrinoMessages::STANDBY_OFF : NeutrinoMessages::STANDBY_ON; new_msg = (mode == mode_standby) ? NeutrinoMessages::STANDBY_OFF : NeutrinoMessages::STANDBY_ON;
//printf("standby: new msg %X\n", new_msg); //printf("standby: new msg %X\n", new_msg);
if ((g_settings.shutdown_real_rcdelay)) { if ((g_settings.shutdown_real_rcdelay)) {
neutrino_msg_t _msg; neutrino_msg_t _msg_;
neutrino_msg_data_t mdata; neutrino_msg_data_t mdata;
struct timeval endtime; struct timeval endtime;
time_t seconds; time_t seconds;
@@ -3148,10 +3148,10 @@ _repeat:
//printf("standby: timeout %d\n", timeout); //printf("standby: timeout %d\n", timeout);
while(true) { while(true) {
g_RCInput->getMsg_ms(&_msg, &mdata, timeout); g_RCInput->getMsg_ms(&_msg_, &mdata, timeout);
//printf("standby: input msg %X\n", msg); //printf("standby: input msg %X\n", msg);
if (_msg == CRCInput::RC_timeout) if (_msg_ == CRCInput::RC_timeout)
break; break;
gettimeofday(&endtime, NULL); gettimeofday(&endtime, NULL);
@@ -3160,7 +3160,7 @@ _repeat:
seconds--; seconds--;
//printf("standby: input seconds %d\n", seconds); //printf("standby: input seconds %d\n", seconds);
if (seconds >= 1) { if (seconds >= 1) {
if (_msg == CRCInput::RC_standby) if (_msg_ == CRCInput::RC_standby)
new_msg = NeutrinoMessages::SHUTDOWN; new_msg = NeutrinoMessages::SHUTDOWN;
break; break;
} }

4
src/neutrino_menue.cpp
View File

@@ -2452,9 +2452,9 @@ void CNeutrinoApp::InitColorSettingsMenuColors(CMenuWidget &colorSettings_menuCo
colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor ));
} }
#if 0
void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_statusbarColors) void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_statusbarColors)
{ {
#if 0
colorSettings_statusbarColors.addItem(GenericMenuSeparator); colorSettings_statusbarColors.addItem(GenericMenuSeparator);
colorSettings_statusbarColors.addItem(GenericMenuBack); colorSettings_statusbarColors.addItem(GenericMenuBack);
@@ -2467,8 +2467,8 @@ void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_s
colorSettings_statusbarColors.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT)); colorSettings_statusbarColors.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT));
colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor )); colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor ));
colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor ));
#endif
} }
#endif
void CNeutrinoApp::InitColorSettingsTiming(CMenuWidget &colorSettings_timing) void CNeutrinoApp::InitColorSettingsTiming(CMenuWidget &colorSettings_timing)
{ {

4
src/system/setting_helpers.cpp
View File

@@ -992,7 +992,7 @@ bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void * data)
return true; return true;
} }
bool CScreePresetNotifier::changeNotify(const neutrino_locale_t OptionName, void * data) bool CScreePresetNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * data)
{ {
int preset = * (int *) data; int preset = * (int *) data;
printf("CScreePresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_settings.screen_preset); printf("CScreePresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_settings.screen_preset);
@@ -1005,7 +1005,7 @@ printf("CScreePresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_
return true; return true;
} }
bool CAllUsalsNotifier::changeNotify(const neutrino_locale_t OptionName, void * data) bool CAllUsalsNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * data)
{ {
int onoff = * (int *) data; int onoff = * (int *) data;
printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF"); printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF");

16
src/zapit/src/pmt.cpp
View File

@@ -143,23 +143,23 @@ printf("descr 0x0A: %02X %02X %02X\n", buffer[pos+2], buffer[pos+3], buffer[pos+
break; break;
case 0x56: /* teletext descriptor */ case 0x56: /* teletext descriptor */
char tmpLang[4]; char tmp_Lang[4];
//printf("[pmt] teletext pid %x: %s\n", esInfo->elementary_PID, tmpLang); //printf("[pmt] teletext pid %x: %s\n", esInfo->elementary_PID, tmp_Lang);
printf("[pmt] teletext pid %x\n", esInfo->elementary_PID); printf("[pmt] teletext pid %x\n", esInfo->elementary_PID);
for (unsigned char fIdx = 0; fIdx < fieldCount; fIdx++) { for (unsigned char fIdx = 0; fIdx < fieldCount; fIdx++) {
memcpy(tmpLang, &buffer[pos + 5*fIdx + 2], 3); memcpy(tmp_Lang, &buffer[pos + 5*fIdx + 2], 3);
tmpLang[3] = '\0'; tmp_Lang[3] = '\0';
unsigned char teletext_type=buffer[pos + 5*fIdx + 5]>> 3; unsigned char teletext_type=buffer[pos + 5*fIdx + 5]>> 3;
unsigned char teletext_magazine_number = buffer[pos + 5*fIdx + 5] & 7; unsigned char teletext_magazine_number = buffer[pos + 5*fIdx + 5] & 7;
unsigned char teletext_page_number=buffer[pos + 5*fIdx + 6]; unsigned char teletext_page_number=buffer[pos + 5*fIdx + 6];
printf("[pmt] teletext type %d mag %d page %d lang %s\n", teletext_type, teletext_magazine_number, teletext_page_number, tmpLang); printf("[pmt] teletext type %d mag %d page %d lang %s\n", teletext_type, teletext_magazine_number, teletext_page_number, tmp_Lang);
if (teletext_type==0x01) if (teletext_type==0x01)
channel->setTeletextLang(tmpLang); channel->setTeletextLang(tmp_Lang);
if (teletext_type==0x02){ if (teletext_type==0x02){
channel->addTTXSubtitle(esInfo->elementary_PID,tmpLang,teletext_magazine_number,teletext_page_number); channel->addTTXSubtitle(esInfo->elementary_PID,tmp_Lang,teletext_magazine_number,teletext_page_number);
} else { } else {
if (teletext_type==0x05){ if (teletext_type==0x05){
channel->addTTXSubtitle(esInfo->elementary_PID,tmpLang,teletext_magazine_number,teletext_page_number,true); channel->addTTXSubtitle(esInfo->elementary_PID,tmp_Lang,teletext_magazine_number,teletext_page_number,true);
} }
} }
} }