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

Properly namespace functions in menu_entries.c

Browse Source
This commit is contained in:
twinaphex 2014-10-17 21:06:48 +02:00
parent 8da8447b28
commit 3164aebab7
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/menu/menu_entries.c
View File

@ -20,7 +20,7 @@
#include "../../settings_data.h" #include "../../settings_data.h"
#include "../../performance.h" #include "../../performance.h"
void entries_refresh(file_list_t *list) void menu_entries_refresh(file_list_t *list)
{ {
if (!list || !driver.menu) if (!list || !driver.menu)
return; return;
@ -36,7 +36,7 @@ void entries_refresh(file_list_t *list)
menu_clear_navigation(driver.menu, true); menu_clear_navigation(driver.menu, true);
} }
static inline bool menu_list_elem_is_dir(file_list_t *buf, static inline bool entries_list_elem_is_dir(file_list_t *buf,
unsigned offset) unsigned offset)
{ {
const char *path = NULL; const char *path = NULL;
@ -48,7 +48,7 @@ static inline bool menu_list_elem_is_dir(file_list_t *buf,
return type != MENU_FILE_PLAIN; return type != MENU_FILE_PLAIN;
} }
static inline int menu_list_get_first_char(file_list_t *buf, static inline int entries_list_get_first_char(file_list_t *buf,
unsigned offset) unsigned offset)
{ {
int ret; int ret;
@ -66,7 +66,7 @@ static inline int menu_list_get_first_char(file_list_t *buf,
return ret; return ret;
} }
void menu_build_scroll_indices(file_list_t *list) void menu_entries_build_scroll_indices(file_list_t *list)
{ {
size_t i; size_t i;
int current; int current;
@ -81,13 +81,13 @@ void menu_build_scroll_indices(file_list_t *list)
driver.menu->scroll_indices[driver.menu->scroll_indices_size++] = 0; driver.menu->scroll_indices[driver.menu->scroll_indices_size++] = 0;
current = menu_list_get_first_char(list, 0); current = entries_list_get_first_char(list, 0);
current_is_dir = menu_list_elem_is_dir(list, 0); current_is_dir = entries_list_elem_is_dir(list, 0);
for (i = 1; i < list->size; i++) for (i = 1; i < list->size; i++)
{ {
int first = menu_list_get_first_char(list, i); int first = entries_list_get_first_char(list, i);
bool is_dir = menu_list_elem_is_dir(list, i); bool is_dir = entries_list_elem_is_dir(list, i);
if ((current_is_dir && !is_dir) || (first > current)) if ((current_is_dir && !is_dir) || (first > current))
driver.menu->scroll_indices[driver.menu->scroll_indices_size++] = i; driver.menu->scroll_indices[driver.menu->scroll_indices_size++] = i;
@ -129,7 +129,7 @@ void menu_entries_push(
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
} }
static int push_main_menu_list(menu_handle_t *menu, static int entries_push_main_menu_list(menu_handle_t *menu,
file_list_t *list, file_list_t *list,
const char *path, const char *label, const char *path, const char *label,
unsigned menu_type) unsigned menu_type)
@ -375,9 +375,8 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list,
} }
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
menu_build_scroll_indices(list); menu_entries_build_scroll_indices(list);
menu_entries_refresh(list);
entries_refresh(list);
if (driver.menu_ctx && driver.menu_ctx->populate_entries) if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, dir, label, type); driver.menu_ctx->populate_entries(driver.menu, dir, label, type);
@ -396,7 +395,7 @@ int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list)
file_list_get_last(menu_list, &path, &label, &type); file_list_get_last(menu_list, &path, &label, &type);
if (!strcmp(label, "Main Menu")) if (!strcmp(label, "Main Menu"))
return push_main_menu_list(driver.menu, list, path, label, type); return entries_push_main_menu_list(driver.menu, list, path, label, type);
cbs = (menu_file_list_cbs_t*) cbs = (menu_file_list_cbs_t*)
file_list_get_last_actiondata(menu_list); file_list_get_last_actiondata(menu_list);
@ -417,7 +416,7 @@ bool menu_entries_init(menu_handle_t *menu)
menu_list_push_stack(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); menu_list_push_stack(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0);
menu_clear_navigation(menu, true); menu_clear_navigation(menu, true);
push_main_menu_list(menu, menu->selection_buf, entries_push_main_menu_list(menu, menu->selection_buf,
"", "Main Menu", 0); "", "Main Menu", 0);
return true; return true;

4
frontend/menu/menu_entries.h
View File

@ -38,9 +38,9 @@ int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list);
bool menu_entries_init(menu_handle_t *menu); bool menu_entries_init(menu_handle_t *menu);
void entries_refresh(file_list_t *list); void menu_entries_refresh(file_list_t *list);
void menu_build_scroll_indices(file_list_t *list); void menu_entries_build_scroll_indices(file_list_t *list);
int setting_set_flags(rarch_setting_t *setting); int setting_set_flags(rarch_setting_t *setting);

7
frontend/menu/menu_entries_cbs.c
View File

@ -1445,7 +1445,8 @@ static int deferred_push_core_list_deferred(void *data, void *userdata,
file_list_sort_on_alt(list); file_list_sort_on_alt(list);
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
entries_refresh(list); menu_entries_build_scroll_indices(list);
menu_entries_refresh(list);
if (driver.menu_ctx && driver.menu_ctx->populate_entries) if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, path, label, type); driver.menu_ctx->populate_entries(driver.menu, path, label, type);
@ -1998,8 +1999,8 @@ static int deferred_push_history_list(void *data, void *userdata,
} }
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
menu_build_scroll_indices(list); menu_entries_build_scroll_indices(list);
entries_refresh(list); menu_entries_refresh(list);
if (driver.menu_ctx && driver.menu_ctx->populate_entries) if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, path, label, type); driver.menu_ctx->populate_entries(driver.menu, path, label, type);