mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start using RARCH_MENU_CTL_PLAYLIST_GET

Browse Source
This commit is contained in:
twinaphex 2015-12-11 12:44:58 +01:00
parent 5ce356c3fc
commit 16ce520d34
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
menu/cbs/menu_cbs_ok.c
View File

@ -476,15 +476,16 @@ static int action_ok_playlist_entry(const char *path,
{ {
size_t selection; size_t selection;
uint32_t core_name_hash, core_path_hash; uint32_t core_name_hash, core_path_hash;
const char *entry_path = NULL; const char *entry_path = NULL;
const char *entry_label = NULL; const char *entry_label = NULL;
const char *core_path = NULL; const char *core_path = NULL;
const char *core_name = NULL; const char *core_name = NULL;
size_t selection_ptr = 0; size_t selection_ptr = 0;
content_playlist_t *playlist = g_defaults.history; content_playlist_t *tmp_playlist = NULL;
bool is_history = true; content_playlist_t *playlist = g_defaults.history;
menu_handle_t *menu = menu_driver_get_ptr(); bool is_history = true;
uint32_t hash_label = menu_hash_calculate(label); menu_handle_t *menu = menu_driver_get_ptr();
uint32_t hash_label = menu_hash_calculate(label);
if (!menu) if (!menu)
return -1; return -1;
@ -495,15 +496,17 @@ static int action_ok_playlist_entry(const char *path,
{ {
case MENU_LABEL_COLLECTION: case MENU_LABEL_COLLECTION:
case MENU_LABEL_RDB_ENTRY_START_CONTENT: case MENU_LABEL_RDB_ENTRY_START_CONTENT:
if (!menu->playlist) menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &tmp_playlist);
{
menu->playlist = content_playlist_init(menu->db_playlist_file, COLLECTION_SIZE);
if (!menu->playlist) if (!tmp_playlist)
{
tmp_playlist = content_playlist_init(menu->db_playlist_file, COLLECTION_SIZE);
if (!tmp_playlist)
return -1; return -1;
} }
playlist = menu->playlist; playlist = tmp_playlist;
is_history = false; is_history = false;
break; break;
} }
@ -551,11 +554,13 @@ static int action_ok_playlist_entry(const char *path,
const char *entry_crc32 = NULL; const char *entry_crc32 = NULL;
const char *db_name = NULL; const char *db_name = NULL;
content_playlist_get_index(menu->playlist, selection_ptr, menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &tmp_playlist);
content_playlist_get_index(tmp_playlist, selection_ptr,
&entry_path, &entry_label, NULL, NULL, &entry_crc32, &db_name); &entry_path, &entry_label, NULL, NULL, &entry_crc32, &db_name);
strlcpy(new_display_name, core_info->display_name, sizeof(new_display_name)); strlcpy(new_display_name, core_info->display_name, sizeof(new_display_name));
content_playlist_update(menu->playlist, content_playlist_update(tmp_playlist,
selection_ptr, selection_ptr,
entry_path, entry_path,
entry_label, entry_label,
@ -563,7 +568,7 @@ static int action_ok_playlist_entry(const char *path,
new_display_name, new_display_name,
entry_crc32, entry_crc32,
db_name); db_name);
content_playlist_write_file(menu->playlist); content_playlist_write_file(tmp_playlist);
} }
else else
return action_ok_file_load_with_detect_core(entry_path, label, type, selection_ptr, entry_idx); return action_ok_file_load_with_detect_core(entry_path, label, type, selection_ptr, entry_idx);