(Menu) Refactor code in menu_info_screen_iterate

This commit is contained in:
twinaphex 2014-08-16 06:41:07 +02:00
parent 77b2fe4910
commit 98e0c87a45
2 changed files with 528 additions and 670 deletions

View File

@ -501,36 +501,14 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render();
current_setting = file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
if (current_setting)
setting_data_get_description(current_setting, msg, sizeof(msg));
else
{
switch (driver.menu->info_selection)
{
case MENU_SETTINGS_WINDOW_COMPOSITING_ENABLE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_disable_composition")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_LIBRETRO_LOG_LEVEL:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_log_level")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_LOGGING_VERBOSITY:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "perfcnt_enable")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SYSTEM_DIR_PATH:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "system_directory")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_START_SCREEN:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rgui_show_start_screen")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_CONFIG_SAVE_ON_EXIT:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "config_save_on_exit")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_OPEN_FILEBROWSER:
snprintf(msg, sizeof(msg),
" -- Load Content. \n"
@ -551,50 +529,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
"content is loaded."
);
break;
case MENU_SETTINGS_PER_CORE_CONFIG:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "core_specific_config")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_WINDOW_SCALE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_scale")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_VSYNC:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_vsync")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_HARD_SYNC:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_hard_sync")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_HARD_SYNC_FRAMES:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_hard_sync_frames")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_BLACK_FRAME_INSERTION:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_black_frame_insertion")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_THREADED:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_threaded")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_INTEGER_SCALE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_scale_integer")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_CROP_OVERSCAN:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_crop_overscan")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_MONITOR_INDEX:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_monitor_index")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_ROTATION:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_rotation")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_AUDIO_CONTROL_RATE_DELTA:
snprintf(msg, sizeof(msg),
" -- Audio rate control.\n"
@ -609,10 +543,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
" Input rate is defined as: \n"
" input rate * (1.0 +/- (rate control delta))");
break;
case MENU_SETTINGS_AUDIO_VOLUME:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_volume")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_SOFTFILTER:
#ifdef HAVE_FILTERS_BUILTIN
snprintf(msg, sizeof(msg),
@ -624,34 +554,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
"Path to a dynamic library.");
#endif
break;
case MENU_SETTINGS_BLOCK_SRAM_OVERWRITE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "block_sram_overwrite")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_PRIVACY_CAMERA_ALLOW:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "camera_allow")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_PRIVACY_LOCATION_ALLOW:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "location_allow")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_REWIND_ENABLE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_enable")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_REWIND_GRANULARITY:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_granularity")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_DEVICE_AUTODETECT_ENABLE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "input_autodetect_enable")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_INPUT_AXIS_THRESHOLD:
if ((current_setting = setting_data_find_setting(setting_data, "input_axis_threshold")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_CORE:
snprintf(msg, sizeof(msg),
" -- Core Selection. \n"
@ -811,30 +713,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
snprintf(msg, sizeof(msg),
" -- Toggles fullscreen.");
break;
case MENU_SETTINGS_SLOWMOTION_RATIO:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "slowmotion_ratio")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_FASTFORWARD_RATIO:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "fastforward_ratio")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_PAUSE_IF_WINDOW_FOCUS_LOST:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "pause_nonactive")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_GPU_SCREENSHOT:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_gpu_screenshot")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_SRAM_AUTOSAVE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "autosave_interval")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SCREENSHOT_DIR_PATH:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "screenshot_directory")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_DRIVER_AUDIO_DEVICE:
snprintf(msg, sizeof(msg),
" -- Override the default audio device \n"
@ -860,22 +738,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
#endif
);
break;
case MENU_ASSETS_DIR_PATH:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "assets_directory")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_SAVESTATE_AUTO_SAVE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "savestate_auto_save")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_SWAP_INTERVAL:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_swap_interval")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_VIDEO_REFRESH_RATE_AUTO:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_refresh_rate_auto")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_LIBRETRO_DIR_PATH:
snprintf(msg, sizeof(msg),
" -- Core Directory. \n"
@ -883,14 +745,6 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
"A directory for where to search for \n"
"libretro core implementations.");
break;
case MENU_SAVEFILE_DIR_PATH:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "savefile_directory")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SAVESTATE_DIR_PATH:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "savestate_directory")))
setting_data_get_description(current_setting, msg, sizeof(msg));
break;
case MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_X_PLUS:
case MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_X_MINUS:
case MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_Y_PLUS:
@ -1216,6 +1070,7 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
snprintf(msg, sizeof(msg),
"-- No info on this item available. --\n");
}
}
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render_messagebox)
{

View File

@ -774,6 +774,9 @@ void setting_data_get_description(const void *data, char *msg, size_t sizeof_msg
"RetroArch will automatically load any savestate\n"
"with this path on startup if 'Savestate Auto\n"
"Load' is set.");
else
snprintf(msg, sizeof_msg,
"-- No info on this item is available. --\n");
}
static void general_read_handler(const void *data)