Communicate better that these are enums

This commit is contained in:
twinaphex 2016-02-25 19:30:14 +01:00
parent 255ee8766f
commit 05f2a2d18c
6 changed files with 16 additions and 16 deletions

View File

@ -1171,8 +1171,7 @@ static void mui_context_destroy(void *data)
mui_context_bg_destroy(mui);
}
static bool mui_load_image(void *userdata, void *data,
menu_image_type_t type)
static bool mui_load_image(void *userdata, void *data, enum menu_image_type type)
{
mui_handle_t *mui = (mui_handle_t*)userdata;
@ -1292,7 +1291,7 @@ static void mui_context_reset(void *data)
menu_display_handle_wallpaper_upload, NULL);
}
static int mui_environ(menu_environ_cb_t type, void *data, void *userdata)
static int mui_environ(enum menu_environ_cb type, void *data, void *userdata)
{
switch (type)
{

View File

@ -837,7 +837,8 @@ static void rgui_populate_entries(void *data,
rgui_navigation_set(data, true);
}
static int rgui_environ(menu_environ_cb_t type, void *data, void *userdata)
static int rgui_environ(enum menu_environ_cb type,
void *data, void *userdata)
{
switch (type)
{

View File

@ -1284,7 +1284,7 @@ static void xmb_refresh_horizontal_list(xmb_handle_t *xmb)
xmb_context_reset_horizontal_list(xmb, themepath);
}
static int xmb_environ(menu_environ_cb_t type, void *data, void *userdata)
static int xmb_environ(enum menu_environ_cb type, void *data, void *userdata)
{
switch (type)
{
@ -2272,7 +2272,7 @@ static void xmb_context_bg_destroy(xmb_handle_t *xmb)
video_driver_texture_unload(&xmb->textures.bg.id);
}
static bool xmb_load_image(void *userdata, void *data, menu_image_type_t type)
static bool xmb_load_image(void *userdata, void *data, enum menu_image_type type)
{
xmb_handle_t *xmb = (xmb_handle_t*)userdata;

View File

@ -677,7 +677,7 @@ static void xui_list_set_selection(void *data, file_list_t *list)
file_list_get_directory_ptr(list));
}
static int xui_environ(menu_environ_cb_t type, void *data)
static int xui_environ(enum menu_environ_cb type, void *data)
{
switch (type)
{

View File

@ -1202,7 +1202,7 @@ static void zarch_context_destroy(void *data)
}
static bool zarch_load_image(void *userdata,
void *data, menu_image_type_t type)
void *data, enum menu_image_type type)
{
zui_t *zui = (zui_t*)userdata;

View File

@ -58,19 +58,19 @@ extern "C" {
#define MENU_KEYBOARD_BIND_TIMEOUT_SECONDS 5
typedef enum
enum menu_image_type
{
MENU_IMAGE_NONE = 0,
MENU_IMAGE_WALLPAPER,
MENU_IMAGE_BOXART
} menu_image_type_t;
};
typedef enum
enum menu_environ_cb
{
MENU_ENVIRON_NONE = 0,
MENU_ENVIRON_RESET_HORIZONTAL_LIST,
MENU_ENVIRON_LAST
} menu_environ_cb_t;
};
typedef enum
{
@ -341,9 +341,9 @@ typedef struct menu_ctx_driver
const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1,
uint32_t label_hash, uint32_t menu_label_hash);
bool (*load_image)(void *userdata, void *data, menu_image_type_t type);
bool (*load_image)(void *userdata, void *data, enum menu_image_type type);
const char *ident;
int (*environ_cb)(menu_environ_cb_t type, void *data, void *userdata);
int (*environ_cb)(enum menu_environ_cb type, void *data, void *userdata);
int (*pointer_tap)(void *data, unsigned x, unsigned y, unsigned ptr,
menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action);
@ -352,7 +352,7 @@ typedef struct menu_ctx_driver
typedef struct menu_ctx_load_image
{
void *data;
menu_image_type_t type;
enum menu_image_type type;
} menu_ctx_load_image_t;
typedef struct menu_ctx_list
@ -382,7 +382,7 @@ typedef struct menu_ctx_iterate
typedef struct menu_ctx_environment
{
menu_environ_cb_t type;
enum menu_environ_cb type;
void *data;
} menu_ctx_environment_t;