mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-12-28 09:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-opaque core_info.

Browse Source
This commit is contained in:
Themaister 2014-06-17 17:28:39 +02:00
parent 839d072986
commit f34b175a0f
8 changed files with 46 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
driver_menu.h
View File

@ -22,6 +22,7 @@
#include "boolean.h"
#include "frontend/menu/file_list.h"
#include "frontend/menu/history.h"
#include "frontend/info/core_info.h"
#ifdef __cplusplus
extern "C" {
@ -138,8 +139,8 @@ typedef struct
bool msg_force;
bool push_start_screen;
void *core_info;
void *core_info_current;
core_info_list_t *core_info;
core_info_t *core_info_current;
bool defer_core;
char deferred_path[PATH_MAX];
@ -159,7 +160,7 @@ typedef struct
bool load_no_rom;
struct gfx_shader *shader;
void *parameter_shader; // Points to either shader or graphics driver current shader.
struct gfx_shader *parameter_shader; // Points to either shader or graphics driver current shader.
unsigned current_pad;
rom_history_t *history;

1
file.h
View File

@ -21,7 +21,6 @@
#include <stdint.h>
#include <stddef.h>
#include <sys/types.h>
#include "general.h"
#include "file_path.h"
#ifdef __cplusplus

1
file_extract.c
View File

@ -16,6 +16,7 @@
#include "file_extract.h"
#include "file.h"
#include "compat/strl.h"
#include "general.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

57
frontend/info/core_info.c
View File

@ -24,13 +24,12 @@
#include "../../config.h"
#endif
static core_info_list_t* global_core_list = 0;
static core_info_list_t *global_core_list;
static char core_config_path[PATH_MAX];
static void core_info_list_resolve_all_extensions(void *data)
static void core_info_list_resolve_all_extensions(core_info_list_t *core_info_list)
{
size_t i, all_ext_len = 0;
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -60,11 +59,10 @@ static void core_info_list_resolve_all_extensions(void *data)
}
}
static void core_info_list_resolve_all_firmware(void *data)
static void core_info_list_resolve_all_firmware(core_info_list_t *core_info_list)
{
size_t i;
unsigned c;
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -183,10 +181,9 @@ error:
return NULL;
}
void core_info_list_free(void *data)
void core_info_list_free(core_info_list_t *core_info_list)
{
size_t i, j;
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -220,10 +217,9 @@ void core_info_list_free(void *data)
free(core_info_list);
}
size_t core_info_list_num_info_files(void *data)
size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
{
size_t i, num;
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return 0;
@ -233,10 +229,9 @@ size_t core_info_list_num_info_files(void *data)
return num;
}
bool core_info_list_get_display_name(void *data, const char *path, char *buf, size_t size)
bool core_info_list_get_display_name(core_info_list_t *core_info_list, const char *path, char *buf, size_t size)
{
size_t i;
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return false;
@ -253,11 +248,9 @@ bool core_info_list_get_display_name(void *data, const char *path, char *buf, si
return false;
}
bool core_info_list_get_info(void *data1, void *data2, const char *path)
bool core_info_list_get_info(core_info_list_t *core_info_list, core_info_t *out_info, const char *path)
{
size_t i;
core_info_list_t *core_info_list = (core_info_list_t*)data1;
core_info_t *out_info = (core_info_t*)data2;
if (!core_info_list || !out_info)
return false;
@ -276,11 +269,9 @@ bool core_info_list_get_info(void *data1, void *data2, const char *path)
return false;
}
bool core_info_does_support_any_file(const void *data1, const void *data2)
bool core_info_does_support_any_file(const core_info_t *core, const struct string_list *list)
{
size_t i;
const core_info_t *core = (const core_info_t*)data1;
const struct string_list *list = (const struct string_list*)data2;
if (!list || !core || !core->supported_extensions_list)
return false;
@ -290,18 +281,16 @@ bool core_info_does_support_any_file(const void *data1, const void *data2)
return false;
}
bool core_info_does_support_file(const void *data, const char *path)
bool core_info_does_support_file(const core_info_t *core, const char *path)
{
const core_info_t *core = (const core_info_t*)data;
if (!path || !core || !core->supported_extensions_list)
return false;
return string_list_find_elem_prefix(core->supported_extensions_list, ".", path_get_extension(path));
}
const char *core_info_list_get_all_extensions(void *data)
const char *core_info_list_get_all_extensions(core_info_list_t *core_info_list)
{
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (core_info_list)
return core_info_list->all_ext;
return "";
@ -327,10 +316,9 @@ static int core_info_qsort_cmp(const void *a_, const void *b_)
return strcasecmp(a->display_name, b->display_name);
}
void core_info_list_get_supported_cores(void *data, const char *path,
void core_info_list_get_supported_cores(core_info_list_t *core_info_list, const char *path,
const core_info_t **infos, size_t *num_infos)
{
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -368,10 +356,9 @@ void core_info_list_get_supported_cores(void *data, const char *path,
*num_infos = supported;
}
static core_info_t *find_core_info(void *data, const char *core)
static core_info_t *find_core_info(core_info_list_t *list, const char *core)
{
size_t i;
core_info_list_t *list = (core_info_list_t*)data;
if (!list)
return NULL;
@ -397,12 +384,11 @@ static int core_info_firmware_cmp(const void *a_, const void *b_)
return strcasecmp(a->path, b->path);
}
void core_info_list_update_missing_firmware(void *data,
void core_info_list_update_missing_firmware(core_info_list_t *core_info_list,
const char *core, const char *systemdir)
{
size_t i;
char path[PATH_MAX];
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -420,13 +406,12 @@ void core_info_list_update_missing_firmware(void *data,
}
}
void core_info_list_get_missing_firmware(void *data,
void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
const char *core, const char *systemdir,
const core_info_firmware_t **firmware, size_t *num_firmware)
{
size_t i;
char path[PATH_MAX];
core_info_list_t *core_info_list = (core_info_list_t*)data;
if (!core_info_list)
return;
@ -449,7 +434,7 @@ void core_info_list_get_missing_firmware(void *data,
qsort(info->firmware, info->firmware_count, sizeof(*info->firmware), core_info_firmware_cmp);
}
void core_info_set_core_path(const char* core_path)
void core_info_set_core_path(const char *core_path)
{
if (global_core_list)
core_info_list_free(global_core_list);
@ -460,7 +445,7 @@ void core_info_set_core_path(const char* core_path)
RARCH_WARN("No cores were found at %s", core_path ? core_path : "(null");
}
void core_info_set_config_path(const char* config_path)
void core_info_set_config_path(const char *config_path)
{
if (!config_path || strlcpy(core_config_path, config_path, sizeof(core_config_path)) >= PATH_MAX)
*core_config_path = '\0';
@ -474,10 +459,10 @@ core_info_list_t *core_info_list_get(void)
return global_core_list;
}
const core_info_t *core_info_list_get_by_id(const char* core_id)
const core_info_t *core_info_list_get_by_id(const char *core_id)
{
unsigned i;
const core_info_list_t* cores = (const core_info_list_t*)core_info_list_get();
const core_info_list_t* cores = core_info_list_get();
if (core_id)
for (i = 0; i < cores->count; i ++)
@ -487,7 +472,7 @@ const core_info_t *core_info_list_get_by_id(const char* core_id)
return 0;
}
const char *core_info_get_id(const core_info_t* info, char* buffer, size_t buffer_length)
const char *core_info_get_id(const core_info_t *info, char *buffer, size_t buffer_length)
{
if (!buffer || !buffer_length)
return "";
@ -499,7 +484,7 @@ const char *core_info_get_id(const core_info_t* info, char* buffer, size_t buffe
return buffer;
}
const char *core_info_get_custom_config(const char* core_id, char* buffer, size_t buffer_length)
const char *core_info_get_custom_config(const char *core_id, char *buffer, size_t buffer_length)
{
if (!core_id || !buffer || !buffer_length)
return 0;
@ -509,7 +494,7 @@ const char *core_info_get_custom_config(const char* core_id, char* buffer, size_
return buffer;
}
bool core_info_has_custom_config(const char* core_id)
bool core_info_has_custom_config(const char *core_id)
{
char path[PATH_MAX];
if (!core_id)

34
frontend/info/core_info.h
View File

@ -60,41 +60,41 @@ typedef struct
} core_info_list_t;
core_info_list_t *core_info_list_new(const char *modules_path);
void core_info_list_free(void *data);
void core_info_list_free(core_info_list_t *list);
size_t core_info_list_num_info_files(void *data);
size_t core_info_list_num_info_files(core_info_list_t *list);
bool core_info_does_support_file(const void *data, const char *path);
bool core_info_does_support_any_file(const void *data, const void *list);
bool core_info_does_support_file(const core_info_t *info, const char *path);
bool core_info_does_support_any_file(const core_info_t *info, const core_info_list_t *list);
// Non-reentrant, does not allocate. Returns pointer to internal state.
void core_info_list_get_supported_cores(void *data, const char *path,
void core_info_list_get_supported_cores(core_info_list_t *list, const char *path,
const core_info_t **infos, size_t *num_infos);
// Non-reentrant, does not allocate. Returns pointer to internal state.
void core_info_list_get_missing_firmware(void *data,
void core_info_list_get_missing_firmware(core_info_list_t *list,
const char *core, const char *systemdir,
const core_info_firmware_t **firmware, size_t *num_firmware);
void core_info_list_update_missing_firmware(void *data,
void core_info_list_update_missing_firmware(core_info_list_t *list,
const char *core, const char *systemdir);
// Shallow-copies internal state. Data in *info is invalidated when the core_info_list is freed.
bool core_info_list_get_info(void *data1, void *data2, const char *path);
bool core_info_list_get_info(core_info_list_t *list, core_info_t *info, const char *path);
const char *core_info_list_get_all_extensions(void *data);
const char *core_info_list_get_all_extensions(core_info_list_t *list);
bool core_info_list_get_display_name(void *data, const char *path, char *buf, size_t size);
bool core_info_list_get_display_name(core_info_list_t *list, const char *path, char *buf, size_t size);
void core_info_set_core_path(const char* core_path);
void core_info_set_config_path(const char* config_path);
void core_info_set_core_path(const char *core_path);
void core_info_set_config_path(const char *config_path);
core_info_list_t* core_info_list_get(void);
const core_info_t* core_info_list_get_by_id(const char* core_id);
const char* core_info_get_id(const core_info_t* info, char* buffer, size_t buffer_length);
core_info_list_t *core_info_list_get(void);
const core_info_t *core_info_list_get_by_id(const char *core_id);
const char *core_info_get_id(const core_info_t *info, char *buffer, size_t buffer_length);
const char* core_info_get_custom_config(const char* core_id, char* buffer, size_t buffer_length);
bool core_info_has_custom_config(const char* core_id);
const char *core_info_get_custom_config(const char *core_id, char *buffer, size_t buffer_length);
bool core_info_has_custom_config(const char *core_id);
#ifdef __cplusplus
}

1
gfx/fonts/freetype.c
View File

@ -15,6 +15,7 @@
#include "fonts.h"
#include "../../file.h"
#include "../../general.h"
#include <string.h>
#include <stddef.h>
#include <stdlib.h>

2
gfx/shader_parse.c
View File

@ -17,6 +17,8 @@
#include "../compat/posix_string.h"
#include "../msvc/msvc_compat.h"
#include "../file.h"
#include "../compat/strl.h"
#include "../general.h"
#include <stdlib.h>
#include <string.h>

2
settings.c
View File

@ -520,8 +520,6 @@ void config_set_defaults(void)
/* Avoid reloading config on every ROM load */
g_extern.block_config_read = default_block_config_read;
rarch_init_msg_queue();
}
static void parse_config_file(void);