Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert the last commit... setting wasnt worth the space

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12874 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-21 07:26:07 +00:00
parent a5c5bd3831
commit e4689fd18e
5 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/lang/english.lang
View file

@ -10725,17 +10725,3 @@
*: "" *: ""
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_BACKLIGHT_IN_PLUGINS
desc: in lcd settings
user:
<source>
*: "Backlight (In Plugins)"
</source>
<dest>
*: "Backlight (In Plugins)"
</dest>
<voice>
*: "Backlight in plugins"
</voice>
</phrase>

3
apps/menus/display_menu.c
View file

@ -79,7 +79,6 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item)
/* LCD MENU */ /* LCD MENU */
#if CONFIG_BACKLIGHT #if CONFIG_BACKLIGHT
MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL);
MENUITEM_SETTING(backlight_in_plugins, &global_settings.backlight_in_plugins, NULL);
#if CONFIG_CHARGING #if CONFIG_CHARGING
MENUITEM_SETTING(backlight_timeout_plugged, MENUITEM_SETTING(backlight_timeout_plugged,
&global_settings.backlight_timeout_plugged, NULL); &global_settings.backlight_timeout_plugged, NULL);
@ -181,7 +180,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
# ifdef HAS_BUTTON_HOLD # ifdef HAS_BUTTON_HOLD
,&backlight_on_button_hold ,&backlight_on_button_hold
# endif # endif
,&caption_backlight, &backlight_in_plugins ,&caption_backlight
# if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) # if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
,&backlight_fade_in, &backlight_fade_out ,&backlight_fade_in, &backlight_fade_out
# endif # endif

11
apps/plugin.c
View file

@ -609,17 +609,10 @@ int plugin_load(const char* plugin, void* parameter)
#endif #endif
invalidate_icache(); invalidate_icache();
#if CONFIG_BACKLIGHT
if (global_settings.backlight_in_plugins == 1)
backlight_set_timeout(1);
#endif
rc = hdr->entry_point((struct plugin_api*) &rockbox_api, parameter); rc = hdr->entry_point((struct plugin_api*) &rockbox_api, parameter);
/* explicitly casting the pointer here to avoid touching every plugin. */ /* explicitly casting the pointer here to avoid touching every plugin. */
#if CONFIG_BACKLIGHT
if (global_settings.backlight_in_plugins == 1)
backlight_set_timeout(global_settings.backlight_timeout);
#endif
button_clear_queue(); button_clear_queue();
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP

4
apps/settings.h
View file

@ -704,9 +704,7 @@ struct user_settings
(defined(HAVE_RECORDING) || CONFIG_TUNER) (defined(HAVE_RECORDING) || CONFIG_TUNER)
int alarm_wake_up_screen; int alarm_wake_up_screen;
#endif #endif
#if CONFIG_BACKLIGHT
int backlight_in_plugins;
#endif
}; };
/** global variables **/ /** global variables **/

5
apps/settings_list.c
View file

@ -971,10 +971,7 @@ const struct settings_list settings[] = {
"normal,off,on", backlight_set_on_button_hold, 3, "normal,off,on", backlight_set_on_button_hold, 3,
ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)), ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
#endif #endif
CHOICE_SETTING(0, backlight_in_plugins,
LANG_BACKLIGHT_IN_PLUGINS, 0, "backlight in settings",
"normal,on", NULL, 2,
ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_ON)),
#ifdef HAVE_LCD_SLEEP #ifdef HAVE_LCD_SLEEP
STRINGCHOICE_SETTING(0, lcd_sleep_after_backlight_off, STRINGCHOICE_SETTING(0, lcd_sleep_after_backlight_off,
LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF, 3, LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF, 3,