mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change start callback signatuer to OK callback signature

Browse Source
This commit is contained in:
twinaphex 2019-12-19 16:30:53 +01:00
parent cb85b3e8dd
commit 2a500baaca
3 changed files with 83 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
menu/cbs/menu_cbs_start.c
View File

@ -53,7 +53,9 @@
int generic_action_ok_command(enum event_command cmd);
#ifdef HAVE_AUDIOMIXER
static int action_start_audio_mixer_stream_volume(unsigned type, const char *label)
static int action_start_audio_mixer_stream_volume(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
unsigned offset = (type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN);
@ -66,13 +68,17 @@ static int action_start_audio_mixer_stream_volume(unsigned type, const char *lab
}
#endif
static int action_start_remap_file_load(unsigned type, const char *label)
static int action_start_remap_file_load(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
input_remapping_set_defaults(true);
return 0;
}
static int action_start_shader_preset(unsigned type, const char *label)
static int action_start_shader_preset(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
bool refresh = false;
@ -87,7 +93,9 @@ static int action_start_shader_preset(unsigned type, const char *label)
return 0;
}
static int action_start_video_filter_file_load(unsigned type, const char *label)
static int action_start_video_filter_file_load(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
settings_t *settings = config_get_ptr();
@ -111,7 +119,9 @@ static int generic_action_start_performance_counters(struct retro_perf_counter *
return 0;
}
static int action_start_performance_counters_core(unsigned type, const char *label)
static int action_start_performance_counters_core(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
struct retro_perf_counter **counters = retro_get_perf_counter_libretro();
unsigned offset = type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN;
@ -119,15 +129,18 @@ static int action_start_performance_counters_core(unsigned type, const char *lab
return generic_action_start_performance_counters(counters, offset, type, label);
}
static int action_start_performance_counters_frontend(unsigned type,
const char *label)
static int action_start_performance_counters_frontend(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
struct retro_perf_counter **counters = retro_get_perf_counter_rarch();
unsigned offset = type - MENU_SETTINGS_PERF_COUNTERS_BEGIN;
return generic_action_start_performance_counters(counters, offset, type, label);
}
static int action_start_input_desc(unsigned type, const char *label)
static int action_start_input_desc(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
settings_t *settings = config_get_ptr();
unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
@ -151,7 +164,8 @@ static int action_start_input_desc(unsigned type, const char *label)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
static int action_start_shader_action_parameter(
unsigned type, const char *label)
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
video_shader_ctx_t shader_info;
struct video_shader_parameter *param = NULL;
@ -170,7 +184,9 @@ static int action_start_shader_action_parameter(
return menu_shader_manager_clear_parameter(menu_shader_get(), parameter);
}
static int action_start_shader_pass(unsigned type, const char *label)
static int action_start_shader_pass(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
menu_handle_t *menu = menu_driver_get_ptr();
@ -185,7 +201,9 @@ static int action_start_shader_pass(unsigned type, const char *label)
return 0;
}
static int action_start_shader_scale_pass(unsigned type, const char *label)
static int action_start_shader_scale_pass(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
@ -194,14 +212,18 @@ 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)
static int action_start_shader_filter_pass(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
return menu_shader_manager_clear_pass_filter(menu_shader_get(), pass);
}
#endif
static int action_start_netplay_mitm_server(unsigned type, const char *label)
static int action_start_netplay_mitm_server(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
settings_t *settings = config_get_ptr();
strlcpy(settings->arrays.netplay_mitm_server, netplay_mitm_server, sizeof(settings->arrays.netplay_mitm_server));
@ -209,20 +231,26 @@ static int action_start_netplay_mitm_server(unsigned type, const char *label)
}
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
static int action_start_shader_watch_for_changes(unsigned type, const char *label)
static int action_start_shader_watch_for_changes(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
settings_t *settings = config_get_ptr();
settings->bools.video_shader_watch_files = DEFAULT_VIDEO_SHADER_WATCH_FILES;
return 0;
}
static int action_start_shader_num_passes(unsigned type, const char *label)
static int action_start_shader_num_passes(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
return menu_shader_manager_clear_num_passes(menu_shader_get());
}
#endif
static int action_start_cheat_num_passes(unsigned type, const char *label)
static int action_start_cheat_num_passes(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
if (cheat_manager_get_size())
{
@ -234,19 +262,22 @@ static int action_start_cheat_num_passes(unsigned type, const char *label)
return 0;
}
static int action_start_core_setting(unsigned type,
const char *label)
static int action_start_core_setting(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
unsigned core_idx = type - MENU_SETTINGS_CORE_OPTION_START;
core_option_manager_t *coreopts = NULL;
if (rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
core_option_manager_set_default(coreopts, idx);
core_option_manager_set_default(coreopts, core_idx);
return 0;
}
static int action_start_playlist_association(unsigned type, const char *label)
static int action_start_playlist_association(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
playlist_t *playlist = playlist_get_cached();
@ -261,7 +292,9 @@ static int action_start_playlist_association(unsigned type, const char *label)
return 0;
}
static int action_start_playlist_label_display_mode(unsigned type, const char *label)
static int action_start_playlist_label_display_mode(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
playlist_t *playlist = playlist_get_cached();
@ -275,7 +308,9 @@ static int action_start_playlist_label_display_mode(unsigned type, const char *l
return 0;
}
static int action_start_playlist_right_thumbnail_mode(unsigned type, const char *label)
static int action_start_playlist_right_thumbnail_mode(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
playlist_t *playlist = playlist_get_cached();
@ -289,7 +324,9 @@ static int action_start_playlist_right_thumbnail_mode(unsigned type, const char
return 0;
}
static int action_start_playlist_left_thumbnail_mode(unsigned type, const char *label)
static int action_start_playlist_left_thumbnail_mode(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
playlist_t *playlist = playlist_get_cached();
@ -303,14 +340,18 @@ static int action_start_playlist_left_thumbnail_mode(unsigned type, const char *
return 0;
}
static int action_start_manual_content_scan_dir(unsigned type, const char *label)
static int action_start_manual_content_scan_dir(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
/* Reset content directory */
manual_content_scan_set_menu_content_dir("");
return 0;
}
static int action_start_manual_content_scan_system_name(unsigned type, const char *label)
static int action_start_manual_content_scan_system_name(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
/* Reset system name */
manual_content_scan_set_menu_system_name(
@ -318,7 +359,9 @@ static int action_start_manual_content_scan_system_name(unsigned type, const cha
return 0;
}
static int action_start_manual_content_scan_core_name(unsigned type, const char *label)
static int action_start_manual_content_scan_core_name(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
/* Reset core name */
manual_content_scan_set_menu_core_name(
@ -326,7 +369,9 @@ static int action_start_manual_content_scan_core_name(unsigned type, const char
return 0;
}
static int action_start_video_resolution(unsigned type, const char *label)
static int action_start_video_resolution(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
unsigned width = 0, height = 0;
global_t *global = global_get_ptr();
@ -349,7 +394,9 @@ static int action_start_video_resolution(unsigned type, const char *label)
return 0;
}
static int action_start_load_core(unsigned type, const char *label)
static int action_start_load_core(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
int ret = generic_action_ok_command(
CMD_EVENT_UNLOAD_CORE);
@ -360,7 +407,9 @@ static int action_start_load_core(unsigned type, const char *label)
return ret;
}
static int action_start_lookup_setting(unsigned type, const char *label)
static int action_start_lookup_setting(
const char *path, const char *label,
unsigned type, size_t idx, size_t entry_idx)
{
return menu_setting_set(type, MENU_ACTION_START, false);
}

3
menu/drivers/menu_generic.c
View File

@ -367,7 +367,8 @@ int generic_menu_entry_action(
break;
case MENU_ACTION_START:
if (cbs && cbs->action_start)
ret = cbs->action_start(entry->type, entry->label);
ret = cbs->action_start(entry->path,
entry->label, entry->type, i, entry->entry_idx);
break;
case MENU_ACTION_LEFT:
if (cbs && cbs->action_left)

3
menu/menu_entries.h
View File

@ -116,7 +116,8 @@ typedef struct menu_file_list_cbs
size_t idx);
int (*action_scan)(const char *path, const char *label, unsigned type,
size_t idx);
int (*action_start)(unsigned type, const char *label);
int (*action_start)(const char *path, const char *label, unsigned type,
size_t idx, size_t entry_idx);
int (*action_info)(unsigned type, const char *label);
int (*action_content_list_switch)(void *data, void *userdata, const char
*path, const char *label, unsigned type);