mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of more hashes

Browse Source
This commit is contained in:
twinaphex 2018-02-05 21:41:34 +01:00
parent 24ea73b218
commit fb1c44c900
4 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
menu/cbs/menu_cbs_deferred_push.c
View File

@ -746,6 +746,30 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
{ {
MENU_ENUM_LABEL_CONTENT_SETTINGS, MENU_ENUM_LABEL_CONTENT_SETTINGS,
deferred_push_content_settings deferred_push_content_settings
},
{
MENU_ENUM_LABEL_RECORD_CONFIG,
deferred_push_record_configfile
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS,
deferred_push_video_shader_preset_parameters
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
deferred_push_video_shader_parameters
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PASS,
deferred_push_video_shader_pass
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
deferred_push_video_shader_preset
},
{
MENU_ENUM_LABEL_MENU_WALLPAPER,
deferred_push_images
} }
}; };
@ -1209,9 +1233,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_REMAP_FILE_LOAD: case MENU_LABEL_REMAP_FILE_LOAD:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_remap_file_load); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_remap_file_load);
break; break;
case MENU_LABEL_RECORD_CONFIG:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_record_configfile);
break;
case MENU_LABEL_MANAGEMENT: case MENU_LABEL_MANAGEMENT:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_management_options); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_management_options);
break; break;
@ -1289,12 +1310,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_FRONTEND_COUNTERS: case MENU_LABEL_FRONTEND_COUNTERS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_frontend_counters); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_frontend_counters);
break; break;
case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_shader_preset_parameters);
break;
case MENU_LABEL_VIDEO_SHADER_PARAMETERS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_shader_parameters);
break;
case MENU_LABEL_CORE_CHEAT_OPTIONS: case MENU_LABEL_CORE_CHEAT_OPTIONS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_cheat_options); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_cheat_options);
break; break;
@ -1307,15 +1322,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
case MENU_LABEL_CONFIGURATIONS: case MENU_LABEL_CONFIGURATIONS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations);
break; break;
case MENU_LABEL_VIDEO_SHADER_PRESET:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_shader_preset);
break;
case MENU_LABEL_VIDEO_SHADER_PASS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_shader_pass);
break;
case MENU_LABEL_MENU_WALLPAPER:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_images);
break;
case MENU_LABEL_AUDIO_DSP_PLUGIN: case MENU_LABEL_AUDIO_DSP_PLUGIN:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_audio_dsp_plugin); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_audio_dsp_plugin);
break; break;

58
menu/cbs/menu_cbs_ok.c
View File

@ -3777,6 +3777,43 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
BIND_ACTION_OK(cbs, action_ok_push_content_list); BIND_ACTION_OK(cbs, action_ok_push_content_list);
return 0; return 0;
} }
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_RECORD_CONFIG)))
{
BIND_ACTION_OK(cbs, action_ok_record_configfile);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS)))
{
BIND_ACTION_OK(cbs, action_ok_shader_parameters);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS)))
{
BIND_ACTION_OK(cbs, action_ok_shader_parameters);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PASS)))
{
BIND_ACTION_OK(cbs, action_ok_shader_pass);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET)))
{
BIND_ACTION_OK(cbs, action_ok_shader_preset);
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS)))
{
BIND_ACTION_OK(cbs, action_ok_shader_preset_save_as);
return 0;
}
#ifdef HAVE_NETWORKING
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_LAKKA)))
{
BIND_ACTION_OK(cbs, action_ok_lakka_list);
return 0;
}
#endif
else if (cbs->enum_idx != MSG_UNKNOWN) else if (cbs->enum_idx != MSG_UNKNOWN)
{ {
switch (cbs->enum_idx) switch (cbs->enum_idx)
@ -4214,12 +4251,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_LOAD_ARCHIVE: case MENU_LABEL_LOAD_ARCHIVE:
BIND_ACTION_OK(cbs, action_ok_load_archive); BIND_ACTION_OK(cbs, action_ok_load_archive);
break; break;
case MENU_LABEL_VIDEO_SHADER_PASS:
BIND_ACTION_OK(cbs, action_ok_shader_pass);
break;
case MENU_LABEL_VIDEO_SHADER_PRESET:
BIND_ACTION_OK(cbs, action_ok_shader_preset);
break;
case MENU_LABEL_CHEAT_FILE_LOAD: case MENU_LABEL_CHEAT_FILE_LOAD:
BIND_ACTION_OK(cbs, action_ok_cheat_file); BIND_ACTION_OK(cbs, action_ok_cheat_file);
break; break;
@ -4229,18 +4260,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_REMAP_FILE_LOAD: case MENU_LABEL_REMAP_FILE_LOAD:
BIND_ACTION_OK(cbs, action_ok_remap_file); BIND_ACTION_OK(cbs, action_ok_remap_file);
break; break;
case MENU_LABEL_RECORD_CONFIG:
BIND_ACTION_OK(cbs, action_ok_record_configfile);
break;
#ifdef HAVE_NETWORKING
case MENU_LABEL_UPDATE_LAKKA:
BIND_ACTION_OK(cbs, action_ok_lakka_list);
break;
#endif
case MENU_LABEL_VIDEO_SHADER_PARAMETERS:
case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS:
BIND_ACTION_OK(cbs, action_ok_shader_parameters);
break;
case MENU_LABEL_ACCOUNTS_LIST: case MENU_LABEL_ACCOUNTS_LIST:
BIND_ACTION_OK(cbs, action_ok_push_accounts_list); BIND_ACTION_OK(cbs, action_ok_push_accounts_list);
break; break;
@ -4259,9 +4278,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_CHEAT_APPLY_CHANGES: case MENU_LABEL_CHEAT_APPLY_CHANGES:
BIND_ACTION_OK(cbs, action_ok_cheat_apply_changes); BIND_ACTION_OK(cbs, action_ok_cheat_apply_changes);
break; break;
case MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
BIND_ACTION_OK(cbs, action_ok_shader_preset_save_as);
break;
case MENU_LABEL_CHEAT_FILE_SAVE_AS: case MENU_LABEL_CHEAT_FILE_SAVE_AS:
BIND_ACTION_OK(cbs, action_ok_cheat_file_save_as); BIND_ACTION_OK(cbs, action_ok_cheat_file_save_as);
break; break;

21
menu/cbs/menu_cbs_title.c
View File

@ -500,6 +500,18 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
{ {
MENU_ENUM_LABEL_CONTENT_SETTINGS, MENU_ENUM_LABEL_CONTENT_SETTINGS,
action_get_quick_menu_list action_get_quick_menu_list
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
action_get_title_video_shader_parameters
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS,
action_get_title_video_shader_preset_parameters
},
{
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
action_get_title_video_shader_preset
} }
}; };
@ -1026,21 +1038,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_ACHIEVEMENT_LIST: case MENU_LABEL_ACHIEVEMENT_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_title_cheevos_list); BIND_ACTION_GET_TITLE(cbs, action_get_title_cheevos_list);
break; break;
case MENU_LABEL_VIDEO_SHADER_PARAMETERS:
BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_parameters);
break;
case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS:
BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_preset_parameters);
break;
case MENU_LABEL_MANAGEMENT: case MENU_LABEL_MANAGEMENT:
BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic); BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic);
break; break;
case MENU_LABEL_DISK_IMAGE_APPEND: case MENU_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_GET_TITLE(cbs, action_get_title_disk_image_append); BIND_ACTION_GET_TITLE(cbs, action_get_title_disk_image_append);
break; break;
case MENU_LABEL_VIDEO_SHADER_PRESET:
BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_preset);
break;
case MENU_LABEL_CHEAT_FILE_LOAD: case MENU_LABEL_CHEAT_FILE_LOAD:
BIND_ACTION_GET_TITLE(cbs, action_get_title_cheat_file_load); BIND_ACTION_GET_TITLE(cbs, action_get_title_cheat_file_load);
break; break;

22
msg_hash.h
View File

@ -1788,30 +1788,13 @@ enum msg_hash_enums
#define MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST 0xb4f82700U #define MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST 0xb4f82700U
/* Online updater settings */
#define MENU_LABEL_UPDATE_LAKKA 0x19b51eebU
/* Information settings */ /* Information settings */
#define MENU_LABEL_SCREEN_RESOLUTION 0x5c9b3a58U #define MENU_LABEL_SCREEN_RESOLUTION 0x5c9b3a58U
/* Video settings */
#define MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS 0x3d6e5ce5U
#define MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER 0x4468cb1bU
#define MENU_LABEL_VIDEO_SHADER_NUM_PASSES 0x79b2992fU
#define MENU_LABEL_VIDEO_SHADER_PARAMETERS 0x9895c3e5U
#define MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS 0xd18158d7U
#define MENU_LABEL_VIDEO_SHADER_PASS 0x4fa31028U
#define MENU_LABEL_VIDEO_SHADER_PRESET 0xc5d3bae4U
/* Input settings */ /* Input settings */
#define MENU_LABEL_INPUT_OVERLAY 0x24e24796U #define MENU_LABEL_INPUT_OVERLAY 0x24e24796U
#define MENU_LABEL_INPUT_OSK_OVERLAY 0x11f1c582U #define MENU_LABEL_INPUT_OSK_OVERLAY 0x11f1c582U
/* Record settings */
#define MENU_LABEL_RECORD_CONFIG 0x11c3daf9U
/* Cheat options */ /* Cheat options */
#define MENU_LABEL_CHEAT_DATABASE_PATH 0x01388b8aU #define MENU_LABEL_CHEAT_DATABASE_PATH 0x01388b8aU
@ -1824,11 +1807,6 @@ enum msg_hash_enums
#define MENU_LABEL_DISK_OPTIONS 0xc61ab5fbU #define MENU_LABEL_DISK_OPTIONS 0xc61ab5fbU
#define MENU_LABEL_DISK_IMAGE_APPEND 0x5af7d709U #define MENU_LABEL_DISK_IMAGE_APPEND 0x5af7d709U
/* Menu settings */
#define MENU_LABEL_MENU_WALLPAPER 0x3b84de01U
#define MENU_LABEL_MENU_SETTINGS 0x61e4544bU
/* Directory settings */ /* Directory settings */
#define MENU_LABEL_CURSOR_DIRECTORY 0xdee8d377U #define MENU_LABEL_CURSOR_DIRECTORY 0xdee8d377U