Use consistent namespace for core_list.
This commit is contained in:
parent
2f4712d4b0
commit
a470ae0d04
|
@ -26,7 +26,7 @@ NSArray* apple_get_modules()
|
||||||
{
|
{
|
||||||
if (!moduleList)
|
if (!moduleList)
|
||||||
{
|
{
|
||||||
coreList = get_core_info_list(apple_platform.coreDirectory.UTF8String);
|
coreList = core_info_list_new(apple_platform.coreDirectory.UTF8String);
|
||||||
|
|
||||||
if (!coreList)
|
if (!coreList)
|
||||||
return nil;
|
return nil;
|
||||||
|
|
|
@ -87,7 +87,7 @@ RetroArch::RetroArch()
|
||||||
//Get core DropDown reference to populate it in C++
|
//Get core DropDown reference to populate it in C++
|
||||||
coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
|
coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
|
||||||
connect(coreSelection, SIGNAL(selectedValueChanged(QVariant)), this, SLOT(onCoreSelected(QVariant)));
|
connect(coreSelection, SIGNAL(selectedValueChanged(QVariant)), this, SLOT(onCoreSelected(QVariant)));
|
||||||
core_info_list = get_core_info_list(g_settings.libretro);
|
core_info_list = core_info_list_new(g_settings.libretro);
|
||||||
populateCores(core_info_list);
|
populateCores(core_info_list);
|
||||||
|
|
||||||
Application::instance()->setScene(mAppPane);
|
Application::instance()->setScene(mAppPane);
|
||||||
|
@ -112,7 +112,7 @@ RetroArch::RetroArch()
|
||||||
|
|
||||||
RetroArch::~RetroArch()
|
RetroArch::~RetroArch()
|
||||||
{
|
{
|
||||||
free_core_info_list(core_info_list);
|
core_info_list_free(core_info_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RetroArch::aboutToQuit()
|
void RetroArch::aboutToQuit()
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "file_ext.h"
|
#include "file_ext.h"
|
||||||
#include "config.def.h"
|
#include "config.def.h"
|
||||||
|
|
||||||
core_info_list_t *get_core_info_list(const char *modules_path)
|
core_info_list_t *core_info_list_new(const char *modules_path)
|
||||||
{
|
{
|
||||||
struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
|
struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
|
||||||
|
|
||||||
|
@ -84,11 +84,11 @@ core_info_list_t *get_core_info_list(const char *modules_path)
|
||||||
error:
|
error:
|
||||||
if (contents)
|
if (contents)
|
||||||
dir_list_free(contents);
|
dir_list_free(contents);
|
||||||
free_core_info_list(core_info_list);
|
core_info_list_free(core_info_list);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_core_info_list(core_info_list_t *core_info_list)
|
void core_info_list_free(core_info_list_t *core_info_list)
|
||||||
{
|
{
|
||||||
if (!core_info_list)
|
if (!core_info_list)
|
||||||
return;
|
return;
|
||||||
|
@ -106,7 +106,7 @@ void free_core_info_list(core_info_list_t *core_info_list)
|
||||||
free(core_info_list);
|
free(core_info_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool does_core_support_file(core_info_t *core, const char *path)
|
bool core_info_list_does_support_file(core_info_t *core, const char *path)
|
||||||
{
|
{
|
||||||
if (!path || !core || !core->supported_extensions_list)
|
if (!path || !core || !core->supported_extensions_list)
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -37,10 +37,10 @@ typedef struct {
|
||||||
size_t count;
|
size_t count;
|
||||||
} core_info_list_t;
|
} core_info_list_t;
|
||||||
|
|
||||||
core_info_list_t *get_core_info_list(const char *modules_path);
|
core_info_list_t *core_info_list_new(const char *modules_path);
|
||||||
void free_core_info_list(core_info_list_t *core_info_list);
|
void core_info_list_free(core_info_list_t *core_info_list);
|
||||||
|
|
||||||
bool does_core_support_file(core_info_t *core, const char *path);
|
bool core_info_list_does_support_file(core_info_t *core, const char *path);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue