diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d50caf23d..80ce70d2c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3130,7 +3130,7 @@ _repeat: new_msg = (mode == mode_standby) ? NeutrinoMessages::STANDBY_OFF : NeutrinoMessages::STANDBY_ON; //printf("standby: new msg %X\n", new_msg); if ((g_settings.shutdown_real_rcdelay)) { - neutrino_msg_t _msg; + neutrino_msg_t _msg_; neutrino_msg_data_t mdata; struct timeval endtime; time_t seconds; @@ -3148,10 +3148,10 @@ _repeat: //printf("standby: timeout %d\n", timeout); while(true) { - g_RCInput->getMsg_ms(&_msg, &mdata, timeout); + g_RCInput->getMsg_ms(&_msg_, &mdata, timeout); //printf("standby: input msg %X\n", msg); - if (_msg == CRCInput::RC_timeout) + if (_msg_ == CRCInput::RC_timeout) break; gettimeofday(&endtime, NULL); @@ -3160,7 +3160,7 @@ _repeat: seconds--; //printf("standby: input seconds %d\n", seconds); if (seconds >= 1) { - if (_msg == CRCInput::RC_standby) + if (_msg_ == CRCInput::RC_standby) new_msg = NeutrinoMessages::SHUTDOWN; break; } diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 294ec2475..d95708221 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2452,9 +2452,9 @@ void CNeutrinoApp::InitColorSettingsMenuColors(CMenuWidget &colorSettings_menuCo colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); } +#if 0 void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_statusbarColors) { -#if 0 colorSettings_statusbarColors.addItem(GenericMenuSeparator); 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 CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor )); colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); -#endif } +#endif void CNeutrinoApp::InitColorSettingsTiming(CMenuWidget &colorSettings_timing) { diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index c285a3fb5..7c9504376 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -992,7 +992,7 @@ bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void * data) 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; 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; } -bool CAllUsalsNotifier::changeNotify(const neutrino_locale_t OptionName, void * data) +bool CAllUsalsNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * data) { int onoff = * (int *) data; printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF"); diff --git a/src/zapit/src/pmt.cpp b/src/zapit/src/pmt.cpp index 1cde22922..b974dcd11 100644 --- a/src/zapit/src/pmt.cpp +++ b/src/zapit/src/pmt.cpp @@ -143,23 +143,23 @@ printf("descr 0x0A: %02X %02X %02X\n", buffer[pos+2], buffer[pos+3], buffer[pos+ break; case 0x56: /* teletext descriptor */ - char tmpLang[4]; - //printf("[pmt] teletext pid %x: %s\n", esInfo->elementary_PID, tmpLang); + char tmp_Lang[4]; + //printf("[pmt] teletext pid %x: %s\n", esInfo->elementary_PID, tmp_Lang); printf("[pmt] teletext pid %x\n", esInfo->elementary_PID); for (unsigned char fIdx = 0; fIdx < fieldCount; fIdx++) { - memcpy(tmpLang, &buffer[pos + 5*fIdx + 2], 3); - tmpLang[3] = '\0'; + memcpy(tmp_Lang, &buffer[pos + 5*fIdx + 2], 3); + tmp_Lang[3] = '\0'; unsigned char teletext_type=buffer[pos + 5*fIdx + 5]>> 3; unsigned char teletext_magazine_number = buffer[pos + 5*fIdx + 5] & 7; 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) - channel->setTeletextLang(tmpLang); + channel->setTeletextLang(tmp_Lang); 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 { 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); } } }