Move RARCH_CTL_INIT_SYSTEM_AV_INFO to libretro_version_1.c

This commit is contained in:
twinaphex 2016-01-27 08:21:41 +01:00
parent 6a7b2aed5c
commit 1e044f38ad
5 changed files with 12 additions and 14 deletions

View File

@ -602,8 +602,9 @@ static bool event_init_core(void)
return false;
core.poll_type = settings->input.poll_type_behavior;
core_ctl(CORE_CTL_INIT, NULL);
rarch_ctl(RARCH_CTL_INIT_SYSTEM_AV_INFO, NULL);
if (!core_ctl(CORE_CTL_INIT, NULL))
return false;
return true;
}

View File

@ -264,6 +264,9 @@ bool core_ctl(enum core_ctl_state state, void *data)
return false;
if (!retro_init_libretro_cbs(&retro_ctx))
return false;
core_ctl(CORE_CTL_RETRO_GET_SYSTEM_AV_INFO,
video_viewport_get_system_av_info());
runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
break;
case CORE_CTL_DEINIT:
return retro_uninit_libretro_cbs(&retro_ctx);

View File

@ -80,7 +80,12 @@ enum core_ctl_state
* TODO - when libretro v2 gets added, allow for switching
* between libretro version backend dynamically.
*/
CORE_CTL_VERIFY_API_VERSION
CORE_CTL_VERIFY_API_VERSION,
/**
* Initialize system A/V information.
**/
CORE_CTL_INIT_SYSTEM_AV_INFO
};
typedef struct retro_ctx_serialize_info

View File

@ -1309,11 +1309,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
switch(state)
{
case RARCH_CTL_INIT_SYSTEM_AV_INFO:
core_ctl(CORE_CTL_RETRO_GET_SYSTEM_AV_INFO,
video_viewport_get_system_av_info());
runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
break;
case RARCH_CTL_IS_PLAIN_CORE:
return (current_core_type == CORE_TYPE_PLAIN);
case RARCH_CTL_IS_DUMMY_CORE:

View File

@ -100,12 +100,6 @@ enum rarch_ctl_state
* but this will do for now. */
RARCH_CTL_VALIDATE_CPU_FEATURES,
/**
* Initialize system A/V information by calling the libretro core's
* get_system_av_info function.
**/
RARCH_CTL_INIT_SYSTEM_AV_INFO,
RARCH_CTL_FILL_PATHNAMES,
RARCH_CTL_SET_PATHS_REDIRECT,