diff --git a/database_info.c b/database_info.c index 6645f07fde..223471934a 100644 --- a/database_info.c +++ b/database_info.c @@ -110,6 +110,7 @@ static void database_info_build_query_add_glob_close(char *s, size_t len) strlcat(s, "*')", len); } +#if 0 int database_info_build_query(char *s, size_t len, const char *label, const char *path) { @@ -205,6 +206,7 @@ int database_info_build_query(char *s, size_t len, return 0; } +#endif int database_info_build_query_enum(char *s, size_t len, enum database_query_type type, @@ -243,6 +245,9 @@ int database_info_build_query_enum(char *s, size_t len, case DATABASE_QUERY_ENTRY_ELSPA_RATING: strlcat(s, "elspa_rating", len); break; + case DATABASE_QUERY_ENTRY_ESRB_RATING: + strlcat(s, "esrb_rating", len); + break; case DATABASE_QUERY_ENTRY_PEGI_RATING: strlcat(s, "pegi_rating", len); break; @@ -276,7 +281,7 @@ int database_info_build_query_enum(char *s, size_t len, strlcat(s, "users", len); add_quotes = false; break; - default: + case DATABASE_QUERY_NONE: RARCH_LOG("Unknown type: %d\n", type); break; } diff --git a/database_info.h b/database_info.h index 9bbe452f92..2051c37c95 100644 --- a/database_info.h +++ b/database_info.h @@ -58,6 +58,7 @@ enum database_query_type DATABASE_QUERY_ENTRY_RATING, DATABASE_QUERY_ENTRY_BBFC_RATING, DATABASE_QUERY_ENTRY_ELSPA_RATING, + DATABASE_QUERY_ENTRY_ESRB_RATING, DATABASE_QUERY_ENTRY_PEGI_RATING, DATABASE_QUERY_ENTRY_CERO_RATING, DATABASE_QUERY_ENTRY_ENHANCEMENT_HW, @@ -132,8 +133,10 @@ database_info_handle_t *database_info_file_init(const char *path, void database_info_free(database_info_handle_t *handle); +#if 0 int database_info_build_query( char *query, size_t len, const char *label, const char *path); +#endif int database_info_build_query_enum( char *query, size_t len, enum database_query_type type, const char *path); diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index b8666d56f0..2fcf515b05 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -481,6 +481,60 @@ end: return ret; } +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_MAX_USERS); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_FAMITSU_MAGAZINE_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_EDGE_MAGAZINE_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_issue( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_EDGE_MAGAZINE_ISSUE); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_elspa_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_ELSPA_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_cero_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_CERO_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_pegi_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_PEGI_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_bbfc_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_BBFC_RATING); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_esrb_rating( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_ESRB_RATING); +} + static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_enhancement_hw( menu_displaylist_info_t *info) { @@ -511,6 +565,19 @@ static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_origin( return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_ORIGIN); } +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_releasemonth( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_RELEASEDATE_MONTH); +} + +static int deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear( + menu_displaylist_info_t *info) +{ + return deferred_push_cursor_manager_list_generic(info, DATABASE_QUERY_ENTRY_RELEASEDATE_YEAR); +} + +#if 0 static int deferred_push_cursor_manager_list_deferred_query_subsearch( menu_displaylist_info_t *info) { @@ -538,6 +605,7 @@ end: #endif return ret; } +#endif static int general_push(menu_displaylist_info_t *info, unsigned id, enum menu_displaylist_ctl_state state) @@ -1067,17 +1135,37 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_enhancement_hw); break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ESRB_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_esrb_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_BBFC_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_bbfc_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ELSPA_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_elspa_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PEGI_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_pegi_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_CERO_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_cero_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_issue); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEMONTH: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releasemonth); + break; case MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_subsearch); + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear); break; case MENU_ENUM_LABEL_CORE_INFORMATION: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information); @@ -1337,17 +1425,37 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_enhancement_hw); break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ESRB_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_esrb_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_BBFC_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_bbfc_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ELSPA_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_elspa_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PEGI_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_pegi_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_CERO_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_cero_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_issue); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEMONTH: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releasemonth); + break; case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_subsearch); + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear); break; case MENU_LABEL_CORE_INFORMATION: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);