(deferred push) Refactor

This commit is contained in:
twinaphex 2018-02-05 15:10:10 +01:00
parent 6eee3d68dd
commit 562201bdd4

View File

@ -759,6 +759,70 @@ static struct cbs_deferred_lbl_callback cbs_deferred2_lbl_list[] = {
{ {
MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST,
deferred_push_driver_settings_list deferred_push_driver_settings_list
},
{
MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST,
deferred_push_video_settings_list
},
{
MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST,
deferred_push_audio_settings_list
},
{
MENU_ENUM_LABEL_CORE_INFORMATION,
deferred_push_core_information
},
{
MENU_ENUM_LABEL_SYSTEM_INFORMATION,
deferred_push_system_information
},
{
MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST,
deferred_push_accounts_list
},
{
MENU_ENUM_LABEL_CORE_LIST,
deferred_push_core_list
},
{
MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY,
deferred_push_history_list
},
{
MENU_ENUM_LABEL_CORE_OPTIONS,
deferred_push_core_options
},
{
MENU_ENUM_LABEL_NETWORK_INFORMATION,
deferred_push_network_information
},
{
MENU_ENUM_LABEL_ONLINE_UPDATER,
deferred_push_options
},
{
MENU_ENUM_LABEL_HELP_LIST,
deferred_push_help
},
{
MENU_ENUM_LABEL_INFORMATION_LIST,
deferred_push_information_list
},
{
MENU_ENUM_LABEL_SHADER_OPTIONS,
deferred_push_shader_options
},
{
MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST,
deferred_user_binds_list
},
{
MENU_ENUM_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST,
deferred_push_input_hotkey_binds_list
},
{
MENU_ENUM_LABEL_LOAD_CONTENT_LIST,
deferred_push_load_content_list
} }
}; };
@ -786,88 +850,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
} }
} }
if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_settings_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_audio_settings_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_CORE_INFORMATION)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_SYSTEM_INFORMATION)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_system_information);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_history_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_CORE_OPTIONS)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_options);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_INFORMATION)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_network_information);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_options);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_HELP_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_help);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_INFORMATION_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_information_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_SHADER_OPTIONS)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_shader_options);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_user_binds_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_hotkey_binds_list);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_load_content_list);
}
else
{
if (cbs->enum_idx != MSG_UNKNOWN) if (cbs->enum_idx != MSG_UNKNOWN)
{ {
switch (cbs->enum_idx) switch (cbs->enum_idx)
@ -1340,7 +1322,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
return -1; return -1;
} }
} }
}
return 0; return 0;
} }