Take out set_label callback

This commit is contained in:
twinaphex 2014-10-26 22:09:49 +01:00
parent 99524703ab
commit 24f9d740d0
4 changed files with 4 additions and 15 deletions

View File

@ -18,8 +18,6 @@ typedef struct menu_file_list_cbs
typedef struct menu_ctx_driver_backend
{
int (*iterate)(unsigned);
void (*setting_set_label)(char *, size_t, unsigned *,
unsigned, const char *, const char *, unsigned);
void (*list_insert)(void *, const char *, const char *, unsigned, size_t);
void (*list_delete)(void *, size_t, size_t);
void (*list_clear)(void *);

View File

@ -746,14 +746,6 @@ static int menu_common_iterate(unsigned action)
return ret;
}
static void menu_common_setting_set_label(char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned idx)
{
setting_data_get_label(type_str, type_str_size, w,
type, menu_label, label, idx);
}
static void menu_common_list_insert(void *data,
const char *path, const char *label,
unsigned type, size_t idx)
@ -807,7 +799,6 @@ static void menu_common_list_set_selection(void *data)
menu_ctx_driver_backend_t menu_ctx_backend_common = {
menu_common_iterate,
menu_common_setting_set_label,
menu_common_list_insert,
menu_common_list_delete,
menu_common_list_clear,

View File

@ -530,6 +530,5 @@ menu_ctx_driver_backend_t menu_ctx_backend_lakka = {
NULL,
NULL,
NULL,
NULL,
"menu_lakka",
};

View File

@ -1,6 +1,8 @@
#ifndef _DISP_SHARED_H
#define _DISP_SHARED_H
#include "../../../settings_data.h"
static void get_title(const char *label, const char *dir,
unsigned menu_type, char *title, size_t sizeof_title)
{
@ -217,9 +219,8 @@ static void disp_set_label(file_list_t* list,
type_str_size);
else if (type == MENU_FILE_PUSH || type == MENU_FILE_LINEFEED_SWITCH)
strlcpy(type_str, "...", type_str_size);
else if (driver.menu_ctx && driver.menu_ctx->backend &&
driver.menu_ctx->backend->setting_set_label)
driver.menu_ctx->backend->setting_set_label(type_str,
else
setting_data_get_label(type_str,
type_str_size, w, type, label, entry_label, i);
strlcpy(path_buf, path, path_buf_size);