mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some void pointers

Browse Source
This commit is contained in:
twinaphex 2018-09-17 09:57:30 +02:00
parent c40700e51b
commit 3aec8abca9
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/menu_setting.c
View File

@ -1506,16 +1506,16 @@ void menu_setting_get_label(void *data, char *s,
setting->get_string_representation(setting, s, len); setting->get_string_representation(setting, s, len);
} }
void general_read_handler(void *data) void general_read_handler(rarch_setting_t *setting)
{ {
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting) if (!setting)
return; return;
if (setting->enum_idx != MSG_UNKNOWN) if (setting->enum_idx == MSG_UNKNOWN)
{ return;
switch (setting->enum_idx) switch (setting->enum_idx)
{ {
case MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA: case MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA:
@ -1556,12 +1556,10 @@ void general_read_handler(void *data)
break; break;
} }
} }
}
void general_write_handler(void *data) void general_write_handler(rarch_setting_t *setting)
{ {
enum event_command rarch_cmd = CMD_EVENT_NONE; enum event_command rarch_cmd = CMD_EVENT_NONE;
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting) if (!setting)
@ -1854,10 +1852,9 @@ void general_write_handler(void *data)
} }
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
static void overlay_enable_toggle_change_handler(void *data) static void overlay_enable_toggle_change_handler(rarch_setting_t *setting)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_setting_t *setting = (rarch_setting_t *)data;
if (!setting) if (!setting)
return; return;

13
menu/menu_setting.h
View File

@ -123,13 +123,14 @@ void menu_setting_get_label(void *data, char *s,
int menu_action_handle_setting(rarch_setting_t *setting, int menu_action_handle_setting(rarch_setting_t *setting,
unsigned type, unsigned action, bool wraparound); unsigned type, unsigned action, bool wraparound);
enum setting_type menu_setting_get_browser_selection_type(rarch_setting_t *setting); enum setting_type menu_setting_get_browser_selection_type(
rarch_setting_t *setting);
void *setting_get_ptr(rarch_setting_t *setting); void *setting_get_ptr(rarch_setting_t *setting);
void general_write_handler(void *data); void general_write_handler(rarch_setting_t *setting);
void general_read_handler(void *data); void general_read_handler(rarch_setting_t *setting);
void menu_settings_list_current_add_cmd( void menu_settings_list_current_add_cmd(
rarch_setting_t **list, rarch_setting_t **list,
@ -140,7 +141,8 @@ void menu_settings_list_current_add_range(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
float min, float max, float step, float min, float max, float step,
bool enforce_minrange_enable, bool enforce_maxrange_enable); bool enforce_minrange_enable,
bool enforce_maxrange_enable);
void settings_data_list_current_add_flags( void settings_data_list_current_add_flags(
rarch_setting_t **list, rarch_setting_t **list,
@ -167,7 +169,8 @@ void menu_setting_free(void *data);
bool settings_list_append(rarch_setting_t **list, bool settings_list_append(rarch_setting_t **list,
rarch_setting_info_t *list_info); rarch_setting_info_t *list_info);
bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data); bool menu_setting_ctl(
enum menu_setting_ctl_state state, void *data);
RETRO_END_DECLS RETRO_END_DECLS

2
setting_list.h
View File

@ -73,7 +73,7 @@ typedef struct rarch_setting rarch_setting_t;
typedef struct rarch_setting_info rarch_setting_info_t; typedef struct rarch_setting_info rarch_setting_info_t;
typedef struct rarch_setting_group_info rarch_setting_group_info_t; typedef struct rarch_setting_group_info rarch_setting_group_info_t;
typedef void (*change_handler_t )(void *data); typedef void (*change_handler_t )(rarch_setting_t *data);
typedef int (*action_left_handler_t )(void *data, bool wraparound); typedef int (*action_left_handler_t )(void *data, bool wraparound);
typedef int (*action_right_handler_t )(void *data, bool wraparound); typedef int (*action_right_handler_t )(void *data, bool wraparound);
typedef int (*action_up_handler_t )(void *data); typedef int (*action_up_handler_t )(void *data);