mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_cbs_ok.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-07 00:38:23 +02:00
parent a2c8fe3bc2
commit b9570953b0
1 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
menu/cbs/menu_cbs_ok.c
View File

@ -83,6 +83,7 @@ static int generic_action_ok_displaylist_push(const char *path,
const char *menu_path = NULL; const char *menu_path = NULL;
const char *content_path = NULL; const char *content_path = NULL;
const char *info_label = NULL; const char *info_label = NULL;
const char *info_path = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
@ -119,7 +120,7 @@ static int generic_action_ok_displaylist_push(const char *path,
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_ARCHIVE_OPEN);
break; break;
} }
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
break; break;
@ -136,13 +137,13 @@ static int generic_action_ok_displaylist_push(const char *path,
break; break;
case ACTION_OK_DL_AUDIO_DSP_PLUGIN: case ACTION_OK_DL_AUDIO_DSP_PLUGIN:
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->audio.filter_dir, sizeof(info.path)); info_path = settings->audio.filter_dir;
info_label = menu_hash_to_str(MENU_LABEL_AUDIO_DSP_PLUGIN); info_label = menu_hash_to_str(MENU_LABEL_AUDIO_DSP_PLUGIN);
break; break;
case ACTION_OK_DL_SHADER_PASS: case ACTION_OK_DL_SHADER_PASS:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->video.shader_dir, sizeof(info.path)); info_path = settings->video.shader_dir;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_SHADER_PARAMETERS: case ACTION_OK_DL_SHADER_PARAMETERS:
@ -162,67 +163,67 @@ static int generic_action_ok_displaylist_push(const char *path,
case ACTION_OK_DL_PUSH_DEFAULT: case ACTION_OK_DL_PUSH_DEFAULT:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, label, sizeof(info.path)); info_path = label;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_SHADER_PRESET: case ACTION_OK_DL_SHADER_PRESET:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->video.shader_dir, sizeof(info.path)); info_path = settings->video.shader_dir;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_DOWNLOADS_DIR: case ACTION_OK_DL_DOWNLOADS_DIR:
info.type = MENU_FILE_DIRECTORY; info.type = MENU_FILE_DIRECTORY;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->core_assets_directory, sizeof(info.path)); info_path = settings->core_assets_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_CONTENT_LIST: case ACTION_OK_DL_CONTENT_LIST:
info.type = MENU_FILE_DIRECTORY; info.type = MENU_FILE_DIRECTORY;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->menu_content_directory, sizeof(info.path)); info_path = settings->menu_content_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_REMAP_FILE: case ACTION_OK_DL_REMAP_FILE:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->input_remapping_directory, sizeof(info.path)); info_path = settings->input_remapping_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_RECORD_CONFIGFILE: case ACTION_OK_DL_RECORD_CONFIGFILE:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, global->record.config_dir, sizeof(info.path)); info_path = global->record.config_dir;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST: case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->menu_content_directory, sizeof(info.path)); info_path = settings->menu_content_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_PLAYLIST_COLLECTION: case ACTION_OK_DL_PLAYLIST_COLLECTION:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_CHEAT_FILE: case ACTION_OK_DL_CHEAT_FILE:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->cheat_database, sizeof(info.path)); info_path = settings->cheat_database;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_CORE_LIST: case ACTION_OK_DL_CORE_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path)); info_path = settings->libretro_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_CONTENT_COLLECTION_LIST: case ACTION_OK_DL_CONTENT_COLLECTION_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->playlist_directory, sizeof(info.path)); info_path = settings->playlist_directory;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_RDB_ENTRY: case ACTION_OK_DL_RDB_ENTRY:
@ -230,29 +231,28 @@ static int generic_action_ok_displaylist_push(const char *path,
path, '|', sizeof(tmp)); path, '|', sizeof(tmp));
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, label, sizeof(info.path)); info_path = label;
info_label = tmp; info_label = tmp;
break; break;
case ACTION_OK_DL_RDB_ENTRY_SUBMENU: case ACTION_OK_DL_RDB_ENTRY_SUBMENU:
info.directory_ptr = idx; info.directory_ptr = idx;
info_label = label; info_label = label;
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
break; break;
case ACTION_OK_DL_CONFIGURATIONS_LIST: case ACTION_OK_DL_CONFIGURATIONS_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
if (path) if (path)
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
else else
strlcpy(info.path, label, sizeof(info.path)); info_path = label;
info_label = label; info_label = label;
break; break;
case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE: case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE:
case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH: case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
switch (action_type) switch (action_type)
{ {
case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE: case ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE:
@ -269,32 +269,24 @@ static int generic_action_ok_displaylist_push(const char *path,
case ACTION_OK_DL_DIRECTORY_PUSH: case ACTION_OK_DL_DIRECTORY_PUSH:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, action_path, sizeof(info.path)); info_path = action_path;
info_label = menu_label; info_label = menu_label;
break; break;
case ACTION_OK_DL_DATABASE_MANAGER_LIST: case ACTION_OK_DL_DATABASE_MANAGER_LIST:
{ fill_pathname_join(tmp, settings->content_database,
char rdb_path[PATH_MAX_LENGTH]; path, sizeof(tmp));
fill_pathname_join(rdb_path, settings->content_database,
path, sizeof(rdb_path));
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, rdb_path, sizeof(info.path)); info_path = tmp;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST);
}
break; break;
case ACTION_OK_DL_CURSOR_MANAGER_LIST: case ACTION_OK_DL_CURSOR_MANAGER_LIST:
{ fill_pathname_join(tmp, settings->cursor_directory,
char cursor_path[PATH_MAX_LENGTH]; path, sizeof(tmp));
fill_pathname_join(cursor_path, settings->cursor_directory,
path, sizeof(cursor_path));
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, cursor_path, sizeof(info.path)); info_path = tmp;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST);
}
break; break;
case ACTION_OK_DL_CUSTOM_VIEWPORT: case ACTION_OK_DL_CUSTOM_VIEWPORT:
info.type = MENU_SETTINGS_CUSTOM_VIEWPORT; info.type = MENU_SETTINGS_CUSTOM_VIEWPORT;
@ -304,31 +296,32 @@ static int generic_action_ok_displaylist_push(const char *path,
case ACTION_OK_DL_CORE_UPDATER_LIST: case ACTION_OK_DL_CORE_UPDATER_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_UPDATER_LIST); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_UPDATER_LIST);
break; break;
case ACTION_OK_DL_CORE_CONTENT_LIST: case ACTION_OK_DL_CORE_CONTENT_LIST:
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, path, sizeof(info.path)); info_path = path;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_CONTENT_LIST); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_CONTENT_LIST);
break; break;
case ACTION_OK_DL_DEFERRED_CORE_LIST: case ACTION_OK_DL_DEFERRED_CORE_LIST:
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path)); info_path = settings->libretro_directory;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST);
break; break;
case ACTION_OK_DL_DEFERRED_CORE_LIST_SET: case ACTION_OK_DL_DEFERRED_CORE_LIST_SET:
info.directory_ptr = idx; info.directory_ptr = idx;
rdb_entry_start_game_selection_ptr = idx; rdb_entry_start_game_selection_ptr = idx;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path)); info_path = settings->libretro_directory;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST_SET); info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST_SET);
break; break;
} }
if (info_label) if (info_label)
strlcpy(info.label, info_label, sizeof(info.label)); strlcpy(info.label, info_label, sizeof(info.label));
if (info_path)
strlcpy(info.path, info_path, sizeof(info.path));
return menu_displaylist_push_list(&info, dl_type); return menu_displaylist_push_list(&info, dl_type);
} }