devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Const-police, use less bytes where possible, get rid of duplicated backlight timeout array

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14310 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2007-08-13 12:21:27 +00:00
parent 58537b43e6
commit 45ffc87030
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/settings_list.c
View file

@ -207,8 +207,6 @@ static void rectime_formatter(char *buffer, int buffer_size,
#ifdef HAVE_BACKLIGHT #ifdef HAVE_BACKLIGHT
static const char backlight_times_conf [] = static const char backlight_times_conf [] =
"off,on,1,2,3,4,5,6,7,8,9,10,15,20,25,30,45,60,90"; "off,on,1,2,3,4,5,6,7,8,9,10,15,20,25,30,45,60,90";
static const int backlight_times[] =
{-1, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 45, 60, 90};
static void backlight_formatter(char *buffer, int buffer_size, static void backlight_formatter(char *buffer, int buffer_size,
int val, const char *unit) int val, const char *unit)
{ {
@ -217,8 +215,8 @@ static void backlight_formatter(char *buffer, int buffer_size,
strcpy(buffer, str(LANG_OFF)); strcpy(buffer, str(LANG_OFF));
else if (val == 1) else if (val == 1)
strcpy(buffer, str(LANG_ON)); strcpy(buffer, str(LANG_ON));
else else
snprintf(buffer, buffer_size, "%d s", backlight_times[val]); snprintf(buffer, buffer_size, "%d s", backlight_timeout_value[val]);
} }
static long backlight_getlang(int value) static long backlight_getlang(int value)
{ {
@ -226,11 +224,11 @@ static long backlight_getlang(int value)
return LANG_OFF; return LANG_OFF;
else if (value == 1) else if (value == 1)
return LANG_ON; return LANG_ON;
return TALK_ID(backlight_times[value], UNIT_SEC); return TALK_ID(backlight_timeout_value[value], UNIT_SEC);
} }
#endif #endif
/* ffwd/rewind and scan acceleration stuff */ /* ffwd/rewind and scan acceleration stuff */
static int ff_rewind_min_stepvals[] = {1,2,3,4,5,6,8,10,15,20,25,30,45,60}; static const unsigned char ff_rewind_min_stepvals[] = {1,2,3,4,5,6,8,10,15,20,25,30,45,60};
static long ff_rewind_min_step_getlang(int value) static long ff_rewind_min_step_getlang(int value)
{ {
return TALK_ID(ff_rewind_min_stepvals[value], UNIT_SEC); return TALK_ID(ff_rewind_min_stepvals[value], UNIT_SEC);
@ -257,7 +255,7 @@ static void scanaccel_formatter(char *buffer, int buffer_size,
snprintf(buffer, buffer_size, "2x/%ds", val); snprintf(buffer, buffer_size, "2x/%ds", val);
} }
static int poweroff_idle_timer_times[] = {0,1,2,3,4,5,6,7,8,9,10,15,30,45,60}; static const unsigned char poweroff_idle_timer_times[] = {0,1,2,3,4,5,6,7,8,9,10,15,30,45,60};
static long poweroff_idle_timer_getlang(int value) static long poweroff_idle_timer_getlang(int value)
{ {
if (value == 0) if (value == 0)