len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hopefully fix all of the red and yellow.

Browse source 
Change-Id: I356b664067a6eecbb01f8a71cf9fa2cfcfd75128
This commit is contained in:
Solomon Peachy 2025-09-27 11:39:19 -04:00
parent d7d7627baf
commit 7c30b318e4
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
apps/settings_list.c
View file

@ -89,6 +89,18 @@
#endif #endif
#define NODEFAULT INT(0) #define NODEFAULT INT(0)
#ifdef HAVE_TOUCHSCREEN
#if defined(APPLICATION) \
|| defined(ONDA_VX747) \
|| defined(ONDA_VX767) \
|| defined(ONDA_VX747P) \
|| defined(ONDA_VX777)
#define DEFAULT_TOUCHSCREEN_MODE TOUCHSCREEN_POINT
#else
#define DEFAULT_TOUCHSCREEN_MODE TOUCHSCREEN_BUTTON
#endif
#endif /* HAVE_TOUCHSCREEN */
/* in all the following macros the args are: /* in all the following macros the args are:
- flags: bitwise | or the F_ bits in settings_list.h - flags: bitwise | or the F_ bits in settings_list.h
- var: pointer to the variable being changed (usually in global_settings) - var: pointer to the variable being changed (usually in global_settings)
@ -115,16 +127,16 @@
yes_id is the lang_id for the 'yes' (or 'on') option in the menu yes_id is the lang_id for the 'yes' (or 'on') option in the menu
no_id is the lang_id for the 'no' (or 'off') option in the menu no_id is the lang_id for the 'no' (or 'off') option in the menu
*/ */
#ifdef __PCTOOL_ #ifdef __PCTOOL__
#define BOOL_SETTING(flags,var,lang_id,default,name,cfgvals,yes_id,no_id,cb)\
{flags|F_BOOL_SETTING, &global_settings.var, \
lang_id, BOOL(default),name, \
{.bool_setting=(struct bool_setting[]){{cb,yes_id,no_id,cfgvals}}} }
#else
#define BOOL_SETTING(flags,var,lang_id,default,name,cfgvals,yes_id,no_id,cb)\ #define BOOL_SETTING(flags,var,lang_id,default,name,cfgvals,yes_id,no_id,cb)\
{flags|F_BOOL_SETTING, &global_settings.var, \ {flags|F_BOOL_SETTING, &global_settings.var, \
lang_id, BOOL(default),name, \ lang_id, BOOL(default),name, \
{.bool_setting=(struct bool_setting[]){{NULL,yes_id,no_id,cfgvals}}} } {.bool_setting=(struct bool_setting[]){{NULL,yes_id,no_id,cfgvals}}} }
#else
#define BOOL_SETTING(flags,var,lang_id,default,name,cfgvals,yes_id,no_id,cb)\
{flags|F_BOOL_SETTING, &global_settings.var, \
lang_id, BOOL(default),name, \
{.bool_setting=(struct bool_setting[]){{cb,yes_id,no_id,cfgvals}}} }
#endif #endif
/* bool setting which does use LANG_YES and _NO and save as "off,on" */ /* bool setting which does use LANG_YES and _NO and save as "off,on" */
@ -186,6 +198,15 @@
/* Similar to above, except the strings to display are taken from cfg_vals, /* Similar to above, except the strings to display are taken from cfg_vals,
the ... arg is a list of ID's to talk for the strings, can use TALK_ID()'s */ the ... arg is a list of ID's to talk for the strings, can use TALK_ID()'s */
#ifdef __PCTOOL__
#define STRINGCHOICE_SETTING(flags,var,lang_id,default,name,cfg_vals, \
cb,count,...) \
{flags|F_CHOICE_SETTING|F_T_INT|F_CHOICETALKS, \
&global_settings.var, lang_id, \
INT(default), name, \
{.choice_setting = (struct choice_setting[]){ \
{NULL, count, cfg_vals, {.talks = (const int[]){__VA_ARGS__}}}}}}
#else
#define STRINGCHOICE_SETTING(flags,var,lang_id,default,name,cfg_vals, \ #define STRINGCHOICE_SETTING(flags,var,lang_id,default,name,cfg_vals, \
cb,count,...) \ cb,count,...) \
{flags|F_CHOICE_SETTING|F_T_INT|F_CHOICETALKS, \ {flags|F_CHOICE_SETTING|F_T_INT|F_CHOICETALKS, \
@ -193,6 +214,7 @@
INT(default), name, \ INT(default), name, \
{.choice_setting = (struct choice_setting[]){ \ {.choice_setting = (struct choice_setting[]){ \
{cb, count, cfg_vals, {.talks = (const int[]){__VA_ARGS__}}}}}} {cb, count, cfg_vals, {.talks = (const int[]){__VA_ARGS__}}}}}}
#endif
/* for settings which use the set_int() setting screen. /* for settings which use the set_int() setting screen.
unit is the UNIT_ define to display/talk. unit is the UNIT_ define to display/talk.
@ -263,7 +285,7 @@
is_change, set_default) \ is_change, set_default) \
{flags|F_CUSTOM_SETTING|F_T_CUSTOM|F_BANFROMQS, \ {flags|F_CUSTOM_SETTING|F_T_CUSTOM|F_BANFROMQS, \
&global_settings.var, lang_id, \ &global_settings.var, lang_id, \
{.custom = (void*)default}, name, \ {.custom = NULL}, name, \
{.custom_setting = (struct custom_setting[]){ \ {.custom_setting = (struct custom_setting[]){ \
{NULL, NULL, NULL, NULL}}}} {NULL, NULL, NULL, NULL}}}}
#else #else
@ -798,19 +820,8 @@ static void qs_set_default(void* var, void* defaultval)
*(const struct settings_list **)var = find_setting(defaultval); *(const struct settings_list **)var = find_setting(defaultval);
} }
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
#if defined(APPLICATION) \
|| defined(ONDA_VX747) \
|| defined(ONDA_VX767) \
|| defined(ONDA_VX747P) \
|| defined(ONDA_VX777)
#define DEFAULT_TOUCHSCREEN_MODE TOUCHSCREEN_POINT
#else
#define DEFAULT_TOUCHSCREEN_MODE TOUCHSCREEN_BUTTON
#endif
static void tsc_load_from_cfg(void* setting, char*value) static void tsc_load_from_cfg(void* setting, char*value)
{ {
struct touchscreen_parameter *var = (struct touchscreen_parameter*) setting; struct touchscreen_parameter *var = (struct touchscreen_parameter*) setting;