diff --git a/Makefile.common b/Makefile.common
index 78e10304a8..9c88f41faf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -312,10 +312,11 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_shader.o \
menu/menu_texture.o \
menu/menu_entries.o \
- menu/menu_entries_cbs.o \
menu/menu_entries_cbs_ok.o \
menu/menu_entries_cbs_cancel.o \
+ menu/menu_entries_cbs_start.o \
menu/menu_entries_cbs_deferred_push.o \
+ menu/menu_entries_cbs.o \
menu/menu_list.o \
menu/menu_animation.o
endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 40b364dbff..397fd0b53e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -681,6 +681,7 @@ MENU
#include "../menu/menu_entries.c"
#include "../menu/menu_entries_cbs_ok.c"
#include "../menu/menu_entries_cbs_cancel.c"
+#include "../menu/menu_entries_cbs_start.c"
#include "../menu/menu_entries_cbs_deferred_push.c"
#include "../menu/menu_entries_cbs.c"
#include "../menu/menu_shader.c"
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 35fc17ad5f..d3391928be 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -265,96 +265,6 @@ int cb_core_updater_download(void *data_, size_t len)
}
#endif
-static int action_start_remap_file_load(unsigned type, const char *label,
- unsigned action)
-{
- g_settings.input.remapping_path[0] = '\0';
- input_remapping_set_defaults();
- return 0;
-}
-
-static int action_start_video_filter_file_load(unsigned type, const char *label,
- unsigned action)
-{
- g_settings.video.softfilter_plugin[0] = '\0';
- rarch_main_command(RARCH_CMD_REINIT);
- return 0;
-}
-
-static int action_start_performance_counters_core(unsigned type, const char *label,
- unsigned action)
-{
- 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])
- {
- counters[offset]->total = 0;
- counters[offset]->call_cnt = 0;
- }
-
- return 0;
-}
-
-static int action_start_input_desc(unsigned type, const char *label,
- unsigned action)
-{
- unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
- unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_CUSTOM_BIND;
- unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_CUSTOM_BIND);
-
- (void)label;
- (void)action;
-
- g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] =
- g_settings.input.binds[inp_desc_user][inp_desc_button_index_offset].id;
-
- return 0;
-}
-
-static int action_start_shader_action_parameter(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader_parameter *param = NULL;
- struct video_shader *shader = video_shader_driver_get_current_shader();
-
- if (!shader)
- return 0;
-
- param = &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
- param->current = param->initial;
- param->current = min(max(param->minimum, param->current), param->maximum);
-#endif
-
- return 0;
-}
-
-static int action_start_shader_action_preset_parameter(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader *shader = NULL;
- struct video_shader_parameter *param = NULL;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- if (!(shader = menu->shader))
- return 0;
-
- param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
- param->current = param->initial;
- param->current = min(max(param->minimum, param->current), param->maximum);
-#endif
-
- return 0;
-}
-
static int shader_action_parameter_toggle(unsigned type, const char *label,
unsigned action)
{
@@ -465,59 +375,6 @@ static int action_toggle_input_desc(unsigned type, const char *label,
return 0;
}
-
-static int action_start_shader_pass(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
- struct video_shader *shader = NULL;
- struct video_shader_pass *shader_pass = NULL;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- shader = menu->shader;
-
- if (shader)
- shader_pass = &shader->pass[hack_shader_pass];
-
- if (shader_pass)
- *shader_pass->source.path = '\0';
-#endif
-
- return 0;
-}
-
-
-static int action_start_shader_scale_pass(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader *shader = NULL;
- struct video_shader_pass *shader_pass = NULL;
- unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- shader = menu->shader;
-
- if (shader)
- {
- shader_pass = &shader->pass[pass];
-
- if (shader_pass)
- {
- shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0;
- shader_pass->fbo.valid = false;
- }
- }
-#endif
-
- return 0;
-}
-
static int action_toggle_save_state(unsigned type, const char *label,
unsigned action)
{
@@ -668,30 +525,6 @@ static int action_toggle_shader_scale_pass(unsigned type, const char *label,
return 0;
}
-static int action_start_shader_filter_pass(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
- struct video_shader *shader = NULL;
- struct video_shader_pass *shader_pass = NULL;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- shader = menu->shader;
- if (!shader)
- return -1;
- shader_pass = &shader->pass[pass];
- if (!shader_pass)
- return -1;
-
- shader_pass->filter = RARCH_FILTER_UNSPEC;
-#endif
-
- return 0;
-}
-
static int action_toggle_shader_filter_pass(unsigned type, const char *label,
unsigned action)
{
@@ -735,47 +568,6 @@ static int action_toggle_shader_filter_default(unsigned type, const char *label,
return 0;
}
-static int action_start_shader_num_passes(unsigned type, const char *label,
- unsigned action)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader *shader = NULL;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- shader = menu->shader;
- if (!shader)
- return -1;
- if (shader->passes)
- shader->passes = 0;
- menu->need_refresh = true;
-
- video_shader_resolve_parameters(NULL, menu->shader);
-#endif
- return 0;
-}
-
-static int action_start_cheat_num_passes(unsigned type, const char *label,
- unsigned action)
-{
- cheat_manager_t *cheat = g_extern.cheat;
- menu_handle_t *menu = menu_driver_resolve();
- if (!menu)
- return -1;
-
- if (!cheat)
- return -1;
-
- if (cheat->size)
- {
- cheat_manager_realloc(cheat, 0);
- menu->need_refresh = true;
- }
-
- return 0;
-}
-
static int action_toggle_cheat_num_passes(unsigned type, const char *label,
unsigned action)
{
@@ -863,36 +655,6 @@ static int action_toggle_video_resolution(unsigned type, const char *label,
return 0;
}
-static int action_start_performance_counters_frontend(unsigned type, const char *label,
- unsigned action)
-{
- struct retro_perf_counter **counters = (struct retro_perf_counter**)
- perf_counters_rarch;
- unsigned offset = type - MENU_SETTINGS_PERF_COUNTERS_BEGIN;
-
- (void)label;
-
- if (counters[offset])
- {
- counters[offset]->total = 0;
- counters[offset]->call_cnt = 0;
- }
-
- return 0;
-}
-
-static int action_start_core_setting(unsigned type,
- const char *label, unsigned action)
-{
- unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
-
- (void)label;
-
- core_option_set_default(g_extern.system.core_options, idx);
-
- return 0;
-}
-
static int core_setting_toggle(unsigned type, const char *label,
unsigned action)
{
@@ -1582,12 +1344,6 @@ static int action_select_default(unsigned type, const char *label,
return 0;
}
-static int action_start_lookup_setting(unsigned type, const char *label,
- unsigned action)
-{
- return menu_setting_set(type, label, MENU_ACTION_START);
-}
-
static void menu_action_setting_disp_set_label_cheat_num_passes(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
@@ -2319,48 +2075,6 @@ static void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
cbs->action_select = action_select_default;
}
-static void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
- const char *path, const char *label, unsigned type, size_t idx,
- const char *elem0, const char *elem1)
-{
- if (!cbs)
- return;
-
- cbs->action_start = action_start_lookup_setting;
-
- if (!strcmp(label, "remap_file_load"))
- cbs->action_start = action_start_remap_file_load;
- if (!strcmp(label, "video_filter"))
- cbs->action_start = action_start_video_filter_file_load;
- else if (!strcmp(label, "video_shader_pass"))
- cbs->action_start = action_start_shader_pass;
- else if (!strcmp(label, "video_shader_scale_pass"))
- cbs->action_start = action_start_shader_scale_pass;
- else if (!strcmp(label, "video_shader_filter_pass"))
- cbs->action_start = action_start_shader_filter_pass;
- else if (!strcmp(label, "video_shader_num_passes"))
- cbs->action_start = action_start_shader_num_passes;
- else if (!strcmp(label, "cheat_num_passes"))
- cbs->action_start = action_start_cheat_num_passes;
- else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
- && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
- cbs->action_start = action_start_shader_action_parameter;
- else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
- && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
- cbs->action_start = action_start_shader_action_preset_parameter;
- else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN &&
- type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END)
- cbs->action_start = action_start_performance_counters_core;
- else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
- && type <= MENU_SETTINGS_INPUT_DESC_END)
- cbs->action_start = action_start_input_desc;
- else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN &&
- type <= MENU_SETTINGS_PERF_COUNTERS_END)
- cbs->action_start = action_start_performance_counters_frontend;
- else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
- cbs->action_start = action_start_core_setting;
-}
-
static void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1)
diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h
index 9a2f7d0454..96e2aa3662 100644
--- a/menu/menu_entries_cbs.h
+++ b/menu/menu_entries_cbs.h
@@ -34,6 +34,10 @@ void menu_entries_common_load_content(bool persist);
int menu_entries_common_is_settings_entry(const char *label);
+void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
+ const char *path, const char *label, unsigned type, size_t idx,
+ const char *elem0, const char *elem1);
+
void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1);
diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c
new file mode 100644
index 0000000000..fbdec9902f
--- /dev/null
+++ b/menu/menu_entries_cbs_start.c
@@ -0,0 +1,331 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2011-2015 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see .
+ */
+
+#include
+#include "menu.h"
+#include "menu_entries_cbs.h"
+#include "menu_setting.h"
+#include "menu_input.h"
+#include "menu_entries.h"
+#include "menu_shader.h"
+#include "menu_navigation.h"
+
+#include "../file_ext.h"
+#include "../file_extract.h"
+#include "../file_ops.h"
+#include "../config.def.h"
+#include "../cheats.h"
+#include "../retroarch.h"
+#include "../performance.h"
+
+#ifdef HAVE_NETWORKING
+#include "../net_http.h"
+#endif
+
+#ifdef HAVE_LIBRETRODB
+#include "../database_info.h"
+#endif
+
+#include "menu_database.h"
+
+#include "../input/input_autodetect.h"
+#include "../input/input_remapping.h"
+
+#include "../gfx/video_viewport.h"
+
+static int action_start_remap_file_load(unsigned type, const char *label,
+ unsigned action)
+{
+ g_settings.input.remapping_path[0] = '\0';
+ input_remapping_set_defaults();
+ return 0;
+}
+
+static int action_start_video_filter_file_load(unsigned type, const char *label,
+ unsigned action)
+{
+ g_settings.video.softfilter_plugin[0] = '\0';
+ rarch_main_command(RARCH_CMD_REINIT);
+ return 0;
+}
+
+static int action_start_performance_counters_core(unsigned type, const char *label,
+ unsigned action)
+{
+ 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])
+ {
+ counters[offset]->total = 0;
+ counters[offset]->call_cnt = 0;
+ }
+
+ return 0;
+}
+
+static int action_start_input_desc(unsigned type, const char *label,
+ unsigned action)
+{
+ unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
+ unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_CUSTOM_BIND;
+ unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_CUSTOM_BIND);
+
+ (void)label;
+ (void)action;
+
+ g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] =
+ g_settings.input.binds[inp_desc_user][inp_desc_button_index_offset].id;
+
+ return 0;
+}
+
+static int action_start_shader_action_parameter(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader_parameter *param = NULL;
+ struct video_shader *shader = video_shader_driver_get_current_shader();
+
+ if (!shader)
+ return 0;
+
+ param = &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
+ param->current = param->initial;
+ param->current = min(max(param->minimum, param->current), param->maximum);
+#endif
+
+ return 0;
+}
+
+static int action_start_shader_action_preset_parameter(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = NULL;
+ struct video_shader_parameter *param = NULL;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ if (!(shader = menu->shader))
+ return 0;
+
+ param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
+ param->current = param->initial;
+ param->current = min(max(param->minimum, param->current), param->maximum);
+#endif
+
+ return 0;
+}
+
+static int action_start_shader_pass(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+
+ if (shader)
+ shader_pass = &shader->pass[hack_shader_pass];
+
+ if (shader_pass)
+ *shader_pass->source.path = '\0';
+#endif
+
+ return 0;
+}
+
+
+static int action_start_shader_scale_pass(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+
+ if (shader)
+ {
+ shader_pass = &shader->pass[pass];
+
+ if (shader_pass)
+ {
+ shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0;
+ shader_pass->fbo.valid = false;
+ }
+ }
+#endif
+
+ return 0;
+}
+
+static int action_start_shader_filter_pass(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ shader_pass = &shader->pass[pass];
+ if (!shader_pass)
+ return -1;
+
+ shader_pass->filter = RARCH_FILTER_UNSPEC;
+#endif
+
+ return 0;
+}
+
+static int action_start_shader_num_passes(unsigned type, const char *label,
+ unsigned action)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = NULL;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ if (shader->passes)
+ shader->passes = 0;
+ menu->need_refresh = true;
+
+ video_shader_resolve_parameters(NULL, menu->shader);
+#endif
+ return 0;
+}
+
+static int action_start_cheat_num_passes(unsigned type, const char *label,
+ unsigned action)
+{
+ cheat_manager_t *cheat = g_extern.cheat;
+ menu_handle_t *menu = menu_driver_resolve();
+ if (!menu)
+ return -1;
+
+ if (!cheat)
+ return -1;
+
+ if (cheat->size)
+ {
+ cheat_manager_realloc(cheat, 0);
+ menu->need_refresh = true;
+ }
+
+ return 0;
+}
+
+static int action_start_performance_counters_frontend(unsigned type, const char *label,
+ unsigned action)
+{
+ struct retro_perf_counter **counters = (struct retro_perf_counter**)
+ perf_counters_rarch;
+ unsigned offset = type - MENU_SETTINGS_PERF_COUNTERS_BEGIN;
+
+ (void)label;
+
+ if (counters[offset])
+ {
+ counters[offset]->total = 0;
+ counters[offset]->call_cnt = 0;
+ }
+
+ return 0;
+}
+
+static int action_start_core_setting(unsigned type,
+ const char *label, unsigned action)
+{
+ unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
+
+ (void)label;
+
+ core_option_set_default(g_extern.system.core_options, idx);
+
+ return 0;
+}
+
+static int action_start_lookup_setting(unsigned type, const char *label,
+ unsigned action)
+{
+ return menu_setting_set(type, label, MENU_ACTION_START);
+}
+
+void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
+ const char *path, const char *label, unsigned type, size_t idx,
+ const char *elem0, const char *elem1)
+{
+ if (!cbs)
+ return;
+
+ cbs->action_start = action_start_lookup_setting;
+
+ if (!strcmp(label, "remap_file_load"))
+ cbs->action_start = action_start_remap_file_load;
+ if (!strcmp(label, "video_filter"))
+ cbs->action_start = action_start_video_filter_file_load;
+ else if (!strcmp(label, "video_shader_pass"))
+ cbs->action_start = action_start_shader_pass;
+ else if (!strcmp(label, "video_shader_scale_pass"))
+ cbs->action_start = action_start_shader_scale_pass;
+ else if (!strcmp(label, "video_shader_filter_pass"))
+ cbs->action_start = action_start_shader_filter_pass;
+ else if (!strcmp(label, "video_shader_num_passes"))
+ cbs->action_start = action_start_shader_num_passes;
+ else if (!strcmp(label, "cheat_num_passes"))
+ cbs->action_start = action_start_cheat_num_passes;
+ else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
+ cbs->action_start = action_start_shader_action_parameter;
+ else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
+ cbs->action_start = action_start_shader_action_preset_parameter;
+ else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN &&
+ type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END)
+ cbs->action_start = action_start_performance_counters_core;
+ else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
+ && type <= MENU_SETTINGS_INPUT_DESC_END)
+ cbs->action_start = action_start_input_desc;
+ else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN &&
+ type <= MENU_SETTINGS_PERF_COUNTERS_END)
+ cbs->action_start = action_start_performance_counters_frontend;
+ else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
+ cbs->action_start = action_start_core_setting;
+}