Merge pull request #2851 from lakkatv/master

List prepend
This commit is contained in:
Twinaphex 2016-04-11 20:50:07 +02:00
commit 00b398f6d2
11 changed files with 14 additions and 7 deletions

View File

@ -65,7 +65,7 @@ bool file_list_append(file_list_t *userdata, const char *path,
const char *label, unsigned type, size_t current_directory_ptr,
size_t entry_index);
bool file_list_push(file_list_t *list,
bool file_list_prepend(file_list_t *list,
const char *path, const char *label,
unsigned type, size_t directory_ptr,
size_t entry_idx);

View File

@ -59,7 +59,7 @@ static bool file_list_capacity(file_list_t *list, size_t cap)
return true;
}
bool file_list_push(file_list_t *list,
bool file_list_prepend(file_list_t *list,
const char *path, const char *label,
unsigned type, size_t directory_ptr,
size_t entry_idx)

View File

@ -1581,6 +1581,7 @@ menu_ctx_driver_t menu_ctx_mui = {
NULL,
NULL,
NULL,
NULL,
mui_list_cache,
mui_list_push,
mui_list_get_selection,

View File

@ -46,6 +46,7 @@ menu_ctx_driver_t menu_ctx_null = {
NULL, /* navigation_ascend_alphabet */
NULL, /* lists_init */
NULL, /* list_insert */
NULL, /* list_prepend */
NULL, /* list_delete */
NULL, /* list_clear */
NULL, /* list_cache */

View File

@ -911,6 +911,7 @@ menu_ctx_driver_t menu_ctx_rgui = {
NULL,
NULL,
NULL,
NULL,
"rgui",
rgui_environ,
rgui_pointer_tap,

View File

@ -3040,6 +3040,7 @@ menu_ctx_driver_t menu_ctx_xmb = {
xmb_menu_init_list,
xmb_list_insert,
NULL,
NULL,
xmb_list_clear,
xmb_list_cache,
xmb_list_push,

View File

@ -1345,6 +1345,7 @@ menu_ctx_driver_t menu_ctx_zarch = {
NULL,
NULL,
NULL,
NULL,
zarch_load_image,
"zarch",
NULL,

View File

@ -2345,8 +2345,8 @@ static int menu_displaylist_parse_add_content_list(
MENU_SETTING_ACTION, 0, 0);
#endif
#if 0
menu_entries_push(info->list,
#if 1
menu_entries_prepend(info->list,
"Test",
"new_test",
MENU_SETTING_ACTION, 0, 0);

View File

@ -325,6 +325,8 @@ typedef struct menu_ctx_driver
bool (*lists_init)(void*);
void (*list_insert)(void *userdata,
file_list_t *list, const char *, const char *, size_t);
int (*list_prepend)(void *userdata,
file_list_t *list, const char *, const char *, size_t);
void (*list_free)(file_list_t *list, size_t, size_t);
void (*list_clear)(file_list_t *list);
void (*list_cache)(void *data, enum menu_list_type, unsigned);

View File

@ -536,7 +536,7 @@ void menu_entries_add(file_list_t *list, const char *path, const char *label,
menu_cbs_init(list, cbs, path, label, type, idx);
}
void menu_entries_push(file_list_t *list, const char *path, const char *label,
void menu_entries_prepend(file_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr, size_t entry_idx)
{
menu_ctx_list_t list_info;
@ -545,7 +545,7 @@ void menu_entries_push(file_list_t *list, const char *path, const char *label,
if (!list || !label)
return;
file_list_push(list, path, label, type, directory_ptr, entry_idx);
file_list_prepend(list, path, label, type, directory_ptr, entry_idx);
idx = 0;

View File

@ -174,7 +174,7 @@ void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx,
rarch_setting_t *menu_entries_get_setting(uint32_t i);
void menu_entries_push(file_list_t *list, const char *path, const char *label,
void menu_entries_prepend(file_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr, size_t entry_idx);
bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data);