CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 11:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-02 07:05:43 +02:00
parent 370c4cb6a7
commit 18e3843db7
5 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/cbs/menu_cbs_cancel.c
View File

@ -48,7 +48,7 @@ static int action_cancel_core_content(const char *path,
} }
static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t hash, const char *menu_label) const char *label, const char *menu_label)
{ {
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST))) if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST)))
{ {
@ -60,16 +60,14 @@ static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs,
} }
static int menu_cbs_init_bind_cancel_compare_type( static int menu_cbs_init_bind_cancel_compare_type(
menu_file_list_cbs_t *cbs, unsigned type, menu_file_list_cbs_t *cbs, unsigned type)
uint32_t label_hash)
{ {
return -1; return -1;
} }
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label, const char *menu_label)
uint32_t label_hash)
{ {
if (!cbs) if (!cbs)
return -1; return -1;
@ -77,11 +75,11 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
BIND_ACTION_CANCEL(cbs, action_cancel_pop_default); BIND_ACTION_CANCEL(cbs, action_cancel_pop_default);
if (menu_cbs_init_bind_cancel_compare_label(cbs, label, label_hash, menu_label) == 0) if (menu_cbs_init_bind_cancel_compare_label(cbs, label, menu_label) == 0)
return 0; return 0;
if (menu_cbs_init_bind_cancel_compare_type( if (menu_cbs_init_bind_cancel_compare_type(
cbs, type, label_hash) == 0) cbs, type) == 0)
return 0; return 0;
return -1; return -1;

45
menu/cbs/menu_cbs_left.c
View File

@ -46,7 +46,8 @@ static int generic_shader_action_parameter_left(
if (shader) if (shader)
{ {
param->current -= param->step; param->current -= param->step;
param->current = MIN(MAX(param->minimum, param->current), param->maximum); param->current = MIN(MAX(param->minimum, param->current),
param->maximum);
} }
return 0; return 0;
} }
@ -59,11 +60,14 @@ static int shader_action_parameter_left(unsigned type, const char *label,
video_shader_driver_get_current_shader(&shader_info); video_shader_driver_get_current_shader(&shader_info);
param = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; param = &shader_info.data->parameters[type
return generic_shader_action_parameter_left(shader_info.data, param, type, label, wraparound); - MENU_SETTINGS_SHADER_PARAMETER_0];
return generic_shader_action_parameter_left(shader_info.data, param,
type, label, wraparound);
} }
static int shader_action_parameter_preset_left(unsigned type, const char *label, static int shader_action_parameter_preset_left(unsigned type,
const char *label,
bool wraparound) bool wraparound)
{ {
struct video_shader_parameter *param = NULL; struct video_shader_parameter *param = NULL;
@ -75,7 +79,8 @@ static int shader_action_parameter_preset_left(unsigned type, const char *label,
param = shader ? param = shader ?
&shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0] : &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0] :
NULL; NULL;
return generic_shader_action_parameter_left(shader, param, type, label, wraparound); return generic_shader_action_parameter_left(shader, param,
type, label, wraparound);
} }
#endif #endif
@ -90,10 +95,13 @@ static int action_left_cheat(unsigned type, const char *label,
static int action_left_input_desc(unsigned type, const char *label, static int action_left_input_desc(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN; unsigned inp_desc_index_offset = type -
unsigned inp_desc_user = inp_desc_index_offset / (RARCH_FIRST_CUSTOM_BIND + 4); MENU_SETTINGS_INPUT_DESC_BEGIN;
unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * (RARCH_FIRST_CUSTOM_BIND + 4)); unsigned inp_desc_user = inp_desc_index_offset /
settings_t *settings = config_get_ptr(); (RARCH_FIRST_CUSTOM_BIND + 4);
unsigned inp_desc_button_index_offset = inp_desc_index_offset
- (inp_desc_user * (RARCH_FIRST_CUSTOM_BIND + 4));
settings_t *settings = config_get_ptr();
if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] > 0) if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] > 0)
settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--; settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--;
@ -250,7 +258,8 @@ static int action_left_shader_filter_default(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
rarch_setting_t *setting = menu_setting_find_enum(MENU_ENUM_LABEL_VIDEO_SMOOTH); rarch_setting_t *setting = menu_setting_find_enum(
MENU_ENUM_LABEL_VIDEO_SMOOTH);
if (!setting) if (!setting)
return menu_cbs_exit(); return menu_cbs_exit();
return menu_action_handle_setting(setting, return menu_action_handle_setting(setting,
@ -326,9 +335,11 @@ static int playlist_association_left(unsigned type, const char *label,
stnames = string_split(settings->playlist_names, ";"); stnames = string_split(settings->playlist_names, ";");
stcores = string_split(settings->playlist_cores, ";"); stcores = string_split(settings->playlist_cores, ";");
if (!menu_content_playlist_find_associated_core(path, core_path, sizeof(core_path))) if (!menu_content_playlist_find_associated_core(path,
core_path, sizeof(core_path)))
strlcpy(core_path, strlcpy(core_path,
file_path_str(FILE_PATH_DETECT), sizeof(core_path)); file_path_str(FILE_PATH_DETECT),
sizeof(core_path));
for (i = 0; i < list->count; i++) for (i = 0; i < list->count; i++)
{ {
@ -351,9 +362,11 @@ static int playlist_association_left(unsigned type, const char *label,
if (found) if (found)
string_list_set(stcores, found-1, info->path); string_list_set(stcores, found-1, info->path);
string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); string_list_join_concat(new_playlist_cores,
sizeof(new_playlist_cores), stcores, ";");
strlcpy(settings->playlist_cores, new_playlist_cores, sizeof(settings->playlist_cores)); strlcpy(settings->playlist_cores,
new_playlist_cores, sizeof(settings->playlist_cores));
string_list_free(stnames); string_list_free(stnames);
string_list_free(stcores); string_list_free(stcores);
@ -497,7 +510,7 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
} }
static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
unsigned type, uint32_t label_hash, const char *menu_label) unsigned type, const char *menu_label)
{ {
if (type >= MENU_SETTINGS_CHEAT_BEGIN if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END) && type <= MENU_SETTINGS_CHEAT_END)
@ -620,7 +633,7 @@ int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label) == 0) if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label) == 0)
return 0; return 0;
if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label) == 0) if (menu_cbs_init_bind_left_compare_type(cbs, type, menu_label) == 0)
return 0; return 0;
return -1; return -1;

4
menu/cbs/menu_cbs_right.c
View File

@ -407,7 +407,7 @@ int bind_right_generic(unsigned type, const char *label,
} }
static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
unsigned type, uint32_t label_hash, const char *menu_label) unsigned type, const char *menu_label)
{ {
if (type >= MENU_SETTINGS_CHEAT_BEGIN if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END) && type <= MENU_SETTINGS_CHEAT_END)
@ -643,7 +643,7 @@ int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
) == 0) ) == 0)
return 0; return 0;
if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label ) == 0) if (menu_cbs_init_bind_right_compare_type(cbs, type, menu_label ) == 0)
return 0; return 0;
return menu_cbs_exit(); return menu_cbs_exit();

2
menu/menu_cbs.c
View File

@ -70,7 +70,7 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident); menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);
menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label, label_hash); menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label);
menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident); menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident);

3
menu/menu_cbs.h
View File

@ -149,8 +149,7 @@ int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label, const char *menu_label);
uint32_t label_hash);
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,