Cleanup some enums

This commit is contained in:
twinaphex 2015-09-26 23:27:03 +02:00
parent e3a7a67e43
commit 16eb95d3aa
3 changed files with 7 additions and 7 deletions

View File

@ -220,7 +220,7 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf)
if (!font) if (!font)
return false; return false;
menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT, &fb_font_inited); menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_DATA_INIT, &fb_font_inited);
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
@ -720,14 +720,14 @@ static void rgui_free(void *data)
free(menu->userdata); free(menu->userdata);
menu->userdata = NULL; menu->userdata = NULL;
menu_display_ctl(MENU_DISPLAY_CTL_FONT_FB_DATA_INIT, &fb_font_inited); menu_display_ctl(MENU_DISPLAY_CTL_FONT_DATA_INIT, &fb_font_inited);
if (fb_font_inited) if (fb_font_inited)
free((uint8_t*)disp->font.framebuf); free((uint8_t*)disp->font.framebuf);
fb_font_inited = false; fb_font_inited = false;
menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT, &fb_font_inited); menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_DATA_INIT, &fb_font_inited);
} }
static void rgui_set_texture(void) static void rgui_set_texture(void)

View File

@ -286,7 +286,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
frame_buf->pitch = *ptr; frame_buf->pitch = *ptr;
} }
return true; return true;
case MENU_DISPLAY_CTL_FONT_FB_DATA_INIT: case MENU_DISPLAY_CTL_FONT_DATA_INIT:
{ {
bool *ptr = (bool*)data; bool *ptr = (bool*)data;
if (!ptr) if (!ptr)
@ -294,7 +294,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
*ptr = disp->font.alloc_framebuf; *ptr = disp->font.alloc_framebuf;
} }
return true; return true;
case MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT: case MENU_DISPLAY_CTL_SET_FONT_DATA_INIT:
{ {
bool *ptr = (bool*)data; bool *ptr = (bool*)data;
if (!ptr) if (!ptr)

View File

@ -47,8 +47,8 @@ enum menu_display_ctl_state
MENU_DISPLAY_CTL_FB_PITCH, MENU_DISPLAY_CTL_FB_PITCH,
MENU_DISPLAY_CTL_SET_FB_PITCH, MENU_DISPLAY_CTL_SET_FB_PITCH,
MENU_DISPLAY_CTL_LIBRETRO, MENU_DISPLAY_CTL_LIBRETRO,
MENU_DISPLAY_CTL_FONT_FB_DATA_INIT, MENU_DISPLAY_CTL_FONT_DATA_INIT,
MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT MENU_DISPLAY_CTL_SET_FONT_DATA_INIT
}; };
typedef struct menu_display typedef struct menu_display