(Menu) Start presenting RDBV entry detail page if a collection entry
has been bound to a core
This commit is contained in:
parent
c72c85c07a
commit
d97a056903
|
@ -697,6 +697,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
|
||||||
{
|
{
|
||||||
unsigned i;
|
unsigned i;
|
||||||
size_t list_size = 0;
|
size_t list_size = 0;
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
|
|
||||||
if (!playlist)
|
if (!playlist)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -714,6 +715,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
|
||||||
{
|
{
|
||||||
char fill_buf[PATH_MAX_LENGTH];
|
char fill_buf[PATH_MAX_LENGTH];
|
||||||
char path_copy[PATH_MAX_LENGTH];
|
char path_copy[PATH_MAX_LENGTH];
|
||||||
|
bool core_detected = false;
|
||||||
const char *core_name = NULL;
|
const char *core_name = NULL;
|
||||||
const char *db_name = NULL;
|
const char *db_name = NULL;
|
||||||
const char *path = NULL;
|
const char *path = NULL;
|
||||||
|
@ -744,10 +746,24 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
|
||||||
char tmp[PATH_MAX_LENGTH];
|
char tmp[PATH_MAX_LENGTH];
|
||||||
snprintf(tmp, sizeof(tmp), " (%s)", core_name);
|
snprintf(tmp, sizeof(tmp), " (%s)", core_name);
|
||||||
strlcat(fill_buf, tmp, sizeof(fill_buf));
|
strlcat(fill_buf, tmp, sizeof(fill_buf));
|
||||||
|
core_detected = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (core_detected && db_name[0] != '\0')
|
||||||
|
{
|
||||||
|
char db_path[PATH_MAX_LENGTH];
|
||||||
|
|
||||||
|
fill_pathname_join(db_path, settings->content_database,
|
||||||
|
db_name, sizeof(db_path));
|
||||||
|
path_remove_extension(db_path);
|
||||||
|
strlcat(db_path, ".rdb", sizeof(db_path));
|
||||||
|
|
||||||
|
menu_list_push(info->list, label,
|
||||||
|
db_path, MENU_FILE_RDB_ENTRY, 0);
|
||||||
|
}
|
||||||
|
else
|
||||||
menu_list_push(info->list, fill_buf, path_playlist,
|
menu_list_push(info->list, fill_buf, path_playlist,
|
||||||
MENU_FILE_PLAYLIST_ENTRY, i);
|
MENU_FILE_PLAYLIST_ENTRY, i);
|
||||||
}
|
}
|
||||||
|
@ -1173,9 +1189,11 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
|
||||||
for (i = 0; i < db_list->count; i++)
|
for (i = 0; i < db_list->count; i++)
|
||||||
{
|
{
|
||||||
if (db_list->list[i].name && db_list->list[i].name[0] != '\0')
|
if (db_list->list[i].name && db_list->list[i].name[0] != '\0')
|
||||||
|
{
|
||||||
menu_list_push(list, db_list->list[i].name,
|
menu_list_push(list, db_list->list[i].name,
|
||||||
path, MENU_FILE_RDB_ENTRY, 0);
|
path, MENU_FILE_RDB_ENTRY, 0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
database_info_list_free(db_list);
|
database_info_list_free(db_list);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue