diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-10-07 15:02:02 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-10-07 15:02:02 +0000 |
| commit | 5f1ec307db83e4980ffc60b9052a53ff9da13dab (patch) | |
| tree | e9e3db840b44be7474b0290ac28145f0170f1d90 /apps | |
| parent | 0464c36bdc2ddeb12f3902c9f996440cda41e1f8 (diff) | |
| download | rockbox-5f1ec307db83e4980ffc60b9052a53ff9da13dab.zip rockbox-5f1ec307db83e4980ffc60b9052a53ff9da13dab.tar.gz rockbox-5f1ec307db83e4980ffc60b9052a53ff9da13dab.tar.bz2 rockbox-5f1ec307db83e4980ffc60b9052a53ff9da13dab.tar.xz | |
Name all button light functions and variables consistently starting with buttonlight_ .
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15016 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menus/settings_menu.c | 4 | ||||
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/settings.h | 2 | ||||
| -rw-r--r-- | apps/settings_list.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 9a4079f..8adcfe9 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -337,7 +337,7 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); #ifdef HAVE_BUTTON_LIGHT -MENUITEM_SETTING(button_light_timeout, &global_settings.button_light_timeout, NULL); +MENUITEM_SETTING(buttonlight_timeout, &global_settings.buttonlight_timeout, NULL); #endif #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS @@ -371,7 +371,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), &car_adapter_mode, #endif #ifdef HAVE_BUTTON_LIGHT - &button_light_timeout, + &buttonlight_timeout, #endif #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS &buttonlight_brightness diff --git a/apps/settings.c b/apps/settings.c index 26036c8..6656b84 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -713,7 +713,7 @@ void settings_apply(void) buttonlight_set_brightness(global_settings.buttonlight_brightness); #endif #ifdef HAVE_BUTTON_LIGHT - button_backlight_set_timeout(global_settings.button_light_timeout); + buttonlight_set_timeout(global_settings.buttonlight_timeout); #endif #ifndef HAVE_FLASH_STORAGE ata_spindown(global_settings.disk_spindown); diff --git a/apps/settings.h b/apps/settings.h index ee8fd48..7399f62 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -739,7 +739,7 @@ struct user_settings unsigned char colors_file[MAX_FILENAME+1]; #endif #ifdef HAVE_BUTTON_LIGHT - int button_light_timeout; + int buttonlight_timeout; #endif #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS int buttonlight_brightness; diff --git a/apps/settings_list.c b/apps/settings_list.c index 7981f27..a409d51 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -711,7 +711,7 @@ const struct settings_list settings[] = { TALK_ID(7, UNIT_SEC), TALK_ID(8, UNIT_SEC), TALK_ID(9, UNIT_SEC), TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), TALK_ID(25, UNIT_SEC), TALK_ID(30, UNIT_SEC), TALK_ID(45, UNIT_SEC), - TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), + TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3, @@ -1254,11 +1254,11 @@ const struct settings_list settings[] = { THEME_DIR "/", ".colours", MAX_FILENAME+1), #endif #ifdef HAVE_BUTTON_LIGHT - INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout, + INT_SETTING_W_CFGVALS(F_FLIPLIST, buttonlight_timeout, LANG_BUTTONLIGHT_TIMEOUT, 6, "button light timeout", backlight_times_conf, UNIT_SEC, 0, 18, 1, backlight_formatter, backlight_getlang, - button_backlight_set_timeout), + buttonlight_set_timeout), #endif #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS INT_SETTING(0, buttonlight_brightness, LANG_BUTTONLIGHT_BRIGHTNESS, DEFAULT_BRIGHTNESS_SETTING, |