Make some more functions static

This commit is contained in:
twinaphex 2015-08-18 02:54:42 +02:00
parent 6cc37dd9ca
commit 2f3746a431
4 changed files with 32 additions and 38 deletions

View File

@ -2303,6 +2303,15 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
return 0;
}
static void menu_driver_populate_entries(const char *path,
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);
}
int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
{
size_t i, list_size;

View File

@ -262,29 +262,6 @@ size_t menu_driver_list_get_selection(void)
return 0;
}
void menu_driver_list_insert(file_list_t *list, const char *path,
const char *label, unsigned type, size_t idx)
{
menu_file_list_cbs_t *cbs = NULL;
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (!list)
return;
if (driver->list_insert)
driver->list_insert(list, path, label, idx);
file_list_free_actiondata(list, idx);
cbs = (menu_file_list_cbs_t*)
calloc(1, sizeof(menu_file_list_cbs_t));
if (!cbs)
return;
file_list_set_actiondata(list, idx, cbs);
menu_cbs_init(list, path, label, type, idx);
}
void menu_driver_list_cache(menu_list_type_t type, unsigned action)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
@ -368,15 +345,6 @@ void menu_driver_toggle(bool latch)
driver->toggle(latch);
}
void menu_driver_populate_entries(const char *path, 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);
}
bool menu_driver_load_image(void *data, menu_image_type_t type)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();

View File

@ -195,18 +195,12 @@ void menu_driver_free(menu_handle_t *menu);
void menu_driver_toggle(bool latch);
void menu_driver_populate_entries(const char *path, const char *label,
unsigned k);
bool menu_driver_load_image(void *data, menu_image_type_t type);
void menu_driver_list_cache(menu_list_type_t type, unsigned action);
void menu_driver_list_free(file_list_t *list, size_t i, size_t list_size);
void menu_driver_list_insert(file_list_t *list, const char *path,
const char *label, unsigned type, size_t list_size);
void menu_driver_list_clear(file_list_t *list);
size_t menu_driver_list_get_size(menu_list_type_t type);

View File

@ -24,6 +24,29 @@
#include "menu_list.h"
#include "menu_navigation.h"
static void menu_driver_list_insert(file_list_t *list, const char *path,
const char *label, unsigned type, size_t idx)
{
menu_file_list_cbs_t *cbs = NULL;
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (!list)
return;
if (driver->list_insert)
driver->list_insert(list, path, label, idx);
file_list_free_actiondata(list, idx);
cbs = (menu_file_list_cbs_t*)
calloc(1, sizeof(menu_file_list_cbs_t));
if (!cbs)
return;
file_list_set_actiondata(list, idx, cbs);
menu_cbs_init(list, path, label, type, idx);
}
menu_list_t *menu_list_get_ptr(void)
{
menu_entries_t *entries = menu_entries_get_ptr();