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

Cleanup menu_entries.c

Browse Source
This commit is contained in:
Twinaphex 2015-09-06 05:04:16 +02:00
parent 3b3fa56309
commit 3d219c14d1
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
menu/menu_entries.c
View File

@ -30,18 +30,18 @@ struct menu_entries
menu_navigation_t navigation;
};
static struct menu_entries *menu_entries_get_ptr(void)
static menu_entries_t *menu_entries_get_ptr(void)
{
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return NULL;
return (struct menu_entries*)menu->entries;
return menu->entries;
}
rarch_setting_t *menu_setting_get_ptr(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries)
return NULL;
@ -50,7 +50,7 @@ rarch_setting_t *menu_setting_get_ptr(void)
menu_list_t *menu_list_get_ptr(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries)
return NULL;
return entries->menu_list;
@ -58,7 +58,7 @@ menu_list_t *menu_list_get_ptr(void)
menu_navigation_t *menu_navigation_get_ptr(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries)
return NULL;
return &entries->navigation;
@ -67,7 +67,7 @@ menu_navigation_t *menu_navigation_get_ptr(void)
/* Sets the starting index of the menu entry list. */
void menu_entries_set_start(size_t i)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (entries)
entries->begin = i;
@ -76,7 +76,7 @@ void menu_entries_set_start(size_t i)
/* Returns the starting index of the menu entry list. */
size_t menu_entries_get_start(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries)
return 0;
@ -87,7 +87,7 @@ size_t menu_entries_get_start(void)
/* Returns the last index (+1) of the menu entry list. */
size_t menu_entries_get_end(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
return menu_list_get_size(entries->menu_list);
}
@ -98,7 +98,7 @@ void menu_entries_get(size_t i, menu_entry_t *entry)
const char *path = NULL;
const char *entry_label = NULL;
menu_file_list_cbs_t *cbs = NULL;
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries || !entries->menu_list)
return;
@ -132,7 +132,7 @@ int menu_entries_get_title(char *s, size_t len)
const char *label = NULL;
unsigned menu_type = 0;
menu_file_list_cbs_t *cbs = NULL;
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries->menu_list)
return -1;
@ -150,7 +150,7 @@ int menu_entries_get_title(char *s, size_t len)
* one level deep in the menu hierarchy). */
bool menu_entries_show_back(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries->menu_list)
return false;
@ -195,7 +195,7 @@ int menu_entries_get_core_title(char *s, size_t len)
bool menu_entries_needs_refresh(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries || entries->nonblocking_refresh)
return false;
@ -206,7 +206,7 @@ bool menu_entries_needs_refresh(void)
void menu_entries_set_refresh(bool nonblocking)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (entries)
{
if (nonblocking)
@ -218,7 +218,7 @@ void menu_entries_set_refresh(bool nonblocking)
void menu_entries_unset_refresh(bool nonblocking)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (entries)
{
if (nonblocking)
@ -230,12 +230,12 @@ void menu_entries_unset_refresh(bool nonblocking)
bool menu_entries_init(void *data)
{
struct menu_entries *entries = NULL;
menu_entries_t *entries = NULL;
menu_handle_t *menu = (menu_handle_t*)data;
if (!menu)
goto error;
entries = (struct menu_entries*)calloc(1, sizeof(*entries));
entries = (menu_entries_t*)calloc(1, sizeof(*entries));
if (!entries)
goto error;
@ -257,7 +257,7 @@ error:
void menu_entries_free(void)
{
struct menu_entries *entries = menu_entries_get_ptr();
menu_entries_t *entries = menu_entries_get_ptr();
if (!entries)
return;
@ -269,16 +269,14 @@ void menu_entries_free(void)
entries->menu_list = NULL;
}
void menu_entries_free_list(void *data)
void menu_entries_free_list(menu_entries_t *entries)
{
struct menu_entries *entries = (struct menu_entries*)data;
if (entries && entries->list_settings)
menu_setting_free(entries->list_settings);
}
void menu_entries_new_list(void *data, unsigned flags)
void menu_entries_new_list(menu_entries_t *entries, unsigned flags)
{
struct menu_entries *entries = (struct menu_entries*)data;
if (!entries)
return;
entries->list_settings = menu_setting_new(flags);

6
menu/menu_entries.h
View File

@ -30,7 +30,7 @@
extern "C" {
#endif
struct menu_entries_t;
typedef struct menu_entries menu_entries_t;
void menu_entries_set_start(size_t i);
@ -60,9 +60,9 @@ bool menu_entries_init(void *data);
void menu_entries_free(void);
void menu_entries_free_list(void *data);
void menu_entries_free_list(menu_entries_t *entries);
void menu_entries_new_list(void *data, unsigned flags);
void menu_entries_new_list(menu_entries_t *entries, unsigned flags);
#ifdef __cplusplus
}