From bb98e35cac3ed070affa607107fbd77cf4f2139b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 5 Jun 2015 13:17:44 +0200
Subject: [PATCH] (Menu) Pass hash values to 'init_bind' functions

---
 menu/menu_entries_cbs.c                    | 38 +++++++++--------
 menu/menu_entries_cbs.h                    | 48 ++++++++++++++--------
 menu/menu_entries_cbs_cancel.c             |  3 +-
 menu/menu_entries_cbs_contentlist_switch.c |  3 +-
 menu/menu_entries_cbs_deferred_push.c      |  7 ++--
 menu/menu_entries_cbs_down.c               |  3 +-
 menu/menu_entries_cbs_info.c               |  3 +-
 menu/menu_entries_cbs_iterate.c            |  3 +-
 menu/menu_entries_cbs_left.c               |  8 ++--
 menu/menu_entries_cbs_ok.c                 | 24 +++++------
 menu/menu_entries_cbs_refresh.c            |  3 +-
 menu/menu_entries_cbs_representation.c     | 11 +++--
 menu/menu_entries_cbs_right.c              |  8 ++--
 menu/menu_entries_cbs_scan.c               |  3 +-
 menu/menu_entries_cbs_select.c             |  3 +-
 menu/menu_entries_cbs_start.c              |  9 ++--
 menu/menu_entries_cbs_title.c              |  3 +-
 menu/menu_entries_cbs_up.c                 |  3 +-
 18 files changed, 101 insertions(+), 82 deletions(-)

diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index b87b0831b9..d404740e51 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -14,6 +14,8 @@
  */
 
 #include <file/file_path.h>
+#include <rhash.h>
+
 #include "menu.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
@@ -231,6 +233,7 @@ void menu_entries_cbs_init(void *data,
    menu_file_list_cbs_t *cbs    = NULL;
    file_list_t *list            = (file_list_t*)data;
    menu_handle_t *menu          = menu_driver_get_ptr();
+   uint32_t label_hash = 0, menu_label_hash = 0;
    if (!menu)
       return;
 
@@ -259,20 +262,23 @@ void menu_entries_cbs_init(void *data,
       str_list = NULL;
    }
 
-   menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx, elem0, elem1, menu_label);
-   menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label);
-   menu_entries_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label);
-   menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_title(cbs, path, label, type, idx, elem0, elem1);
+   label_hash      = djb2_calculate(label);
+   menu_label_hash = djb2_calculate(menu_label);
+
+   menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
+   menu_entries_cbs_init_bind_title(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 }
diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h
index 93af3268ef..82055a8407 100644
--- a/menu/menu_entries_cbs.h
+++ b/menu/menu_entries_cbs.h
@@ -191,67 +191,83 @@ int menu_entries_common_is_settings_entry(const char *label);
 
 void menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label);
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label);
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label);
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_iterate(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 void menu_entries_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1);
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash);
 
 int deferred_push_content_list(void *data, void *userdata,
       const char *path, const char *label, unsigned type);
diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c
index 38c669af16..f3d1956a6d 100644
--- a/menu/menu_entries_cbs_cancel.c
+++ b/menu/menu_entries_cbs_cancel.c
@@ -27,7 +27,8 @@ static int action_cancel_pop_default(const char *path,
 
 void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_contentlist_switch.c b/menu/menu_entries_cbs_contentlist_switch.c
index dad95d4880..745aac4d4a 100644
--- a/menu/menu_entries_cbs_contentlist_switch.c
+++ b/menu/menu_entries_cbs_contentlist_switch.c
@@ -18,7 +18,8 @@
 
 void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c
index 019e6172ba..8b33694988 100644
--- a/menu/menu_entries_cbs_deferred_push.c
+++ b/menu/menu_entries_cbs_deferred_push.c
@@ -14,7 +14,6 @@
  */
 
 #include <file/file_path.h>
-#include <rhash.h>
 
 #include "menu.h"
 #include "menu_displaylist.h"
@@ -453,10 +452,10 @@ static int deferred_push_default(menu_displaylist_info_t *info)
 
 void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    settings_t *settings   = config_get_ptr();
-   uint32_t hash          = djb2_calculate(label);
 
    if (!cbs)
       return;
@@ -487,7 +486,7 @@ void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       cbs->action_deferred_push = deferred_push_rdb_collection;
    else
    {
-      switch (hash)
+      switch (label_hash)
       {
          case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST:
 #ifdef HAVE_NETWORKING
diff --git a/menu/menu_entries_cbs_down.c b/menu/menu_entries_cbs_down.c
index 22c5613274..ffe05589f0 100644
--- a/menu/menu_entries_cbs_down.c
+++ b/menu/menu_entries_cbs_down.c
@@ -36,7 +36,8 @@ static int action_bind_down_generic(unsigned type, const char *label)
 
 void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_info.c b/menu/menu_entries_cbs_info.c
index e2518cb642..b1d0ba3b9e 100644
--- a/menu/menu_entries_cbs_info.c
+++ b/menu/menu_entries_cbs_info.c
@@ -31,7 +31,8 @@ static int action_info_default(unsigned type, const char *label)
 
 void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c
index 6b4715f7dc..d7c6699d9c 100644
--- a/menu/menu_entries_cbs_iterate.c
+++ b/menu/menu_entries_cbs_iterate.c
@@ -578,7 +578,8 @@ static int action_iterate_main(const char *label, unsigned action)
 
 void menu_entries_cbs_init_bind_iterate(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (cbs)
       cbs->action_iterate = action_iterate_main;
diff --git a/menu/menu_entries_cbs_left.c b/menu/menu_entries_cbs_left.c
index 7910f8bacf..6549684817 100644
--- a/menu/menu_entries_cbs_left.c
+++ b/menu/menu_entries_cbs_left.c
@@ -14,7 +14,6 @@
  */
 
 #include <file/file_path.h>
-#include <rhash.h>
 
 #include "menu.h"
 #include "menu_entries_cbs.h"
@@ -352,11 +351,10 @@ static int bind_left_generic(unsigned type, const char *label,
 
 void menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label)
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    int i;
-   uint32_t            hash = djb2_calculate(label);
-   uint32_t menu_label_hash = djb2_calculate(menu_label);
 
    if (!cbs)
       return;
@@ -435,7 +433,7 @@ void menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
       cbs->action_left = core_setting_left;
    else
    {
-      switch (hash)
+      switch (label_hash)
       {
          case MENU_LABEL_SAVESTATE:
          case MENU_LABEL_LOADSTATE:
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index acb8598aa1..b2bb9e9a07 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -14,7 +14,6 @@
  */
 
 #include <file/file_path.h>
-#include <rhash.h>
 
 #include "menu.h"
 #include "menu_display.h"
@@ -1401,9 +1400,9 @@ static int action_ok_video_resolution(const char *path,
    return 0;
 }
 
-static int is_rdb_entry(uint32_t hash)
+static int is_rdb_entry(uint32_t label_hash)
 {
-   switch (hash)
+   switch (label_hash)
    {
       case MENU_LABEL_RDB_ENTRY_PUBLISHER:
       case MENU_LABEL_RDB_ENTRY_DEVELOPER:
@@ -1562,7 +1561,7 @@ static int menu_entries_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs
 }
 
 static int menu_entries_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
-      uint32_t hash, uint32_t menu_label_hash, unsigned type)
+      uint32_t label_hash, uint32_t menu_label_hash, unsigned type)
 {
    switch (type)
    {
@@ -1609,7 +1608,7 @@ static int menu_entries_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
          cbs->action_ok = action_ok_compressed_archive_push;
          break;
       case MENU_FILE_CORE:
-         if (hash == MENU_LABEL_DEFERRED_CORE_LIST)
+         if (label_hash == MENU_LABEL_DEFERRED_CORE_LIST)
             cbs->action_ok = action_ok_core_load_deferred;
          else
          {
@@ -1703,16 +1702,13 @@ static int menu_entries_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
 
 void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label)
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    rarch_setting_t *setting = menu_setting_find(label);
    menu_handle_t *menu      = menu_driver_get_ptr();
-   uint32_t hash            = djb2_calculate(label);
-   uint32_t menu_label_hash = djb2_calculate(menu_label);
 
-   if (!cbs)
-      return;
-   if (!menu)
+   if (!cbs || !menu)
       return;
 
 #if 0
@@ -1721,7 +1717,7 @@ void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
 
    cbs->action_ok = action_ok_lookup_setting;
 
-   if (elem0[0] != '\0' && (is_rdb_entry(hash) == 0))
+   if (elem0[0] != '\0' && (is_rdb_entry(label_hash) == 0))
    {
       cbs->action_ok = action_ok_rdb_entry_submenu;
       return;
@@ -1746,8 +1742,8 @@ void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
    else if (type >= MENU_SETTINGS_CHEAT_BEGIN
          && type <= MENU_SETTINGS_CHEAT_END)
       cbs->action_ok = action_ok_cheat;
-   else if (menu_entries_cbs_init_bind_ok_compare_label(cbs, hash) == 0)
+   else if (menu_entries_cbs_init_bind_ok_compare_label(cbs, label_hash) == 0)
       return;
 
-   menu_entries_cbs_init_bind_ok_compare_type(cbs, hash, menu_label_hash, type);
+   menu_entries_cbs_init_bind_ok_compare_type(cbs, label_hash, menu_label_hash, type);
 }
diff --git a/menu/menu_entries_cbs_refresh.c b/menu/menu_entries_cbs_refresh.c
index b4aeabb48d..0d300da7cf 100644
--- a/menu/menu_entries_cbs_refresh.c
+++ b/menu/menu_entries_cbs_refresh.c
@@ -24,7 +24,8 @@ static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 
 void menu_entries_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (cbs)
       cbs->action_refresh = action_refresh_default;
diff --git a/menu/menu_entries_cbs_representation.c b/menu/menu_entries_cbs_representation.c
index 27c41fb66b..81d01606bc 100644
--- a/menu/menu_entries_cbs_representation.c
+++ b/menu/menu_entries_cbs_representation.c
@@ -14,7 +14,6 @@
  */
 
 #include <file/file_path.h>
-#include <rhash.h>
 
 #include "menu.h"
 #include "menu_entries_cbs.h"
@@ -788,9 +787,9 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
 }
 
 static int menu_entries_cbs_init_bind_get_string_representation_compare_label(
-      menu_file_list_cbs_t *cbs, uint32_t hash)
+      menu_file_list_cbs_t *cbs, uint32_t label_hash)
 {
-   switch (hash)
+   switch (label_hash)
    {
       case MENU_LABEL_CHEAT_NUM_PASSES:
          cbs->action_get_representation =
@@ -837,9 +836,9 @@ static int menu_entries_cbs_init_bind_get_string_representation_compare_label(
 
 void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
-   uint32_t hash = djb2_calculate(label);
    if (!cbs)
       return;
 
@@ -867,7 +866,7 @@ void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *
          && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
       cbs->action_get_representation =
          menu_action_setting_disp_set_label_shader_parameter;
-   else if (menu_entries_cbs_init_bind_get_string_representation_compare_label(cbs, hash) == 0)
+   else if (menu_entries_cbs_init_bind_get_string_representation_compare_label(cbs, label_hash) == 0)
       return;
 
    switch (type)
diff --git a/menu/menu_entries_cbs_right.c b/menu/menu_entries_cbs_right.c
index 60ce92c809..3539a19ab4 100644
--- a/menu/menu_entries_cbs_right.c
+++ b/menu/menu_entries_cbs_right.c
@@ -14,7 +14,6 @@
  */
 
 #include <file/file_path.h>
-#include <rhash.h>
 
 #include "menu.h"
 #include "menu_entries_cbs.h"
@@ -355,11 +354,10 @@ static int bind_right_generic(unsigned type, const char *label,
 
 void menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1, const char *menu_label)
+      const char *elem0, const char *elem1, const char *menu_label,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    int i;
-   uint32_t            hash = djb2_calculate(label);
-   uint32_t menu_label_hash = djb2_calculate(menu_label);
 
    if (!cbs)
       return;
@@ -437,7 +435,7 @@ void menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
       cbs->action_right = core_setting_right;
    else
    {
-      switch (hash)
+      switch (label_hash)
       {
          case MENU_LABEL_SAVESTATE:
          case MENU_LABEL_LOADSTATE:
diff --git a/menu/menu_entries_cbs_scan.c b/menu/menu_entries_cbs_scan.c
index 7626ffe5d2..8531e020cb 100644
--- a/menu/menu_entries_cbs_scan.c
+++ b/menu/menu_entries_cbs_scan.c
@@ -42,7 +42,8 @@ static int action_scan_directory(const char *path,
 
 void menu_entries_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c
index 4d1a5ada41..3870369cc5 100644
--- a/menu/menu_entries_cbs_select.c
+++ b/menu/menu_entries_cbs_select.c
@@ -59,7 +59,8 @@ static int action_select_directory(const char *path, const char *label, unsigned
 
 void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c
index 09f17ae7c2..5201389a48 100644
--- a/menu/menu_entries_cbs_start.c
+++ b/menu/menu_entries_cbs_start.c
@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <rhash.h>
-
 #include "menu.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
@@ -301,16 +299,15 @@ int menu_entries_cbs_init_bind_start_compare_label(menu_file_list_cbs_t *cbs,
 
 void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
-   uint32_t hash = djb2_calculate(label);
-
    if (!cbs)
       return;
 
    cbs->action_start = action_start_lookup_setting;
    
-   if (menu_entries_cbs_init_bind_start_compare_label(cbs, hash) == 0)
+   if (menu_entries_cbs_init_bind_start_compare_label(cbs, label_hash) == 0)
       return;
 
    if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
diff --git a/menu/menu_entries_cbs_title.c b/menu/menu_entries_cbs_title.c
index 4692a81cc7..cb2c588933 100644
--- a/menu/menu_entries_cbs_title.c
+++ b/menu/menu_entries_cbs_title.c
@@ -314,7 +314,8 @@ static int action_get_title_default(const char *path, const char *label,
 
 void menu_entries_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;
diff --git a/menu/menu_entries_cbs_up.c b/menu/menu_entries_cbs_up.c
index 5a2e912c05..25a5fd7cc9 100644
--- a/menu/menu_entries_cbs_up.c
+++ b/menu/menu_entries_cbs_up.c
@@ -36,7 +36,8 @@ static int action_bind_up_generic(unsigned type, const char *label)
 
 void menu_entries_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1)
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
 {
    if (!cbs)
       return;