diff --git a/src/driver/neutrinofonts.cpp b/src/driver/neutrinofonts.cpp index aaf7291e2..d018875c8 100644 --- a/src/driver/neutrinofonts.cpp +++ b/src/driver/neutrinofonts.cpp @@ -58,7 +58,7 @@ font_sizes_struct fixed_font[SNeutrinoSettings::FONT_TYPE_FIXED_COUNT] = {NONEXISTANT_LOCALE, 20, CNeutrinoFonts::FONT_STYLE_ITALIC, 1}, {NONEXISTANT_LOCALE, 16, CNeutrinoFonts::FONT_STYLE_BOLD, 1}, {NONEXISTANT_LOCALE, 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}, - {NONEXISTANT_LOCALE, 16, CNeutrinoFonts::FONT_STYLE_ITALIC, 1}, + {NONEXISTANT_LOCALE, 16, CNeutrinoFonts::FONT_STYLE_ITALIC, 1} }; const font_sizes_struct signal_font = {NONEXISTANT_LOCALE, 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}; diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 5e948c661..14312af0a 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1329,7 +1329,7 @@ static s_cmd_table connectionCommands[sectionsd::numberOfCommands] = { commandReadSIfromXML, "commandReadSIfromXML" }, { commandWriteSI2XML, "commandWriteSI2XML" }, { commandSetConfig, "commandSetConfig" }, - { commandReadSIfromXMLTV, "commandReadSIfromXMLTV" }, + { commandReadSIfromXMLTV, "commandReadSIfromXMLTV" } }; bool sectionsd_parse_command(CBasicMessage::Header &rmsg, int connfd) diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp index 046edaaa8..d573ec14b 100644 --- a/src/gui/components/cc_detailsline.cpp +++ b/src/gui/components/cc_detailsline.cpp @@ -108,29 +108,29 @@ void CComponentsDetailsLine::paint(bool do_save_bg) cc_fbdata_t fbdata[] = { /*buffered bg full width and height */ - {true, CC_FBDATA_TYPE_BGSCREEN, x, y_mark_top, width, y_mark_down - y_mark_top + h_mark_down + sw, 0, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BGSCREEN, x, y_mark_top, width, y_mark_down - y_mark_top + h_mark_down + sw, 0, 0, 0, 0, NULL, NULL, NULL, false}, /* vertical item mark | */ - {true, CC_FBDATA_TYPE_BOX, x + width - dl_w - sw, y_mark_top, dl_w, h_mark_top, col_body, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + width - sw, y_mark_top + sw, sw, h_mark_top - sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + width - dl_w, y_mark_top + h_mark_top, dl_w, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - dl_w - sw, y_mark_top, dl_w, h_mark_top, col_body, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - sw, y_mark_top + sw, sw, h_mark_top - sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - dl_w, y_mark_top + h_mark_top, dl_w, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, /* horizontal item line - */ - {true, CC_FBDATA_TYPE_BOX, x, y - dl_w / 2, width - dl_w - sw, dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + dl_w, y + dl_w / 2 + dx_c, width - 2 * dl_w - sw, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x, y - dl_w / 2, width - dl_w - sw, dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + dl_w, y + dl_w / 2 + dx_c, width - 2 * dl_w - sw, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, /* vertical connect line [ */ - {true, CC_FBDATA_TYPE_BOX, x, y + dl_w / 2 + dx_c, dl_w, y_down - y - dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + dl_w, y + dl_w / 2 + dx_c, sw, y_down - y - dl_w, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x, y + dl_w / 2 + dx_c, dl_w, y_down - y - dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + dl_w, y + dl_w / 2 + dx_c, sw, y_down - y - dl_w, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, /* horizontal info line - */ - {true, CC_FBDATA_TYPE_BOX, x, y_down - dl_w / 2, width - dl_w - sw, dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + sw, y_down + dl_w / 2 + dx_c, width - dl_w - 2 * sw, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x, y_down - dl_w / 2, width - dl_w - sw, dl_w, col_body, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + sw, y_down + dl_w / 2 + dx_c, width - dl_w - 2 * sw, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, /* vertical info mark | */ - {true, CC_FBDATA_TYPE_BOX, x + width - dl_w - sw, y_mark_down, dl_w, h_mark_down, col_body, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + width - sw, y_mark_down + sw, sw, h_mark_down - sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, - {true, CC_FBDATA_TYPE_BOX, x + width - dl_w, y_mark_down + h_mark_down, dl_w, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - dl_w - sw, y_mark_down, dl_w, h_mark_down, col_body, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - sw, y_mark_down + sw, sw, h_mark_down - sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, x + width - dl_w, y_mark_down + h_mark_down, dl_w, sw, col_shadow, 0, 0, 0, NULL, NULL, NULL, false} }; for (size_t i = 0; i < (sizeof(fbdata) / sizeof(fbdata[0])) ; i++) diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp index 8d4f668ec..1e898599d 100644 --- a/src/gui/components/cc_item.cpp +++ b/src/gui/components/cc_item.cpp @@ -170,34 +170,34 @@ void CComponentsItem::paintInit(bool do_save_bg) cc_fbdata_t fbdata[] = { //buffered bg - {true, CC_FBDATA_TYPE_BGSCREEN, ix, iy, dx + sw, dy + sw, 0, 0, 0, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BGSCREEN, ix, iy, dx + sw, dy + sw, 0, 0, 0, 0, NULL, NULL, NULL, false}, //shadow corner bottom left - {sh_cbl, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbl_x, sh_cbl_y, sh_cdx, sh_cdy, col_shadow, box_rad, corner_type & CORNER_BOTTOM_LEFT, 0, NULL, NULL, NULL, false}, + {sh_cbl, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbl_x, sh_cbl_y, sh_cdx, sh_cdy, col_shadow, box_rad, corner_type & CORNER_BOTTOM_LEFT, 0, NULL, NULL, NULL, false}, //clean up inside body - {sh_cbl, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbl_x - sw + th, sh_cbl_y - sw, sh_cdx + sw, sh_cdy, col_shadow_clean, box_rad, corner_type & CORNER_BOTTOM_LEFT, 0, NULL, NULL, NULL, false}, + {sh_cbl, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbl_x - sw + th, sh_cbl_y - sw, sh_cdx + sw, sh_cdy, col_shadow_clean, box_rad, corner_type & CORNER_BOTTOM_LEFT, 0, NULL, NULL, NULL, false}, //shadow bar bottom - {sh_bb, CC_FBDATA_TYPE_SHADOW_BOX, sh_bx, sh_by, sh_bdx, sw, col_shadow, 0, CORNER_NONE, 0, NULL, NULL, NULL, false}, + {sh_bb, CC_FBDATA_TYPE_SHADOW_BOX, sh_bx, sh_by, sh_bdx, sw, col_shadow, 0, CORNER_NONE, 0, NULL, NULL, NULL, false}, //shadow corner bottom right - {sh_cbr, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbr_x, sh_cbr_y, sh_cdx, sh_cdy, col_shadow, box_rad, corner_type & CORNER_BOTTOM_RIGHT, 0, NULL, NULL, NULL, false}, + {sh_cbr, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbr_x, sh_cbr_y, sh_cdx, sh_cdy, col_shadow, box_rad, corner_type & CORNER_BOTTOM_RIGHT, 0, NULL, NULL, NULL, false}, //clean up inside body - {sh_cbr, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbr_x - sw, sh_cbr_y - sw, sh_cdx, sh_cdy, col_shadow_clean, box_rad, corner_type & CORNER_BOTTOM_RIGHT, 0, NULL, NULL, NULL, false}, + {sh_cbr, CC_FBDATA_TYPE_SHADOW_BOX, sh_cbr_x - sw, sh_cbr_y - sw, sh_cdx, sh_cdy, col_shadow_clean, box_rad, corner_type & CORNER_BOTTOM_RIGHT, 0, NULL, NULL, NULL, false}, //shadow bar right - {sh_br, CC_FBDATA_TYPE_SHADOW_BOX, sh_rx, sh_ry, sw, sh_rdy, col_shadow, 0, CORNER_NONE, 0, NULL, NULL, NULL, false}, + {sh_br, CC_FBDATA_TYPE_SHADOW_BOX, sh_rx, sh_ry, sw, sh_rdy, col_shadow, 0, CORNER_NONE, 0, NULL, NULL, NULL, false}, //shadow corner top right - {sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x, sh_ctr_y, sh_cdx, sh_cdy - sh_cdy_size_offset, col_shadow, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false}, + {sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x, sh_ctr_y, sh_cdx, sh_cdy - sh_cdy_size_offset, col_shadow, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false}, //clean up inside body - {sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x - sw, sh_ctr_y - sw + th, sh_cdx, sh_cdy - sh_cdy_size_offset + sw, col_shadow_clean, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false}, + {sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x - sw, sh_ctr_y - sw + th, sh_cdx, sh_cdy - sh_cdy_size_offset + sw, col_shadow_clean, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false}, //main box - {true, CC_FBDATA_TYPE_BOX, ix + th, iy + th, dx - 2 * th, dy - 2 * th, col_body, max(0, box_rad - th), corner_type, 0, NULL, NULL, NULL, false}, + {true, CC_FBDATA_TYPE_BOX, ix + th, iy + th, dx - 2 * th, dy - 2 * th, col_body, max(0, box_rad - th), corner_type, 0, NULL, NULL, NULL, false}, //frame - {true, CC_FBDATA_TYPE_FRAME, ix, iy, dx, dy, col_frame_cur, box_rad, corner_type, th, NULL, NULL, NULL, false} + {true, CC_FBDATA_TYPE_FRAME, ix, iy, dx, dy, col_frame_cur, box_rad, corner_type, th, NULL, NULL, NULL, false} }; for (size_t i = 0; i < (sizeof(fbdata) / sizeof(fbdata[0])) ; i++) diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index d2a7b6dce..5eed2cfa9 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1409,7 +1409,7 @@ int CFileBrowser::paintFoot(bool show) { NEUTRINO_ICON_BUTTON_YELLOW, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_AUDIOPLAYER_SHUFFLE, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false }, - { NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false }, + { NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false } }; button_label_ext buttons_filelistmode[] = { @@ -1417,7 +1417,7 @@ int CFileBrowser::paintFoot(bool show) { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_MUTE_SMALL, LOCALE_FILEBROWSER_DELETE, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false }, - { NEUTRINO_ICON_BUTTON_BLUE, locale_filebrowser_filter, NULL, 0, false }, + { NEUTRINO_ICON_BUTTON_BLUE, locale_filebrowser_filter, NULL, 0, false } }; if (playlistmode) { diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 19800150e..f50f10874 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -243,7 +243,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_MBKEY_COPY_SEVERAL, &g_settings.mbkey_copy_several, NONEXISTANT_LOCALE }, {LOCALE_MBKEY_CUT, &g_settings.mbkey_cut, NONEXISTANT_LOCALE }, {LOCALE_MBKEY_TRUNCATE, &g_settings.mbkey_truncate, NONEXISTANT_LOCALE }, - {LOCALE_MBKEY_COVER, &g_settings.mbkey_cover, LOCALE_MENU_HINT_MBKEY_COVER }, + {LOCALE_MBKEY_COVER, &g_settings.mbkey_cover, LOCALE_MENU_HINT_MBKEY_COVER } }; // used by driver/rcinput.cpp diff --git a/src/gui/moviebrowser/mb_types.h b/src/gui/moviebrowser/mb_types.h index 1381b2203..24052073c 100644 --- a/src/gui/moviebrowser/mb_types.h +++ b/src/gui/moviebrowser/mb_types.h @@ -231,4 +231,4 @@ const CMenuOptionChooser::keyval GENRE_ALL[GENRE_ALL_COUNT] = { 0xA7, LOCALE_GENRE_TRAVEL_HOBBIES_7 } }; -#endif /*__MB_TYPES__*/ \ No newline at end of file +#endif /*__MB_TYPES__*/ diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp index 7b304b54b..9bdcbe155 100644 --- a/src/gui/network_service.cpp +++ b/src/gui/network_service.cpp @@ -56,7 +56,7 @@ static struct network_service services[] = { "DjMount", "djmount", "-o iocharset=UTF-8 /media/00upnp/", LOCALE_MENU_HINT_NET_DJMOUNT, "", 0 }, { "uShare", "ushare", "-D -n `cat /etc/hostname`", LOCALE_MENU_HINT_NET_USHARE, NULL, 0 }, { "xupnpd", "xupnpd", "", LOCALE_MENU_HINT_NET_XUPNPD, NULL, 0 }, - { "Dropbear", "dropbear", "-B", LOCALE_MENU_HINT_NET_DROPBEAR, NULL, 0 }, + { "Dropbear", "dropbear", "-B", LOCALE_MENU_HINT_NET_DROPBEAR, NULL, 0 } }; #define SERVICE_COUNT (sizeof(services)/sizeof(struct network_service)) diff --git a/src/gui/widget/keyboard_keys.h b/src/gui/widget/keyboard_keys.h index ac79614a6..9689574a5 100644 --- a/src/gui/widget/keyboard_keys.h +++ b/src/gui/widget/keyboard_keys.h @@ -20,7 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - static std::string keys_english[2][KEY_ROWS][KEY_COLUMNS] = { { @@ -71,9 +70,8 @@ static std::string keys_russian[2][KEY_ROWS][KEY_COLUMNS] = struct keyboard_layout keyboards[] = { - { "English", "english", keys_english } - , { "Deutsch", "deutsch", keys_deutsch } - , { "Русский", "russkij", keys_russian } + { "English", "english", keys_english }, + { "Deutsch", "deutsch", keys_deutsch }, + { "Русский", "russkij", keys_russian } }; #define LAYOUT_COUNT (sizeof(keyboards)/sizeof(struct keyboard_layout)) - diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 21b7a282f..ef9c50346 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -326,40 +326,40 @@ typedef struct lcd_setting_t const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = { - {"lcd_brightness" , DEFAULT_VFD_BRIGHTNESS }, - {"lcd_standbybrightness", DEFAULT_VFD_STANDBYBRIGHTNESS}, - {"lcd_contrast" , DEFAULT_LCD_CONTRAST }, - {"lcd_power" , DEFAULT_LCD_POWER }, - {"lcd_inverse" , DEFAULT_LCD_INVERSE }, - {"lcd_show_volume" , DEFAULT_LCD_SHOW_VOLUME }, - {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, - {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS } + {"lcd_brightness" , DEFAULT_VFD_BRIGHTNESS }, + {"lcd_standbybrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS}, + {"lcd_contrast" , DEFAULT_LCD_CONTRAST }, + {"lcd_power" , DEFAULT_LCD_POWER }, + {"lcd_inverse" , DEFAULT_LCD_INVERSE }, + {"lcd_show_volume" , DEFAULT_LCD_SHOW_VOLUME }, + {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, + {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS} #if USE_STB_HAL - ,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ } + ,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ } #endif #if HAVE_SPARK_HARDWARE - ,{"lcd_displaymode" , DEFAULT_LCD_DISPLAYMODE } - ,{"lcd_standbydisplaymode", DEFAULT_LCD_DISPLAYMODE } + ,{"lcd_displaymode" , DEFAULT_LCD_DISPLAYMODE } + ,{"lcd_standbydisplaymode", DEFAULT_LCD_DISPLAYMODE } #endif }; static SNeutrinoSettings::usermenu_t usermenu_default[] = { - { CRCInput::RC_red, "2,3,4,13", "", "red" }, - { CRCInput::RC_green, "6", "", "green" }, - { CRCInput::RC_yellow, "7,31", "", "yellow" }, - { CRCInput::RC_blue, "12,11,20,21,19,14,29,30,15", "", "blue" }, + { CRCInput::RC_red, "2,3,4,13", "", "red" }, + { CRCInput::RC_green, "6", "", "green" }, + { CRCInput::RC_yellow, "7,31", "", "yellow" }, + { CRCInput::RC_blue, "12,11,20,21,19,14,29,30,15", "", "blue" }, #if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 - { CRCInput::RC_playpause, "9", "", "5" }, + { CRCInput::RC_playpause, "9", "", "5" }, #else - { CRCInput::RC_play, "9", "", "5" }, + { CRCInput::RC_play, "9", "", "5" }, #endif - { CRCInput::RC_audio, "27", "", "6" }, + { CRCInput::RC_audio, "27", "", "6" }, #if HAVE_SPARK_HARDWARE - { CRCInput::RC_timer, "19", "", "7" }, - { CRCInput::RC_usb, "31", "", "6" }, - { CRCInput::RC_archive, "30", "", "4" }, + { CRCInput::RC_timer, "19", "", "7" }, + { CRCInput::RC_usb, "31", "", "6" }, + { CRCInput::RC_archive, "30", "", "4" }, #endif - { CRCInput::RC_nokey, "", "", "" }, + { CRCInput::RC_nokey, "", "", "" } }; /************************************************************************************** diff --git a/src/neutrinoMessages.h b/src/neutrinoMessages.h index 8cf072959..c74316b1c 100644 --- a/src/neutrinoMessages.h +++ b/src/neutrinoMessages.h @@ -76,7 +76,6 @@ struct NeutrinoMessages { SHOW_MAINMENU = CRCInput::RC_Messages + 25, LEAVE_ALL = CRCInput::RC_Messages + 26, - EVT_VOLCHANGED = CRCInput::RC_Events + 1, EVT_MUTECHANGED = CRCInput::RC_Events + 2, EVT_VCRCHANGED = CRCInput::RC_Events + 3, diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp index 234c9b02b..3041b8b7a 100644 --- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp +++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp @@ -72,9 +72,9 @@ void CyParser::init(CyhookHandler *hh) //============================================================================= const CyParser::TyCgiCall CyParser::yCgiCallList[] = { - { "cgi", &CyParser::cgi, "text/html; charset=UTF-8" }, + { "cgi", &CyParser::cgi, "text/html; charset=UTF-8" } #ifdef Y_CONFIG_FEATURE_SHOW_SERVER_CONFIG - { "server-config", &CyParser::cgi_server_config, "text/html"}, + ,{ "server-config", &CyParser::cgi_server_config, "text/html"} #endif }; //----------------------------------------------------------------------------- @@ -739,7 +739,7 @@ const CyParser::TyFuncCall CyParser::yFuncCallList[] = { "do_reload_httpd_config", &CyParser::func_do_reload_httpd_config }, { "httpd_change", &CyParser::func_change_httpd }, { "get_languages_as_dropdown", &CyParser::func_get_languages_as_dropdown }, - { "set_language", &CyParser::func_set_language }, + { "set_language", &CyParser::func_set_language } }; //------------------------------------------------------------------------- diff --git a/src/system/settings.cpp b/src/system/settings.cpp index dca7026ca..8282dbe6f 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -120,7 +120,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_usermenu_plugin_type_games" , false}, {"personalize_usermenu_plugin_type_tools" , false}, {"personalize_usermenu_plugin_type_scripts" , false}, - {"personalize_usermenu_plugin_type_lua" , false}, + {"personalize_usermenu_plugin_type_lua" , false} }; CScanSettings::CScanSettings(void) diff --git a/src/zapit/include/linux.old/dvb/osd.h b/src/zapit/include/linux.old/dvb/osd.h index 880e68435..55efb3abd 100644 --- a/src/zapit/include/linux.old/dvb/osd.h +++ b/src/zapit/include/linux.old/dvb/osd.h @@ -94,7 +94,7 @@ typedef enum { OSD_Text, // (x0,y0,size,color,text) OSD_SetWindow, // (x0) set window with number 0