mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Refactor core_info_set_core_path

Browse Source
This commit is contained in:
twinaphex 2014-07-21 02:58:25 +02:00
parent cb7ad2d6e6
commit d388b49a93
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OSX/platform.m
View File

@ -147,7 +147,7 @@ static char** waiting_argv;
self.settingsWindow = [[[NSWindowController alloc] initWithWindowNibName:BOXSTRING("Settings")] autorelease]; self.settingsWindow = [[[NSWindowController alloc] initWithWindowNibName:BOXSTRING("Settings")] autorelease];
core_info_set_core_path(g_defaults.core_dir); core_info_set_core_path();
core_info_set_config_path(g_defaults.menu_config_dir); core_info_set_config_path(g_defaults.menu_config_dir);
core_list = (const core_info_list_t*)core_info_list_get(); core_list = (const core_info_list_t*)core_info_list_get();

2
apple/iOS/platform.m
View File

@ -225,7 +225,7 @@ static void handle_touch_event(NSArray* touches)
} }
// Warn if there are no cores present // Warn if there are no cores present
core_info_set_core_path(g_defaults.core_dir); core_info_set_core_path();
core_info_set_config_path(g_defaults.menu_config_dir); core_info_set_config_path(g_defaults.menu_config_dir);
core_list = (const core_info_list_t*)core_info_list_get(); core_list = (const core_info_list_t*)core_info_list_get();

13
frontend/info/core_info.c
View File

@ -434,15 +434,9 @@ void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
qsort(info->firmware, info->firmware_count, sizeof(*info->firmware), core_info_firmware_cmp); 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(void)
{ {
if (global_core_list) global_core_list = core_info_list_new(g_defaults.core_dir);
core_info_list_free(global_core_list);
global_core_list = core_path ? core_info_list_new(core_path) : 0;
if (!global_core_list)
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)
@ -453,9 +447,6 @@ void core_info_set_config_path(const char *config_path)
core_info_list_t *core_info_list_get(void) core_info_list_t *core_info_list_get(void)
{ {
if (!global_core_list)
RARCH_WARN("core_info_list_get() called before core_info_set_core_path()");
return global_core_list; return global_core_list;
} }

2
frontend/info/core_info.h
View File

@ -86,7 +86,7 @@ const char *core_info_list_get_all_extensions(core_info_list_t *list);
bool core_info_list_get_display_name(core_info_list_t *list, 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_core_path(void);
void core_info_set_config_path(const char *config_path); void core_info_set_config_path(const char *config_path);
core_info_list_t *core_info_list_get(void); core_info_list_t *core_info_list_get(void);