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

Turn corrent_core_type into static variable

Browse Source
This commit is contained in:
twinaphex 2016-01-20 03:15:50 +01:00
parent 3190d8aba2
commit 6c5b2ff0b5
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroarch.c
View File

@ -100,6 +100,7 @@ enum
RA_OPT_MAX_FRAMES RA_OPT_MAX_FRAMES
}; };
static enum rarch_core_type current_core_type;
static char current_savefile_dir[PATH_MAX_LENGTH]; static char current_savefile_dir[PATH_MAX_LENGTH];
static char error_string[PATH_MAX_LENGTH]; static char error_string[PATH_MAX_LENGTH];
@ -619,7 +620,7 @@ static void parse_input(int argc, char *argv[])
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
global->inited.core.type = CORE_TYPE_PLAIN; current_core_type = CORE_TYPE_PLAIN;
*global->subsystem = '\0'; *global->subsystem = '\0';
global->has_set.save_path = false; global->has_set.save_path = false;
global->has_set.state_path = false; global->has_set.state_path = false;
@ -647,7 +648,7 @@ static void parse_input(int argc, char *argv[])
if (argc < 2) if (argc < 2)
{ {
global->inited.core.type = CORE_TYPE_DUMMY; current_core_type = CORE_TYPE_DUMMY;
return; return;
} }
@ -862,7 +863,7 @@ static void parse_input(int argc, char *argv[])
break; break;
case RA_OPT_MENU: case RA_OPT_MENU:
global->inited.core.type = CORE_TYPE_DUMMY; current_core_type = CORE_TYPE_DUMMY;
break; break;
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
@ -1159,7 +1160,7 @@ int rarch_main_init(int argc, char *argv[])
{ {
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
global->has_set.libretro = false; global->has_set.libretro = false;
global->inited.core.type = CORE_TYPE_FFMPEG; current_core_type = CORE_TYPE_FFMPEG;
#endif #endif
} }
break; break;
@ -1168,7 +1169,7 @@ int rarch_main_init(int argc, char *argv[])
if (settings->multimedia.builtin_imageviewer_enable) if (settings->multimedia.builtin_imageviewer_enable)
{ {
global->has_set.libretro = false; global->has_set.libretro = false;
global->inited.core.type = CORE_TYPE_IMAGEVIEWER; current_core_type = CORE_TYPE_IMAGEVIEWER;
} }
break; break;
#endif #endif
@ -1178,7 +1179,7 @@ int rarch_main_init(int argc, char *argv[])
} }
} }
init_libretro_sym(global->inited.core.type); init_libretro_sym(current_core_type);
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL);
driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL); driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL);
@ -1294,9 +1295,9 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
switch(state) switch(state)
{ {
case RARCH_CTL_IS_PLAIN_CORE: case RARCH_CTL_IS_PLAIN_CORE:
return (global->inited.core.type == CORE_TYPE_PLAIN); return (current_core_type == CORE_TYPE_PLAIN);
case RARCH_CTL_IS_DUMMY_CORE: case RARCH_CTL_IS_DUMMY_CORE:
return (global->inited.core.type == CORE_TYPE_DUMMY); return (current_core_type == CORE_TYPE_DUMMY);
case RARCH_CTL_IS_INITED: case RARCH_CTL_IS_INITED:
return rarch_is_inited; return rarch_is_inited;
case RARCH_CTL_UNSET_INITED: case RARCH_CTL_UNSET_INITED:

8
runloop.h
View File

@ -282,14 +282,6 @@ typedef struct global
bool softfilter_enable; bool softfilter_enable;
} console; } console;
struct
{
struct
{
enum rarch_core_type type;
} core;
} inited;
retro_keyboard_event_t frontend_key_event; retro_keyboard_event_t frontend_key_event;
} global_t; } global_t;