Change function signature on subsystem function

This commit is contained in:
twinaphex 2019-12-30 05:17:31 +01:00
parent f01afe72c6
commit f3742a101c
6 changed files with 10 additions and 9 deletions

View File

@ -6687,7 +6687,7 @@ static int materialui_list_push(void *data, void *userdata,
else
subsystem = subsystem_data;
menu_subsystem_populate(subsystem, info);
menu_subsystem_populate(subsystem, info->list);
}
if (settings->bools.menu_content_show_history)

View File

@ -843,7 +843,7 @@ static int ozone_list_push(void *data, void *userdata,
else
subsystem = subsystem_data;
menu_subsystem_populate(subsystem, info);
menu_subsystem_populate(subsystem, info->list);
}
if (settings->bools.menu_show_load_disc)

View File

@ -6189,7 +6189,7 @@ static int xmb_list_push(void *data, void *userdata,
else
subsystem = subsystem_data;
menu_subsystem_populate(subsystem, info);
menu_subsystem_populate(subsystem, info->list);
}
if (settings->bools.menu_show_load_disc)

View File

@ -9227,7 +9227,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (sys_info && sys_info->subsystem.data)
subsystem = sys_info->subsystem.data;
menu_subsystem_populate(subsystem, info);
menu_subsystem_populate(subsystem, info->list);
}
if (settings->bools.menu_content_show_history)

View File

@ -3966,9 +3966,10 @@ void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha)
rgba[3] = rgba[7] = rgba[11] = rgba[15] = alpha;
}
void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_displaylist_info_t *info)
void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, void *data)
{
settings_t *settings = config_get_ptr();
file_list_t *list = (file_list_t*)data;
/* Note: Create this string here explicitly (rather than
* using a #define elsewhere) since we need to be aware of
* its length... */
@ -4037,7 +4038,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
strlcpy(s, tmp, sizeof(s));
}
menu_entries_append_enum(info->list,
menu_entries_append_enum(list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
MENU_ENUM_LABEL_SUBSYSTEM_ADD,
@ -4084,7 +4085,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
}
}
menu_entries_append_enum(info->list,
menu_entries_append_enum(list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_LOAD),
MENU_ENUM_LABEL_SUBSYSTEM_LOAD,
@ -4125,7 +4126,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
}
}
menu_entries_append_enum(info->list,
menu_entries_append_enum(list,
s,
msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
MENU_ENUM_LABEL_SUBSYSTEM_ADD,

View File

@ -713,7 +713,7 @@ void menu_driver_destroy(void);
void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha);
void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_displaylist_info_t *info);
void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, void *data);
menu_handle_t *menu_driver_get_ptr(void);