From 5188b3cc56d4588ba27ec940da5176fd2015b972 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 16 Sep 2014 04:21:31 +0200
Subject: [PATCH] (Menu) Don't need menu_type_is anymore in menu display
 drivers

---
 frontend/menu/disp/glui.c        | 12 +-----------
 frontend/menu/disp/rgui.c        |  8 +-------
 frontend/menu/disp/rmenu.c       |  8 +-------
 frontend/menu/disp/rmenu_xui.cpp |  7 +------
 frontend/menu/disp/shared.h      |  3 +--
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/frontend/menu/disp/glui.c b/frontend/menu/disp/glui.c
index 04af03fc23..6f67405e0a 100644
--- a/frontend/menu/disp/glui.c
+++ b/frontend/menu/disp/glui.c
@@ -196,19 +196,9 @@ static void glui_frame(void)
    const char *dir = NULL;
    const char *label = NULL;
    unsigned menu_type = 0;
-   unsigned menu_type_is = 0;
    file_list_get_last(driver.menu->menu_stack, &dir, &label, &menu_type);
 
-   if (driver.menu_ctx && driver.menu_ctx->backend &&
-         driver.menu_ctx->backend->type_is)
-      menu_type_is = driver.menu_ctx->backend->type_is(label, menu_type);
-
-#if 0
-   RARCH_LOG("Dir is: %s\n", label);
-#endif
-
-   get_title(label, dir, menu_type, menu_type_is,
-         title, sizeof(title));
+   get_title(label, dir, menu_type, title, sizeof(title));
 
    char title_buf[256];
    menu_ticker_line(title_buf, glui_term_width - 3,
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 49d9fb30e7..b3a060eb01 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -306,19 +306,13 @@ static void rgui_render(void)
    const char *dir = NULL;
    const char *label = NULL;
    unsigned menu_type = 0;
-   unsigned menu_type_is = 0;
    file_list_get_last(driver.menu->menu_stack, &dir, &label, &menu_type);
 
-   if (driver.menu_ctx && driver.menu_ctx->backend &&
-         driver.menu_ctx->backend->type_is)
-      menu_type_is = driver.menu_ctx->backend->type_is(label, menu_type);
-
 #if 0
    RARCH_LOG("Dir is: %s\n", label);
 #endif
 
-   get_title(label, dir, menu_type, menu_type_is,
-         title, sizeof(title));
+   get_title(label, dir, menu_type, title, sizeof(title));
 
    char title_buf[256];
    menu_ticker_line(title_buf, RGUI_TERM_WIDTH - 3,
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 45b0974e44..8bd8ade7f2 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -161,15 +161,9 @@ static void rmenu_render(void)
    const char *dir = NULL;
    const char *label = NULL;
    unsigned menu_type = 0;
-   unsigned menu_type_is = 0;
    file_list_get_last(menu->menu_stack, &dir, &label, &menu_type);
 
-   if (driver.menu_ctx && driver.menu_ctx->backend
-         && driver.menu_ctx->backend->type_is)
-      menu_type_is = driver.menu_ctx->backend->type_is(label, menu_type);
-
-   get_title(label, dir, menu_type, menu_type_is,
-         title, sizeof(title));
+   get_title(label, dir, menu_type, title, sizeof(title));
 
    char title_buf[256];
    menu_ticker_line(title_buf, RMENU_TERM_WIDTH,
diff --git a/frontend/menu/disp/rmenu_xui.cpp b/frontend/menu/disp/rmenu_xui.cpp
index ca87b848c6..6c9f2b3fc4 100644
--- a/frontend/menu/disp/rmenu_xui.cpp
+++ b/frontend/menu/disp/rmenu_xui.cpp
@@ -370,7 +370,6 @@ static void rmenu_xui_render(void)
    const char *dir = NULL;
    const char *label = NULL;
    unsigned menu_type = 0;
-   unsigned menu_type_is = 0;
 
    if (!driver.menu || driver.menu->need_refresh && 
          (g_extern.lifecycle_state & (1ULL << MODE_MENU))
@@ -385,11 +384,7 @@ static void rmenu_xui_render(void)
    file_list_get_last(driver.menu->menu_stack, &dir,
          &label, &menu_type);
 
-   if (driver.menu_ctx && driver.menu_ctx->backend
-         && driver.menu_ctx->backend->type_is)
-      menu_type_is = driver.menu_ctx->backend->type_is(label, menu_type);
-
-   get_title(label, dir, menu_type, menu_type_is,
+   get_title(label, dir, menu_type,
          title, sizeof(title));
 
    mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t));
diff --git a/frontend/menu/disp/shared.h b/frontend/menu/disp/shared.h
index 03e2d01207..a2bb28b56d 100644
--- a/frontend/menu/disp/shared.h
+++ b/frontend/menu/disp/shared.h
@@ -2,8 +2,7 @@
 #define _DISP_SHARED_H
 
 static void get_title(const char *label, const char *dir,
-      unsigned menu_type, unsigned menu_type_is,
-      char *title, size_t sizeof_title)
+      unsigned menu_type, char *title, size_t sizeof_title)
 {
    if (!strcmp(label, "core_list"))
       snprintf(title, sizeof_title, "CORE SELECTION %s", dir);