ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(command_event.c) Start going through rarch_system_info_get_ptr

This commit is contained in:
twinaphex 2015-06-25 12:45:23 +02:00
parent 42fcb4490c
commit 059a772e87
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
command_event.c
View File

@ -211,10 +211,11 @@ static void event_disk_control_set_eject(bool new_state, bool print_log)
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
bool error = false; bool error = false;
rarch_system_info_t *info = rarch_system_info_get_ptr();
const struct retro_disk_control_callback *control = const struct retro_disk_control_callback *control =
(const struct retro_disk_control_callback*)&global->system.disk_control; info ? (const struct retro_disk_control_callback*)&info->disk_control : NULL;
if (!control->get_num_images) if (!control || !control->get_num_images)
return; return;
*msg = '\0'; *msg = '\0';
@ -251,11 +252,16 @@ static void event_disk_control_set_eject(bool new_state, bool print_log)
void event_disk_control_append_image(const char *path) void event_disk_control_append_image(const char *path)
{ {
unsigned new_idx; unsigned new_idx;
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
struct retro_game_info info = {0}; struct retro_game_info info = {0};
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
rarch_system_info_t *sysinfo = rarch_system_info_get_ptr();
const struct retro_disk_control_callback *control = const struct retro_disk_control_callback *control =
(const struct retro_disk_control_callback*)&global->system.disk_control; sysinfo ? (const struct retro_disk_control_callback*)&sysinfo->disk_control
: NULL;
if (!control)
return;
event_disk_control_set_eject(true, false); event_disk_control_set_eject(true, false);
@ -315,11 +321,12 @@ static void event_disk_control_set_index(unsigned idx)
unsigned num_disks; unsigned num_disks;
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
rarch_system_info_t *info = rarch_system_info_get_ptr();
const struct retro_disk_control_callback *control = const struct retro_disk_control_callback *control =
(const struct retro_disk_control_callback*)&global->system.disk_control; info ? (const struct retro_disk_control_callback*)&info->disk_control : NULL;
bool error = false; bool error = false;
if (!control->get_num_images) if (!control || !control->get_num_images)
return; return;
*msg = '\0'; *msg = '\0';
@ -441,10 +448,11 @@ static void event_init_controllers(void)
const char *ident = NULL; const char *ident = NULL;
const struct retro_controller_description *desc = NULL; const struct retro_controller_description *desc = NULL;
unsigned device = settings->input.libretro_device[i]; unsigned device = settings->input.libretro_device[i];
rarch_system_info_t *info = rarch_system_info_get_ptr();
if (i < global->system.num_ports) if (i < info->num_ports)
desc = libretro_find_controller_description( desc = libretro_find_controller_description(
&global->system.ports[i], device); &info->ports[i], device);
if (desc) if (desc)
ident = desc->desc; ident = desc->desc;