libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 10:40:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(menu_entries_cbs_start) Take out action parameter

Browse Source
This commit is contained in:
twinaphex 2015-05-18 15:22:08 +02:00
parent aa37c88620
commit 499660417c
3 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
menu/menu_entries_cbs_start.c
View File

@ -23,8 +23,7 @@
#include "../input/input_remapping.h"
static int action_start_remap_file_load(unsigned type, const char *label,
unsigned action)
static int action_start_remap_file_load(unsigned type, const char *label)
{
settings_t *settings = config_get_ptr();
@ -33,8 +32,7 @@ static int action_start_remap_file_load(unsigned type, const char *label,
return 0;
}
static int action_start_video_filter_file_load(unsigned type, const char *label,
unsigned action)
static int action_start_video_filter_file_load(unsigned type, const char *label)
{
settings_t *settings = config_get_ptr();
@ -43,15 +41,13 @@ static int action_start_video_filter_file_load(unsigned type, const char *label,
return 0;
}
static int action_start_performance_counters_core(unsigned type, const char *label,
unsigned action)
static int action_start_performance_counters_core(unsigned type, const char *label)
{
struct retro_perf_counter **counters = (struct retro_perf_counter**)
perf_counters_libretro;
unsigned offset = type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN;
(void)label;
(void)action;
if (counters[offset])
{
@ -62,8 +58,7 @@ static int action_start_performance_counters_core(unsigned type, const char *lab
return 0;
}
static int action_start_input_desc(unsigned type, const char *label,
unsigned action)
static int action_start_input_desc(unsigned type, const char *label)
{
settings_t *settings = config_get_ptr();
unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
@ -71,7 +66,6 @@ static int action_start_input_desc(unsigned type, const char *label,
unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_META_KEY);
(void)label;
(void)action;
settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] =
settings->input.binds[inp_desc_user][inp_desc_button_index_offset].id;
@ -79,8 +73,7 @@ static int action_start_input_desc(unsigned type, const char *label,
return 0;
}
static int action_start_shader_action_parameter(unsigned type, const char *label,
unsigned action)
static int action_start_shader_action_parameter(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader_parameter *param = NULL;
@ -98,8 +91,7 @@ static int action_start_shader_action_parameter(unsigned type, const char *label
return 0;
}
static int action_start_shader_action_preset_parameter(unsigned type, const char *label,
unsigned action)
static int action_start_shader_action_preset_parameter(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
@ -119,8 +111,7 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char
return 0;
}
static int action_start_shader_pass(unsigned type, const char *label,
unsigned action)
static int action_start_shader_pass(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
@ -143,8 +134,7 @@ static int action_start_shader_pass(unsigned type, const char *label,
}
static int action_start_shader_scale_pass(unsigned type, const char *label,
unsigned action)
static int action_start_shader_scale_pass(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
@ -169,8 +159,7 @@ static int action_start_shader_scale_pass(unsigned type, const char *label,
return 0;
}
static int action_start_shader_filter_pass(unsigned type, const char *label,
unsigned action)
static int action_start_shader_filter_pass(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
@ -193,8 +182,7 @@ static int action_start_shader_filter_pass(unsigned type, const char *label,
return 0;
}
static int action_start_shader_num_passes(unsigned type, const char *label,
unsigned action)
static int action_start_shader_num_passes(unsigned type, const char *label)
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
@ -214,8 +202,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label,
return 0;
}
static int action_start_cheat_num_passes(unsigned type, const char *label,
unsigned action)
static int action_start_cheat_num_passes(unsigned type, const char *label)
{
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
@ -235,8 +222,8 @@ static int action_start_cheat_num_passes(unsigned type, const char *label,
return 0;
}
static int action_start_performance_counters_frontend(unsigned type, const char *label,
unsigned action)
static int action_start_performance_counters_frontend(unsigned type,
const char *label)
{
struct retro_perf_counter **counters = (struct retro_perf_counter**)
perf_counters_rarch;
@ -254,7 +241,7 @@ static int action_start_performance_counters_frontend(unsigned type, const char
}
static int action_start_core_setting(unsigned type,
const char *label, unsigned action)
const char *label)
{
global_t *global = global_get_ptr();
unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
@ -266,8 +253,7 @@ static int action_start_core_setting(unsigned type,
return 0;
}
static int action_start_lookup_setting(unsigned type, const char *label,
unsigned action)
static int action_start_lookup_setting(unsigned type, const char *label)
{
int ret = menu_setting_set(type, label, MENU_ACTION_START, false);

2
menu/menu_entry.c
View File

@ -481,7 +481,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
break;
case MENU_ACTION_START:
if (cbs && cbs->action_start)
return cbs->action_start(entry->type, entry->label, action);
return cbs->action_start(entry->type, entry->label);
break;
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:

2
menu/menu_list.h
View File

@ -40,7 +40,7 @@ typedef struct menu_file_list_cbs
size_t idx);
int (*action_cancel)(const char *path, const char *label, unsigned type,
size_t idx);
int (*action_start)(unsigned type, const char *label, unsigned action);
int (*action_start)(unsigned type, const char *label);
int (*action_select)(unsigned type, const char *label, unsigned action);
int (*action_content_list_switch)(void *data, void *userdata, const char
*path, const char *label, unsigned type);