mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_cbs_get_value.c) Start getting rid of settings pointer

Browse Source 
grabbing
This commit is contained in:
twinaphex 2020-06-30 02:36:55 +02:00
parent ad8c22e6ac
commit 879cb375e7
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
menu/cbs/menu_cbs_get_value.c
View File

@ -120,14 +120,14 @@ static void menu_action_setting_disp_add_null_drivers(
const char *path, const char *path,
char *s2, size_t len2) char *s2, size_t len2)
{ {
settings_t *settings = config_get_ptr(); menu_file_list_cbs_t *cbs = list->list[i].actiondata;
bool add_null_drivers = settings->bools.add_null_drivers; bool val = *cbs->setting->value.target.boolean;
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
strlcpy(s2, path, len2); strlcpy(s2, path, len2);
if (add_null_drivers) if (val)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len);
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len);
@ -231,18 +231,13 @@ static void menu_action_setting_disp_set_label_netplay_mitm_server(
char *s2, size_t len2) char *s2, size_t len2)
{ {
unsigned j; unsigned j;
const char *netplay_mitm_server; menu_file_list_cbs_t *cbs = list->list[i].actiondata;
settings_t *settings = config_get_ptr(); const char *netplay_mitm_server = cbs->setting->value.target.string;
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
strlcpy(s2, path, len2); strlcpy(s2, path, len2);
if (!settings)
return;
netplay_mitm_server = settings->arrays.netplay_mitm_server;
if (string_is_empty(netplay_mitm_server)) if (string_is_empty(netplay_mitm_server))
return; return;
@ -264,14 +259,14 @@ static void menu_action_setting_disp_set_label_shader_watch_for_changes(
const char *path, const char *path,
char *s2, size_t len2) char *s2, size_t len2)
{ {
settings_t *settings = config_get_ptr(); menu_file_list_cbs_t *cbs = list->list[i].actiondata;
bool shader_watch_files = settings->bools.video_shader_watch_files; bool val = *cbs->setting->value.target.boolean;
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
strlcpy(s2, path, len2); strlcpy(s2, path, len2);
if (shader_watch_files) if (val)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TRUE), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TRUE), len);
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FALSE), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FALSE), len);
@ -326,18 +321,13 @@ static void menu_action_setting_disp_set_label_shader_default_filter(
const char *path, const char *path,
char *s2, size_t len2) char *s2, size_t len2)
{ {
settings_t *settings = config_get_ptr(); menu_file_list_cbs_t *cbs = list->list[i].actiondata;
bool video_smooth = false; bool val = *cbs->setting->value.target.boolean;
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
if (!settings) if (val)
return;
video_smooth = settings->bools.video_smooth;
if (video_smooth)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LINEAR), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LINEAR), len);
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NEAREST), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NEAREST), len);