diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 064a332e9b..569be2da58 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -211,7 +211,6 @@ static void glui_render(void) int bottom; unsigned width, height, header_height; glui_handle_t *glui = NULL; - menu_display_t *disp = menu_display_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); settings_t *settings = config_get_ptr(); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index ab0043a8b0..a7d4c984bd 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -570,7 +570,6 @@ static void xmb_selection_pointer_changed(bool allow_animations) int threshold = 0; xmb_handle_t *xmb = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - menu_display_t *disp = menu_display_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); settings_t *settings = config_get_ptr(); @@ -642,12 +641,8 @@ static void xmb_list_open_old(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current) { unsigned i, height = 0; - int threshold = xmb->icon.size * 10; + int threshold = xmb->icon.size * 10; size_t end = 0; - menu_display_t *disp = menu_display_get_ptr(); - - if (!disp) - return; end = file_list_get_size(list); @@ -692,8 +687,7 @@ static void xmb_list_open_new(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current) { unsigned i, height; - int threshold = xmb->icon.size * 10; - menu_display_t *disp = menu_display_get_ptr(); + int threshold = xmb->icon.size * 10; size_t end = file_list_get_size(list); video_driver_get_size(NULL, &height); @@ -911,7 +905,6 @@ static void xmb_list_switch(xmb_handle_t *xmb) size_t selection; int dir = -1; menu_handle_t *menu = menu_driver_get_ptr(); - menu_display_t *disp = menu_display_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) @@ -1018,7 +1011,6 @@ static void xmb_list_open(xmb_handle_t *xmb) size_t selection; int dir = 0; menu_handle_t *menu = menu_driver_get_ptr(); - menu_display_t *disp = menu_display_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); if (!menu) @@ -1405,7 +1397,6 @@ static void xmb_render(void) xmb_handle_t *xmb = NULL; settings_t *settings = config_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); - menu_display_t *disp = menu_display_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); if (!menu) @@ -2295,10 +2286,9 @@ static void xmb_list_free(file_list_t *list, static void xmb_list_clear(file_list_t *list) { - menu_display_t *disp = menu_display_get_ptr(); - size_t size, i; + size_t i; + size_t size = list->size; - size = list->size; for (i = 0; i < size; ++i) { float *subjects[5]; @@ -2481,7 +2471,6 @@ static void xmb_toggle(bool menu_on) { xmb_handle_t *xmb = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - menu_display_t *disp = menu_display_get_ptr(); if (!menu) return; diff --git a/menu/menu_animation.c b/menu/menu_animation.c index 48e623de8d..4e58cfce89 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -650,7 +650,6 @@ void menu_animation_ticker_str(char *s, size_t len, uint64_t idx, void menu_animation_update_time(void) { static retro_time_t last_clock_update = 0; - menu_display_t *disp = menu_display_get_ptr(); menu_animation_t *anim = menu_animation_get_ptr(); settings_t *settings = config_get_ptr(); diff --git a/menu/menu_input.c b/menu/menu_input.c index aff7782e01..041d149c26 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1080,7 +1080,6 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs, unsigned header_height; size_t selection; int ret = 0; - menu_display_t *disp = menu_display_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr(); settings_t *settings = config_get_ptr(); @@ -1224,7 +1223,6 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) | (1UL << RETRO_DEVICE_ID_JOYPAD_R); bool set_scroll = false; size_t new_scroll_accel = 0; - menu_display_t *disp = menu_display_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr(); driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr();