Revert "Add type to populate_entries"

This reverts commit 5a7de50bd3c23fdbe81a802840bfe8e5275571c2.
This commit is contained in:
twinaphex 2015-09-21 21:32:31 +02:00
parent 1fc97df819
commit 51d3738a00
6 changed files with 8 additions and 16 deletions

View File

@ -740,14 +740,12 @@ static void glui_navigation_alphabet(size_t *unused)
}
static void glui_populate_entries(const char *path,
const char *label, unsigned i, unsigned type)
const char *label, unsigned i)
{
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
(void)type;
menu->scroll_y = glui_get_scroll();
}

View File

@ -747,12 +747,9 @@ static void rgui_navigation_ascend_alphabet(size_t *unused)
}
static void rgui_populate_entries(const char *path,
const char *label, unsigned k, unsigned type)
const char *label, unsigned k)
{
menu_handle_t *menu = menu_driver_get_ptr();
(void)type;
if (menu)
rgui_navigation_set(true);
}

View File

@ -603,7 +603,7 @@ static void rmenu_xui_render(void)
}
static void rmenu_xui_populate_entries(const char *path,
const char *label, unsigned i, unsigned type)
const char *label, unsigned i)
{
menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
@ -613,7 +613,6 @@ static void rmenu_xui_populate_entries(const char *path,
(void)label;
(void)path;
(void)type;
XuiListSetCurSelVisible(m_menulist, menu_navigation_get_selection(nav));
}

View File

@ -1068,7 +1068,7 @@ static void xmb_list_open(xmb_handle_t *xmb)
}
static void xmb_populate_entries(const char *path,
const char *label, unsigned k, unsigned type)
const char *label, unsigned k)
{
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
@ -1076,8 +1076,6 @@ static void xmb_populate_entries(const char *path,
if (!menu)
return;
(void)type;
xmb = (xmb_handle_t*)menu->userdata;
if (!xmb)

View File

@ -2309,12 +2309,12 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
}
static void menu_driver_populate_entries(const char *path,
const char *label, unsigned k, unsigned type)
const char *label, unsigned k)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->populate_entries)
driver->populate_entries(path, label, k, type);
driver->populate_entries(path, label, k);
}
int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
@ -2896,7 +2896,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
if (need_refresh)
menu_list_refresh(info->list);
menu_driver_populate_entries(info->path, info->label, info->type, type);
menu_driver_populate_entries(info->path, info->label, info->type);
if (ui && driver)
ui->notify_list_loaded(driver->ui_companion_data,

View File

@ -127,7 +127,7 @@ typedef struct menu_ctx_driver
void (*context_reset)(void);
void (*context_destroy)(void);
void (*populate_entries)(const char *path, const char *label,
unsigned k, unsigned type);
unsigned k);
void (*toggle)(bool);
void (*navigation_clear)(bool);
void (*navigation_decrement)(void);