From 1a152677a307997979b9309d76baf922d8348dcc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 11 May 2015 18:31:32 +0200
Subject: [PATCH] Get rid of entry_iterate callback in menu driver

---
 menu/drivers/glui.c        | 6 ------
 menu/drivers/null.c        | 1 -
 menu/drivers/rgui.c        | 6 ------
 menu/drivers/rmenu.c       | 6 ------
 menu/drivers/rmenu_xui.cpp | 6 ------
 menu/drivers/xmb.c         | 6 ------
 menu/menu.c                | 5 +++--
 menu/menu_driver.c         | 8 --------
 menu/menu_driver.h         | 3 ---
 9 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index b6c686fd14..8b11070d82 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -55,11 +55,6 @@ typedef struct glui_handle
    gl_font_raster_block_t list_block;
 } glui_handle_t;
 
-static int glui_entry_iterate(unsigned action)
-{
-   return menu_entry_iterate(action);
-}
-
 static void glui_blit_line(float x, float y,
       const char *message, uint32_t color, enum text_alignment text_align)
 {
@@ -681,7 +676,6 @@ menu_ctx_driver_t menu_ctx_glui = {
    NULL,
    NULL,
    NULL,
-   glui_entry_iterate,
    glui_load_wallpaper,
    "glui",
 };
diff --git a/menu/drivers/null.c b/menu/drivers/null.c
index bc12d2f494..772ee7d333 100644
--- a/menu/drivers/null.c
+++ b/menu/drivers/null.c
@@ -47,6 +47,5 @@ menu_ctx_driver_t menu_ctx_null = {
   NULL, // list_cache
   NULL, // list_set_selection
   NULL,
-  NULL,
   "null",
 };
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index f77d40d802..6e3d484f12 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -56,11 +56,6 @@ static INLINE uint16_t argb32_to_rgba4444(uint32_t col)
    return (r << 12) | (g << 8) | (b << 4) | a;
 }
 
-static int rgui_entry_iterate(unsigned action)
-{
-   return menu_entry_iterate(action);
-}
-
 static void rgui_copy_glyph(uint8_t *glyph, const uint8_t *buf)
 {
    int x, y;
@@ -669,7 +664,6 @@ menu_ctx_driver_t menu_ctx_rgui = {
    NULL,
    NULL,
    NULL,
-   rgui_entry_iterate,
    NULL,
    "rgui",
 };
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index 458a835d1c..c6651133c3 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -65,11 +65,6 @@ struct texture_image *menu_texture;
 static bool render_normal = true;
 static bool menu_texture_inited =false;
 
-static int rmenu_entry_iterate(unsigned action)
-{
-   return menu_entry_iterate(action);
-}
-
 static void rmenu_render_background(void)
 {
 }
@@ -335,7 +330,6 @@ menu_ctx_driver_t menu_ctx_rmenu = {
    NULL,
    NULL,
    NULL,
-   rmenu_entry_iterate,
    NULL,
    "rmenu",
 };
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index feca3938b6..ca3b320d1b 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -61,11 +61,6 @@ HXUIOBJ root_menu;
 HXUIOBJ current_menu;
 static msg_queue_t *xui_msg_queue;
 
-static int rmenu_xui_entry_iterate(unsigned action)
-{
-   return menu_entry_iterate(action);
-}
-
 class CRetroArch : public CXuiModule
 {
    protected:
@@ -688,7 +683,6 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
    rmenu_xui_list_clear,
    NULL,
    rmenu_xui_list_set_selection,
-   rmenu_xui_entry_iterate,
    NULL,
    "rmenu_xui",
 };
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 15b0786f88..b97aa1bcb3 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -245,11 +245,6 @@ static float xmb_item_y(xmb_handle_t *xmb, int i, size_t current)
    return iy;
 }
 
-static int xmb_entry_iterate(unsigned action)
-{
-   return menu_entry_iterate(action);
-}
-
 static void xmb_draw_icon_begin(gl_t *gl)
 {
    glEnable(GL_BLEND);
@@ -1947,7 +1942,6 @@ menu_ctx_driver_t menu_ctx_xmb = {
    NULL,
    xmb_list_cache,
    NULL,
-   xmb_entry_iterate,
    xmb_load_wallpaper,
    "xmb",
 };
diff --git a/menu/menu.c b/menu/menu.c
index 8dd5ecad0e..24b0058a28 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -16,6 +16,7 @@
 
 #include "menu.h"
 #include "menu_display.h"
+#include "menu_entry.h"
 #include "menu_entries.h"
 #include "menu_shader.h"
 #include "../dynamic.h"
@@ -91,7 +92,7 @@ bool menu_load_content(void)
    if (menu)
       menu->msg_force = true;
 
-   menu_driver_entry_iterate(MENU_ACTION_NOOP);
+   menu_entry_iterate(MENU_ACTION_NOOP);
 
    menu_display_fb();
 
@@ -352,7 +353,7 @@ int menu_iterate(retro_input_t input,
       last_clock_update = menu->cur_time;
    }
 
-   menu_driver_entry_iterate(action);
+   menu_entry_iterate(action);
 
    if (runloop->is_menu && !runloop->is_idle)
       menu_display_fb();
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index bf9b427c2a..c4fc21e630 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -292,14 +292,6 @@ void menu_driver_frame(void)
       driver->frame();
 }
 
-void menu_driver_entry_iterate(unsigned action)
-{
-   const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
-
-   if (driver->entry_iterate)
-      driver->entry_iterate(action);
-}
-
 void menu_driver_free(menu_handle_t *menu)
 {
    const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 6b79b90086..84898c03b9 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -269,7 +269,6 @@ typedef struct menu_ctx_driver
    void  (*list_clear)(file_list_t *list);
    void  (*list_cache)(bool, unsigned);
    void  (*list_set_selection)(file_list_t *list);
-   int   (*entry_iterate)(unsigned);
    bool  (*load_background)(void *data);
    const char *ident;
 } menu_ctx_driver_t;
@@ -332,8 +331,6 @@ void menu_driver_frame(void);
 
 void menu_driver_context_reset(void);
 
-void menu_driver_entry_iterate(unsigned action);
-
 void menu_driver_free(menu_handle_t *menu);
 
 void menu_driver_render(void);