Cleanup more hashes

This commit is contained in:
twinaphex 2018-02-05 23:37:27 +01:00
parent fb1c44c900
commit 754c9d4db9
3 changed files with 37 additions and 36 deletions

View File

@ -3807,6 +3807,11 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
BIND_ACTION_OK(cbs, action_ok_shader_preset_save_as);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISK_IMAGE_APPEND)))
{
BIND_ACTION_OK(cbs, action_ok_disk_image_append_list);
return 0;
}
#ifdef HAVE_NETWORKING
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_LAKKA)))
{
@ -3814,6 +3819,26 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
return 0;
}
#endif
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_OPEN_ARCHIVE)))
{
BIND_ACTION_OK(cbs, action_ok_open_archive);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE)))
{
BIND_ACTION_OK(cbs, action_ok_open_archive_detect_core);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE)))
{
BIND_ACTION_OK(cbs, action_ok_load_archive_detect_core);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_ARCHIVE)))
{
BIND_ACTION_OK(cbs, action_ok_load_archive);
return 0;
}
else if (cbs->enum_idx != MSG_UNKNOWN)
{
switch (cbs->enum_idx)
@ -4239,18 +4264,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
{
switch (hash)
{
case MENU_LABEL_OPEN_ARCHIVE_DETECT_CORE:
BIND_ACTION_OK(cbs, action_ok_open_archive_detect_core);
break;
case MENU_LABEL_OPEN_ARCHIVE:
BIND_ACTION_OK(cbs, action_ok_open_archive);
break;
case MENU_LABEL_LOAD_ARCHIVE_DETECT_CORE:
BIND_ACTION_OK(cbs, action_ok_load_archive_detect_core);
break;
case MENU_LABEL_LOAD_ARCHIVE:
BIND_ACTION_OK(cbs, action_ok_load_archive);
break;
case MENU_LABEL_CHEAT_FILE_LOAD:
BIND_ACTION_OK(cbs, action_ok_cheat_file);
break;
@ -4287,9 +4300,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_REMAP_FILE_SAVE_GAME:
BIND_ACTION_OK(cbs, action_ok_remap_file_save_game);
break;
case MENU_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_OK(cbs, action_ok_disk_image_append_list);
break;
case MENU_LABEL_SCREEN_RESOLUTION:
BIND_ACTION_OK(cbs, action_ok_video_resolution);
break;

View File

@ -512,6 +512,18 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
{
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
action_get_title_video_shader_preset
},
{
MENU_ENUM_LABEL_LIBRETRO_INFO_PATH,
action_get_title_core_info_directory
},
{
MENU_ENUM_LABEL_DISK_OPTIONS,
action_get_disk_options_list
},
{
MENU_ENUM_LABEL_DISK_IMAGE_APPEND,
action_get_title_disk_image_append
}
};
@ -1005,9 +1017,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_SHADER_OPTIONS:
BIND_ACTION_GET_TITLE(cbs, action_get_shader_options_list);
break;
case MENU_LABEL_DISK_OPTIONS:
BIND_ACTION_GET_TITLE(cbs, action_get_disk_options_list);
break;
case MENU_LABEL_FRONTEND_COUNTERS:
BIND_ACTION_GET_TITLE(cbs, action_get_frontend_counters_list);
break;
@ -1041,9 +1050,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_MANAGEMENT:
BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic);
break;
case MENU_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_GET_TITLE(cbs, action_get_title_disk_image_append);
break;
case MENU_LABEL_CHEAT_FILE_LOAD:
BIND_ACTION_GET_TITLE(cbs, action_get_title_cheat_file_load);
break;
@ -1071,9 +1077,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_LIBRETRO_DIR_PATH:
BIND_ACTION_GET_TITLE(cbs, action_get_title_core_directory);
break;
case MENU_LABEL_LIBRETRO_INFO_PATH:
BIND_ACTION_GET_TITLE(cbs, action_get_title_core_info_directory);
break;
default:
return -1;
}

View File

@ -1802,11 +1802,6 @@ enum msg_hash_enums
#define MENU_LABEL_CHEAT_FILE_SAVE_AS 0x1f58dccaU
#define MENU_LABEL_CHEAT_APPLY_CHANGES 0xde88aa27U
/* Disk settings */
#define MENU_LABEL_DISK_OPTIONS 0xc61ab5fbU
#define MENU_LABEL_DISK_IMAGE_APPEND 0x5af7d709U
/* Directory settings */
#define MENU_LABEL_CURSOR_DIRECTORY 0xdee8d377U
@ -1885,14 +1880,7 @@ enum msg_hash_enums
#define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U
#define MENU_LABEL_COLLECTION 0x5fea5991U
#define MENU_LABEL_OPEN_ARCHIVE 0x78c0ca58U
#define MENU_LABEL_OPEN_ARCHIVE_DETECT_CORE 0x92442638U
#define MENU_LABEL_LOAD_ARCHIVE_DETECT_CORE 0x681f2f46U
#define MENU_LABEL_LOAD_ARCHIVE 0xc3834e66U
/* Help */
#define MENU_LABEL_LIBRETRO_INFO_PATH 0xe552b25fU
#define MENU_LABEL_INPUT_DRIVER_LINUXRAW 0xc33c6b9fU
#define MENU_LABEL_INPUT_DRIVER_UDEV 0x7c9eeeb9U