Move and rename - menu_database_push_query

This commit is contained in:
twinaphex 2015-05-12 12:43:08 +02:00
parent 84d739d8e6
commit f7de1a18d6
3 changed files with 34 additions and 40 deletions

View File

@ -20,6 +20,39 @@
#include "../playlist.h" #include "../playlist.h"
#include <string.h> #include <string.h>
#ifdef HAVE_LIBRETRODB
static int menu_database_push_query(libretrodb_t *db,
libretrodb_cursor_t *cur, file_list_t *list)
{
unsigned i;
struct rmsgpack_dom_value item;
while (libretrodb_cursor_read_item(cur, &item) == 0)
{
if (item.type != RDT_MAP)
continue;
for (i = 0; i < item.map.len; i++)
{
struct rmsgpack_dom_value *key = &item.map.items[i].key;
struct rmsgpack_dom_value *val = &item.map.items[i].value;
if (!key || !val)
continue;
if (!strcmp(key->string.buff, "name"))
{
menu_list_push(list, val->string.buff, db->path,
MENU_FILE_RDB_ENTRY, 0);
break;
}
}
}
return 0;
}
#endif
int menu_database_populate_query(file_list_t *list, const char *path, int menu_database_populate_query(file_list_t *list, const char *path,
const char *query) const char *query)
{ {
@ -31,7 +64,7 @@ int menu_database_populate_query(file_list_t *list, const char *path,
return -1; return -1;
if ((database_open_cursor(&db, &cur, query) != 0)) if ((database_open_cursor(&db, &cur, query) != 0))
return -1; return -1;
if ((menu_entries_push_query(&db, &cur, list)) != 0) if ((menu_database_push_query(&db, &cur, list)) != 0)
return -1; return -1;
libretrodb_cursor_close(&cur); libretrodb_cursor_close(&cur);

View File

@ -48,40 +48,6 @@ int menu_entries_setting_set_flags(rarch_setting_t *setting)
return 0; return 0;
} }
#ifdef HAVE_LIBRETRODB
int menu_entries_push_query(libretrodb_t *db,
libretrodb_cursor_t *cur, file_list_t *list)
{
unsigned i;
struct rmsgpack_dom_value item;
while (libretrodb_cursor_read_item(cur, &item) == 0)
{
if (item.type != RDT_MAP)
continue;
for (i = 0; i < item.map.len; i++)
{
struct rmsgpack_dom_value *key = &item.map.items[i].key;
struct rmsgpack_dom_value *val = &item.map.items[i].value;
if (!key || !val)
continue;
if (!strcmp(key->string.buff, "name"))
{
menu_list_push(list, val->string.buff, db->path,
MENU_FILE_RDB_ENTRY, 0);
break;
}
}
}
return 0;
}
#endif
static void menu_entries_content_list_push( static void menu_entries_content_list_push(
file_list_t *list, core_info_t *info, const char* path) file_list_t *list, core_info_t *info, const char* path)
{ {

View File

@ -55,11 +55,6 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu,
const char *path, const char *label, const char *path, const char *label,
unsigned menu_type); unsigned menu_type);
#ifdef HAVE_LIBRETRODB
int menu_entries_push_query(libretrodb_t *db,
libretrodb_cursor_t *cur, file_list_t *list);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif