From 1e044f38adc94c1be4365641c8fe57d793188a60 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 27 Jan 2016 08:21:41 +0100
Subject: [PATCH] Move RARCH_CTL_INIT_SYSTEM_AV_INFO to libretro_version_1.c

---
 command_event.c      | 5 +++--
 libretro_version_1.c | 3 +++
 libretro_version_1.h | 7 ++++++-
 retroarch.c          | 5 -----
 retroarch.h          | 6 ------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/command_event.c b/command_event.c
index 88717e046a..d85543bb89 100644
--- a/command_event.c
+++ b/command_event.c
@@ -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;
 }
diff --git a/libretro_version_1.c b/libretro_version_1.c
index de9a69e817..2798dad45e 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -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);
diff --git a/libretro_version_1.h b/libretro_version_1.h
index c668354c90..01bcefb20a 100644
--- a/libretro_version_1.h
+++ b/libretro_version_1.h
@@ -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
diff --git a/retroarch.c b/retroarch.c
index dbc50f74a0..e5450cf8ed 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -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:
diff --git a/retroarch.h b/retroarch.h
index 90fc2d4ad6..c2d282768e 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -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,