From 8dac9cf25d820a01406e42ff2ca3144a05c1caf7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 10:08:09 +0200 Subject: [PATCH] (Menu) Add menu hashes --- menu/menu_displaylist.c | 21 ++++++++++++++------- menu/menu_hash.c | 10 ++++++++++ menu/menu_hash.h | 5 +++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 72979ced2c..ded42b4203 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -924,13 +924,15 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->name) { snprintf(tmp, sizeof(tmp), "Name: %s", db_info_entry->name); - menu_list_push(info->list, tmp, "rdb_entry_name", + menu_list_push(info->list, tmp, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_NAME), 0, 0, 0); } if (db_info_entry->description) { snprintf(tmp, sizeof(tmp), "Description: %s", db_info_entry->description); - menu_list_push(info->list, tmp, "rdb_entry_description", + menu_list_push(info->list, tmp, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_DESCRIPTION), 0, 0, 0); } if (db_info_entry->publisher) @@ -1065,13 +1067,15 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) "Analog supported: %s", (db_info_entry->analog_supported == 1) ? "true" : (db_info_entry->analog_supported == -1) ? "N/A" : "false"); - menu_list_push(info->list, tmp, "rdb_entry_analog", + menu_list_push(info->list, tmp, + "rdb_entry_analog", 0, 0, 0); snprintf(tmp, sizeof(tmp), "Rumble supported: %s", (db_info_entry->rumble_supported == 1) ? "true" : (db_info_entry->rumble_supported == -1) ? "N/A" : "false"); - menu_list_push(info->list, tmp, "rdb_entry_rumble", + menu_list_push(info->list, tmp, + "rdb_entry_rumble", 0, 0, 0); if (!show_advanced_settings) @@ -1080,7 +1084,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->crc32) { if (create_string_list_rdb_entry_string("CRC32 Checksum", - "rdb_entry_crc32", crc_str, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_CRC32), + crc_str, info->path, info->list) == -1) goto error; } @@ -1088,7 +1093,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->sha1) { if (create_string_list_rdb_entry_string("SHA1 Checksum", - "rdb_entry_sha1", db_info_entry->sha1, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_SHA1), + db_info_entry->sha1, info->path, info->list) == -1) goto error; } @@ -1096,7 +1102,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->md5) { if (create_string_list_rdb_entry_string("MD5 Checksum", - "rdb_entry_md5", db_info_entry->md5, + menu_hash_to_str(MENU_LABEL_RDB_ENTRY_MD5), + db_info_entry->md5, info->path, info->list) == -1) goto error; } diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 058b1eedb5..6553267b19 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -182,6 +182,8 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_RDB_ENTRY_DESCRIPTION: + return "rdb_entry_description"; case MENU_LABEL_RDB_ENTRY_ORIGIN: return "rdb_entry_origin"; case MENU_LABEL_RDB_ENTRY_PUBLISHER: @@ -192,6 +194,8 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "rdb_entry_franchise"; case MENU_LABEL_RDB_ENTRY_MAX_USERS: return "rdb_entry_max_users"; + case MENU_LABEL_RDB_ENTRY_NAME: + return "rdb_entry_name"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING: return "rdb_entry_edge_magazine_rating"; case MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: @@ -200,6 +204,12 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "rdb_entry_releasemonth"; case MENU_LABEL_RDB_ENTRY_RELEASE_YEAR: return "rdb_entry_releaseyear"; + case MENU_LABEL_RDB_ENTRY_SHA1: + return "rdb_entry_sha1"; + case MENU_LABEL_RDB_ENTRY_CRC32: + return "rdb_entry_crc32"; + case MENU_LABEL_RDB_ENTRY_MD5: + return "rdb_entry_md5"; case MENU_LABEL_CONFIGURATIONS: return "configurations"; case MENU_LABEL_VALUE_CONFIGURATIONS: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index e334f8d4de..d381943561 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -182,6 +182,8 @@ extern "C" { #define MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE 0xea82695dU #define MENU_LABEL_VALUE_RDB_ENTRY_START_CONTENT 0x2cf73cceU #define MENU_LABEL_RDB_ENTRY_START_CONTENT 0x95025a55U +#define MENU_LABEL_RDB_ENTRY_DESCRIPTION 0x26aa1f71U +#define MENU_LABEL_RDB_ENTRY_NAME 0xc6ccf92eU #define MENU_LABEL_RDB_ENTRY_PUBLISHER 0x4d7bcdfbU #define MENU_LABEL_RDB_ENTRY_DEVELOPER 0x06f61093U #define MENU_LABEL_RDB_ENTRY_ORIGIN 0xb176aad5U @@ -198,6 +200,9 @@ extern "C" { #define MENU_LABEL_RDB_ENTRY_RELEASE_MONTH 0xad2f2c54U #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR 0x14c9c6bfU #define MENU_LABEL_RDB_ENTRY_MAX_USERS 0xfae91cc4U +#define MENU_LABEL_RDB_ENTRY_SHA1 0xc6cfd31aU +#define MENU_LABEL_RDB_ENTRY_MD5 0xdf3c7f93U +#define MENU_LABEL_RDB_ENTRY_CRC32 0x9fae330aU #define MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER 0x4468cb1bU #define MENU_LABEL_VIDEO_SHADER_FILTER_PASS 0x1906c38dU