diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 5429a544f..cf71b9ebe 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -61,7 +61,6 @@ #include #include #include -// obsolete #include #include #include @@ -79,8 +78,8 @@ #include #include -extern CPlugins * g_Plugins; /* neutrino.cpp */ -extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ +extern CPlugins *g_Plugins; /* neutrino.cpp */ +extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern cVideo *videoDecoder; extern cAudio *audioDecoder; @@ -88,7 +87,7 @@ extern cDemux *videoDemux; extern cDemux *audioDemux; extern cDemux *pcrDemux; -extern "C" int pinghost( const char *hostname ); +extern "C" int pinghost(const char *hostname); COnOffNotifier::COnOffNotifier(int OffValue) { @@ -97,22 +96,22 @@ COnOffNotifier::COnOffNotifier(int OffValue) bool COnOffNotifier::changeNotify(const neutrino_locale_t, void *Data) { - bool active = (*(int*)(Data) != offValue); + bool active = (*(int *)(Data) != offValue); - for (std::vector::iterator it = toDisable.begin(); it != toDisable.end(); it++) + for (std::vector::iterator it = toDisable.begin(); it != toDisable.end(); it++) (*it)->setActive(active); return false; } -void COnOffNotifier::addItem(CMenuItem* menuItem) +void COnOffNotifier::addItem(CMenuItem *menuItem) { toDisable.push_back(menuItem); } bool CSectionsdConfigNotifier::changeNotify(const neutrino_locale_t locale, void *data) { - char *str = (char*) data; + char *str = (char *) data; if (locale == LOCALE_MISCSETTINGS_EPG_CACHE) g_settings.epg_cache = atoi(str); else if (locale == LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE) @@ -122,15 +121,15 @@ bool CSectionsdConfigNotifier::changeNotify(const neutrino_locale_t locale, void else if (locale == LOCALE_MISCSETTINGS_EPG_MAX_EVENTS) g_settings.epg_max_events = atoi(str); - CNeutrinoApp::getInstance()->SendSectionsdConfig(); - return false; + CNeutrinoApp::getInstance()->SendSectionsdConfig(); + return false; } -bool CTouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) +bool CTouchFileNotifier::changeNotify(const neutrino_locale_t, void *data) { if ((*(int *)data) != 0) { - FILE * fd = fopen(filename, "w"); + FILE *fd = fopen(filename, "w"); if (fd) fclose(fd); else @@ -141,7 +140,7 @@ bool CTouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) return true; } -bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) +bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void *data) { std::string flagfile = FLAGDIR; flagfile += "/."; @@ -149,20 +148,20 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) if ((*(int *)data) != 0) { - FILE * fd = fopen(flagfile.c_str(), "w"); + FILE *fd = fopen(flagfile.c_str(), "w"); if (fd) { fclose(fd); if (strstr(filename, "scart_osd_fix")) { - //change to scart-osd-fix values + // change to scart-osd-fix values g_settings.screen_StartX_b_0 = 30; g_settings.screen_StartY_b_0 = 45; g_settings.screen_EndX_b_0 = 690; g_settings.screen_EndY_b_0 = 535; g_settings.screen_preset = 1; - //set values + // set values g_settings.screen_StartX = g_settings.screen_StartX_b_0; g_settings.screen_StartY = g_settings.screen_StartY_b_0; g_settings.screen_EndX = g_settings.screen_EndX_b_0; @@ -203,13 +202,13 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) { if (strstr(filename, "scart_osd_fix")) { - //reset to defaults + // reset to defaults g_settings.screen_StartX_b_0 = 22; g_settings.screen_StartY_b_0 = 12; g_settings.screen_EndX_b_0 = 1259 - g_settings.screen_StartX_b_0 - 1; g_settings.screen_EndY_b_0 = 708 - g_settings.screen_StartY_b_0 - 1; - //set values + // set values g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_b_0 : g_settings.screen_StartX_a_0; g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_b_0 : g_settings.screen_StartY_a_0; g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_b_0 : g_settings.screen_EndX_a_0; @@ -253,153 +252,153 @@ void CColorSetupNotifier::setPalette() { CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); SNeutrinoTheme &t = g_settings.theme; - //setting colors-.. + + // setting colors frameBuffer->paletteGenFade(COL_MENUHEAD, - convertSetupColor2RGB(t.menu_Head_red, t.menu_Head_green, t.menu_Head_blue), - convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue), - 8, convertSetupAlpha2Alpha( t.menu_Head_alpha ) ); + convertSetupColor2RGB(t.menu_Head_red, t.menu_Head_green, t.menu_Head_blue), + convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Head_alpha)); frameBuffer->paletteGenFade(COL_MENUCONTENT, - convertSetupColor2RGB(t.menu_Content_red, t.menu_Content_green, t.menu_Content_blue), - convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), - 8, convertSetupAlpha2Alpha(t.menu_Content_alpha) ); - + convertSetupColor2RGB(t.menu_Content_red, t.menu_Content_green, t.menu_Content_blue), + convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Content_alpha)); frameBuffer->paletteGenFade(COL_MENUCONTENTDARK, - convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)), - convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), - 8, convertSetupAlpha2Alpha(t.menu_Content_alpha) ); + convertSetupColor2RGB(int(t.menu_Content_red * 0.6), int(t.menu_Content_green * 0.6), int(t.menu_Content_blue * 0.6)), + convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Content_alpha)); frameBuffer->paletteGenFade(COL_MENUCONTENTSELECTED, - convertSetupColor2RGB(t.menu_Content_Selected_red, t.menu_Content_Selected_green, t.menu_Content_Selected_blue), - convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), - 8, convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha) ); + convertSetupColor2RGB(t.menu_Content_Selected_red, t.menu_Content_Selected_green, t.menu_Content_Selected_blue), + convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); frameBuffer->paletteGenFade(COL_MENUCONTENTINACTIVE, - convertSetupColor2RGB(t.menu_Content_inactive_red, t.menu_Content_inactive_green, t.menu_Content_inactive_blue), - convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue), - 8, convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha) ); + convertSetupColor2RGB(t.menu_Content_inactive_red, t.menu_Content_inactive_green, t.menu_Content_inactive_blue), + convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha)); frameBuffer->paletteGenFade(COL_MENUFOOT, - convertSetupColor2RGB(t.menu_Foot_red, t.menu_Foot_green, t.menu_Foot_blue), - convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), - 8, convertSetupAlpha2Alpha( t.menu_Foot_alpha ) ); + convertSetupColor2RGB(t.menu_Foot_red, t.menu_Foot_green, t.menu_Foot_blue), + convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), + 8, convertSetupAlpha2Alpha(t.menu_Foot_alpha)); frameBuffer->paletteGenFade(COL_INFOBAR, - convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue), - convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), - 8, convertSetupAlpha2Alpha(t.infobar_alpha) ); + convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue), + convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), + 8, convertSetupAlpha2Alpha(t.infobar_alpha)); frameBuffer->paletteGenFade(COL_SHADOW, - convertSetupColor2RGB(int(t.shadow_red), int(t.shadow_green), int(t.shadow_blue)), - convertSetupColor2RGB(t.shadow_red, t.shadow_green, t.shadow_blue), - 8, convertSetupAlpha2Alpha(t.shadow_alpha) ); + convertSetupColor2RGB(int(t.shadow_red), int(t.shadow_green), int(t.shadow_blue)), + convertSetupColor2RGB(t.shadow_red, t.shadow_green, t.shadow_blue), + 8, convertSetupAlpha2Alpha(t.shadow_alpha)); frameBuffer->paletteGenFade(COL_INFOBAR_CASYSTEM, - convertSetupColor2RGB(t.infobar_casystem_red, t.infobar_casystem_green, t.infobar_casystem_blue), - convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), - 8, convertSetupAlpha2Alpha(t.infobar_casystem_alpha) ); + convertSetupColor2RGB(t.infobar_casystem_red, t.infobar_casystem_green, t.infobar_casystem_blue), + convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), + 8, convertSetupAlpha2Alpha(t.infobar_casystem_alpha)); frameBuffer->paletteGenFade(COL_COLORED_EVENTS_INFOBAR, - convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue), - convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), - 8, convertSetupAlpha2Alpha(t.infobar_alpha) ); + convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue), + convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), + 8, convertSetupAlpha2Alpha(t.infobar_alpha)); frameBuffer->paletteGenFade(COL_COLORED_EVENTS_CHANNELLIST, - convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)), - convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), - 8, convertSetupAlpha2Alpha(t.infobar_alpha) ); + convertSetupColor2RGB(int(t.menu_Content_red * 0.6), int(t.menu_Content_green * 0.6), int(t.menu_Content_blue * 0.6)), + convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), + 8, convertSetupAlpha2Alpha(t.infobar_alpha)); frameBuffer->paletteGenFade(COL_PROGRESSBAR, - convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue), - convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), - 8, convertSetupAlpha2Alpha(t.menu_Content_alpha)); + convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue), + convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), + 8, convertSetupAlpha2Alpha(t.menu_Content_alpha)); // ##### TEXT COLORS ##### // COL_COLORED_EVENTS_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 0, - convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_INFOBAR_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 1, - convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), - convertSetupAlpha2Alpha(t.infobar_alpha)); + convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue), + convertSetupAlpha2Alpha(t.infobar_alpha)); // COL_MENUFOOT_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2, - convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), - convertSetupAlpha2Alpha(t.menu_Foot_alpha)); + convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue), + convertSetupAlpha2Alpha(t.menu_Foot_alpha)); // COL_MENUHEAD_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3, - convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue), - convertSetupAlpha2Alpha(t.menu_Head_alpha)); + convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue), + convertSetupAlpha2Alpha(t.menu_Head_alpha)); // COL_MENUCONTENT_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 4, - convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENT_TEXT_PLUS_1 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 5, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -16), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -16), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENT_TEXT_PLUS_2 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 6, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -32), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -32), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENT_TEXT_PLUS_3 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 7, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -48), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -48), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENTDARK_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 8, - convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENTDARK_TEXT_PLUS_1 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 9, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -52), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -52), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENTDARK_TEXT_PLUS_2 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 10, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -60), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -60), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); // COL_MENUCONTENTSELECTED_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 11, - convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), - convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); + convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), + convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); // COL_MENUCONTENTSELECTED_TEXT_PLUS_1 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 12, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -16), - convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -16), + convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); // COL_MENUCONTENTSELECTED_TEXT_PLUS_2 frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 13, - changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -32), - convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); + changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -32), + convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha)); // COL_MENUCONTENTINACTIVE_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 14, - convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue), - convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha)); + convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue), + convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha)); // COL_INFOCLOCK_TEXT frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15, - convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue), - convertSetupAlpha2Alpha(t.clock_Digit_alpha)); + convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue), + convertSetupAlpha2Alpha(t.clock_Digit_alpha)); // COL_PROGRESSBAR_ACTIVE frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16, - convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), - convertSetupAlpha2Alpha(t.menu_Content_alpha)); + convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), + convertSetupAlpha2Alpha(t.menu_Content_alpha)); frameBuffer->paletteSet(); } @@ -413,38 +412,56 @@ bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *) bool CAudioSetupNotifier::changeNotify(const neutrino_locale_t OptionName, void *) { //printf("notify: %d\n", OptionName); -#if 0 //FIXME to do ? manual audio delay +#if 0 + // FIXME to do ? manual audio delay if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_PCMOFFSET)) { } #endif - if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_MODE)) { + if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_MODE)) + { g_Zapit->setAudioMode(g_settings.audio_AnalogMode); - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_OUT)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_OUT)) + { audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_AC3)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_AC3)) + { audioDecoder->SetHdmiDD(g_settings.ac3_pass ? true : false); - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_DTS)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_DTS)) + { audioDecoder->SetSpdifDD(g_settings.dts_pass ? true : false); #else - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_HDMI_DD)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_HDMI_DD)) + { audioDecoder->SetHdmiDD((HDMI_ENCODED_MODE) g_settings.hdmi_dd); - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_SPDIF_DD)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_SPDIF_DD)) + { audioDecoder->SetSpdifDD(g_settings.spdif_dd ? true : false); #endif - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_AVSYNC)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_AVSYNC)) + { videoDecoder->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); audioDecoder->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); videoDemux->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); audioDemux->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); pcrDemux->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_CLOCKREC)) { - //.Clock recovery enable/disable + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_CLOCKREC)) + { + // Clock recovery enable/disable // FIXME add code here. - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_ALGO) || - ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_NMGR) || - ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_VOLUME)) { + } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_ALGO) || + ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_NMGR) || + ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_VOLUME)) + { audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume); } return false; @@ -453,33 +470,37 @@ bool CAudioSetupNotifier::changeNotify(const neutrino_locale_t OptionName, void // used in ./gui/osd_setup.cpp: bool CFontSizeNotifier::changeNotify(const neutrino_locale_t, void *) { - CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FONTSIZE_HINT)); // UTF-8 + CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FONTSIZE_HINT)); hintBox.paint(); CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT); hintBox.hide(); - /* recalculate infoclock/muteicon/volumebar */ + // recalculate infoclock/muteicon/volumebar CVolumeHelper::getInstance()->refresh(); return true; } -int CSubtitleChangeExec::exec(CMenuTarget* /*parent*/, const std::string & actionKey) +int CSubtitleChangeExec::exec(CMenuTarget * /*parent*/, const std::string &actionKey) { -printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str()); - if(actionKey == "off") { + printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str()); + if (actionKey == "off") + { tuxtx_stop_subtitle(); dvbsub_stop(); return menu_return::RETURN_EXIT; } - if(!strncmp(actionKey.c_str(), "DVB", 3)) { - char const * pidptr = strchr(actionKey.c_str(), ':'); - int pid = atoi(pidptr+1); + if (!strncmp(actionKey.c_str(), "DVB", 3)) + { + char const *pidptr = strchr(actionKey.c_str(), ':'); + int pid = atoi(pidptr + 1); tuxtx_stop_subtitle(); dvbsub_pause(); dvbsub_start(pid); - } else { - char const * ptr = strchr(actionKey.c_str(), ':'); + } + else + { + char const *ptr = strchr(actionKey.c_str(), ':'); ptr++; int pid = atoi(ptr); ptr = strchr(ptr, ':'); @@ -487,19 +508,19 @@ printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str()); int page = strtol(ptr, NULL, 16); ptr = strchr(ptr, ':'); ptr++; -printf("CSubtitleChangeExec::exec: TTX, pid %x page %x lang %s\n", pid, page, ptr); + printf("CSubtitleChangeExec::exec: TTX, pid %x page %x lang %s\n", pid, page, ptr); tuxtx_stop_subtitle(); tuxtx_set_pid(pid, page, ptr); dvbsub_stop(); tuxtx_main(pid, page); } - return menu_return::RETURN_EXIT; + return menu_return::RETURN_EXIT; } -int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey) +int CNVODChangeExec::exec(CMenuTarget *parent, const std::string &actionKey) { - // printf("CNVODChangeExec exec: %s\n", actionKey.c_str()); - unsigned sel= atoi(actionKey.c_str()); + //printf("CNVODChangeExec exec: %s\n", actionKey.c_str()); + unsigned sel = atoi(actionKey.c_str()); g_RemoteControl->setSubChannel(sel); parent->hide(); @@ -507,7 +528,7 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey) return menu_return::RETURN_EXIT; } -int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey) +int CMoviePluginChangeExec::exec(CMenuTarget *parent, const std::string &actionKey) { if (parent) parent->hide(); @@ -526,7 +547,7 @@ int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & action return menu_return::RETURN_EXIT; } -long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr() +long CNetAdapter::mac_addr_sys(u_char *addr) // only for function getMacAddr() { struct ifreq ifr; struct ifreq *IFR; @@ -535,7 +556,7 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr() int s, i; int ok = 0; s = socket(AF_INET, SOCK_DGRAM, 0); - if (s==-1) + if (s == -1) { return -1; } @@ -549,7 +570,7 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr() strcpy(ifr.ifr_name, IFR->ifr_name); if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) { - if (! (ifr.ifr_flags & IFF_LOOPBACK)) + if (!(ifr.ifr_flags & IFF_LOOPBACK)) { if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0) { @@ -575,13 +596,13 @@ std::string CNetAdapter::getMacAddr(void) { long stat; u_char addr[6]; - stat = mac_addr_sys( addr); + stat = mac_addr_sys(addr); if (0 == stat) { std::stringstream mac_tmp; - for(int i=0;i<6;++i) - mac_tmp< %s\n", name.c_str(), zone.c_str()); std::string cmd = TARGET_PREFIX "/share/zoneinfo/" + zone; printf("symlink %s to /etc/localtime\n", cmd.c_str()); @@ -627,9 +653,10 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data) perror("unlink failed"); if (symlink(cmd.c_str(), "/etc/localtime")) perror("symlink failed"); - /* for yocto tzdata compatibility */ + // for yocto tzdata compatibility FILE *f = fopen("/etc/timezone", "w"); - if (f) { + if (f) + { fprintf(f, "%s\n", zone.c_str()); fclose(f); } @@ -643,7 +670,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data) extern Zapit_config zapitCfg; -int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionKey) +int CDataResetNotifier::exec(CMenuTarget * /*parent*/, const std::string &actionKey) { bool delete_all = (actionKey == "all"); bool delete_chan = (actionKey == "channels") || delete_all; @@ -652,29 +679,32 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK neutrino_locale_t msg = delete_all ? LOCALE_RESET_ALL : delete_chan ? LOCALE_RESET_CHANNELS : LOCALE_RESET_SETTINGS; int ret = menu_return::RETURN_REPAINT; - /* no need to confirm if we only remove deleted channels */ - if (!delete_removed) { + // no need to confirm if we only remove deleted channels + if (!delete_removed) + { int result = ShowMsg(msg, g_Locale->getText(LOCALE_RESET_CONFIRM), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo); if (result != CMsgBox::mbrYes) return true; } - if(delete_all) { + if (delete_all) + { my_system(3, "/bin/sh", "-c", "rm -f " ZAPITDIR "/*.conf"); CServiceManager::getInstance()->SatelliteList().clear(); CZapit::getInstance()->LoadSettings(); CZapit::getInstance()->GetConfig(zapitCfg); #ifdef BOXMODEL_CST_HD2 - /* flag file to erase /var partition on factory reset, - will be done by init scripts */ - FILE * fp = fopen("/var_init/etc/.reset", "w"); + // flag file to erase /var partition on factory reset + // will be done by init scripts + FILE *fp = fopen("/var_init/etc/.reset", "w"); if (fp) fclose(fp); #endif - g_RCInput->postMsg( NeutrinoMessages::REBOOT, 0); + g_RCInput->postMsg(NeutrinoMessages::REBOOT, 0); ret = menu_return::RETURN_EXIT_ALL; } - if(delete_set) { + if (delete_set) + { unlink(NEUTRINO_SETTINGS_FILE); //unlink(NEUTRINO_SCAN_SETTINGS_FILE); CNeutrinoApp::getInstance()->loadSetup(NEUTRINO_SETTINGS_FILE); @@ -685,11 +715,13 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK CVFD::getInstance()->setlcdparameter(); CFrameBuffer::getInstance()->Clear(); } - if(delete_chan) { + if (delete_chan) + { my_system(3, "/bin/sh", "-c", "rm -f " ZAPITDIR "/*.xml"); g_Zapit->reinitChannels(); } - if (delete_removed) { + if (delete_removed) + { CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT)); chb.paint(); CServiceManager::getInstance()->SaveServices(true, false, true); @@ -705,7 +737,8 @@ void CFanControlNotifier::setSpeed(unsigned int speed) printf("FAN Speed %d\n", speed); #ifndef BOXMODEL_CST_HD2 int cfd = open("/dev/cs_control", O_RDONLY); - if(cfd < 0) { + if (cfd < 0) + { perror("Cannot open /dev/cs_control"); return; } @@ -716,7 +749,7 @@ void CFanControlNotifier::setSpeed(unsigned int speed) #endif } -bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void * data) +bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void *data) { unsigned int speed = * (int *) data; setSpeed(speed); @@ -733,13 +766,13 @@ bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void *) } #endif -bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void * data) +bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void *data) { -extern cCpuFreqManager * cpuFreq; + extern cCpuFreqManager *cpuFreq; int freq = * (int *) data; printf("CCpuFreqNotifier: %d Mhz\n", freq); - freq *= 1000*1000; + freq *= 1000 * 1000; if (cpuFreq) cpuFreq->SetCpuFreq(freq); @@ -747,25 +780,27 @@ extern cCpuFreqManager * cpuFreq; } extern CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[]; -bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * /* data */) +bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * /*data*/) { int i; - int modes[VIDEO_STD_MAX+1]; + int modes[VIDEO_STD_MAX + 1]; memset(modes, 0, sizeof(modes)); - for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) { - if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key < 0) /* not available on this platform */ + for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) + { + if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key < 0) // not available on this platform continue; - if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key >= VIDEO_STD_MAX) { - /* this must not happen */ + if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key >= VIDEO_STD_MAX) + { + // this must not happen printf("CAutoModeNotifier::changeNotify VIDEOMODE_OPTIONS[%d].key = %d (>= %d)\n", - i, VIDEOMENU_VIDEOMODE_OPTIONS[i].key, VIDEO_STD_MAX); + i, VIDEOMENU_VIDEOMODE_OPTIONS[i].key, VIDEO_STD_MAX); continue; } #ifdef BOXMODEL_CST_HD2 - for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) - modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i]; + for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) + modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i]; #else modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i]; #endif diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 3d7794105..a93fc4d49 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -41,16 +41,16 @@ class CGenericMenuActivate { private: - std::vector items; + std::vector items; public: - CGenericMenuActivate() {}; - ~CGenericMenuActivate() { items.clear(); }; + CGenericMenuActivate() {}; + ~CGenericMenuActivate() { items.clear(); }; - void Add(CMenuItem* item) { items.push_back(item); } - void Clear() { items.clear(); } + void Add(CMenuItem *item) { items.push_back(item); } + void Clear() { items.clear(); } void Activate(bool enable) { - for(std::vector::iterator it = items.begin(); it != items.end(); ++it) + for (std::vector::iterator it = items.begin(); it != items.end(); ++it) (*it)->setActive(enable); } }; @@ -59,35 +59,35 @@ class COnOffNotifier : public CChangeObserver { private: int offValue; - std::vector toDisable; + std::vector toDisable; public: COnOffNotifier(int OffValue = 0); bool changeNotify(const neutrino_locale_t, void *Data); - void addItem(CMenuItem* menuItem); + void addItem(CMenuItem *menuItem); }; class CSectionsdConfigNotifier : public CChangeObserver { public: - bool changeNotify(const neutrino_locale_t, void * ); + bool changeNotify(const neutrino_locale_t, void *); }; class CTouchFileNotifier : public CChangeObserver { - const char * filename; + const char *filename; public: - inline CTouchFileNotifier(const char * _filename) { filename = _filename; }; - bool changeNotify(const neutrino_locale_t, void * data); + inline CTouchFileNotifier(const char *_filename) { filename = _filename; }; + bool changeNotify(const neutrino_locale_t, void *data); }; class CFlagFileNotifier : public CChangeObserver { - const char * filename; + const char *filename; public: - inline CFlagFileNotifier(const char * _filename) { filename = _filename; }; - bool changeNotify(const neutrino_locale_t, void * data); + inline CFlagFileNotifier(const char *_filename) { filename = _filename; }; + bool changeNotify(const neutrino_locale_t, void *data); }; class CColorSetupNotifier : public CChangeObserver @@ -112,56 +112,56 @@ class CFontSizeNotifier : public CChangeObserver class CSubtitleChangeExec : public CMenuTarget { public: - int exec(CMenuTarget* parent, const std::string & actionKey); + int exec(CMenuTarget *parent, const std::string &actionKey); }; class CNVODChangeExec : public CMenuTarget { public: - int exec(CMenuTarget* parent, const std::string & actionKey); + int exec(CMenuTarget *parent, const std::string &actionKey); }; class CMoviePluginChangeExec : public CMenuTarget { public: - int exec(CMenuTarget* parent, const std::string & actionKey); + int exec(CMenuTarget *parent, const std::string &actionKey); }; class CTZChangeNotifier : public CChangeObserver { public: - bool changeNotify(const neutrino_locale_t, void * data); + bool changeNotify(const neutrino_locale_t, void *data); }; class CDataResetNotifier : public CMenuTarget { public: - int exec(CMenuTarget* parent, const std::string& actionKey); + int exec(CMenuTarget *parent, const std::string &actionKey); }; class CFanControlNotifier : public CChangeObserver { public: - bool changeNotify(const neutrino_locale_t, void * data); + bool changeNotify(const neutrino_locale_t, void *data); static void setSpeed(unsigned int speed); }; class CCpuFreqNotifier : public CChangeObserver { public: - bool changeNotify(const neutrino_locale_t, void * data); + bool changeNotify(const neutrino_locale_t, void *data); }; class CAutoModeNotifier : public CChangeObserver { public: - bool changeNotify(const neutrino_locale_t, void * data); + bool changeNotify(const neutrino_locale_t, void *data); }; class CApiKey { public: - static int check_api_key(const std::string& api_key_setting, const std::string& api_key_pattern) + static int check_api_key(const std::string &api_key_setting, const std::string &api_key_pattern) { return ((api_key_setting != api_key_pattern) && !api_key_setting.empty()); }