Merge pull request #78 from bugfood/improve-startup

Improve input-sdl startup time.
mupen64plus · Jan 29, 2019 · 25c8ffc · 25c8ffc
2 parents 2320005 + 097fc83
commit 25c8ffc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 44 deletions.
diff --git a/src/config.c b/src/config.c
@@ -121,15 +121,6 @@ static const char * get_sdl_joystick_name(int iCtrlIdx)
 {
     static char JoyName[256];
     const char *joySDLName;
-    int joyWasInit = SDL_WasInit(SDL_INIT_JOYSTICK);
-
-    /* initialize the joystick subsystem if necessary */
-    if (!joyWasInit)
-        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
-        {
-            DebugMessage(M64MSG_ERROR, "Couldn't init SDL joystick subsystem: %s", SDL_GetError() );
-            return NULL;
-        }
 
     /* get the name of the corresponding joystick */
     joySDLName = SDL_JoystickName(iCtrlIdx);
@@ -141,40 +132,13 @@ static const char * get_sdl_joystick_name(int iCtrlIdx)
         JoyName[255] = 0;
     }
 
-    /* quit the joystick subsystem if necessary */
-    if (!joyWasInit)
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-
     /* if the SDL function had an error, then return NULL, otherwise return local copy of joystick name */
     if (joySDLName == NULL)
         return NULL;
     else
         return JoyName;
 }
 
-static int get_sdl_num_joysticks(void)
-{
-    int numJoysticks = 0;
-    int joyWasInit = SDL_WasInit(SDL_INIT_JOYSTICK);
-
-    /* initialize the joystick subsystem if necessary */
-    if (!joyWasInit)
-        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
-        {
-            DebugMessage(M64MSG_ERROR, "Couldn't init SDL joystick subsystem: %s", SDL_GetError() );
-            return 0;
-        }
-
-    /* get thenumber of joysticks */
-    numJoysticks = SDL_NumJoysticks();
-
-    /* quit the joystick subsystem if necessary */
-    if (!joyWasInit)
-        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-
-    return numJoysticks;
-}
-
 /////////////////////////////////////
 // load_controller_config()
 // return value: 1 = OK
@@ -540,7 +504,7 @@ void load_configuration(int bPreConfig)
     int ControlDevice[4];
     char DeviceName[4][256];
     int ActiveControllers = 0;
-    int sdlNumJoysticks = get_sdl_num_joysticks();
+    int sdlNumJoysticks = SDL_NumJoysticks();
     float fVersion = 0.0f;
     const char *sdl_name;
     int ControllersFound = 0;

diff --git a/src/plugin.c b/src/plugin.c
@@ -141,6 +141,7 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
     ptr_CoreGetAPIVersions CoreAPIVersionFunc;
 
     int i, ConfigAPIVersion, DebugAPIVersion, VidextAPIVersion;
+    int joyWasInit;
 
     if (l_PluginInit)
         return M64ERR_ALREADY_INIT;
@@ -206,9 +207,22 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
     for (i = 0; i < 4; i++)
         controller[i].control = temp_core_controlinfo + i;
 
+    /* initialize the joystick subsystem if necessary */
+    joyWasInit = SDL_WasInit(SDL_INIT_JOYSTICK);
+    if (!joyWasInit)
+        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
+        {
+            DebugMessage(M64MSG_ERROR, "Couldn't init SDL joystick subsystem: %s", SDL_GetError() );
+            return M64ERR_SYSTEM_FAIL;
+        }
+
     /* read plugin config from core config database, auto-config if necessary and update core database */
     load_configuration(1);
 
+    /* quit the joystick subsystem if necessary */
+    if (!joyWasInit)
+        SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+
     l_PluginInit = 1;
     return M64ERR_SUCCESS;
 }
@@ -715,13 +729,6 @@ EXPORT void CALL GetKeys( int Control, BUTTONS *Keys )
 
 static void InitiateJoysticks(int cntrl)
 {
-    // init SDL joystick subsystem
-    if (!SDL_WasInit(SDL_INIT_JOYSTICK))
-        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) {
-            DebugMessage(M64MSG_ERROR, "Couldn't init SDL joystick subsystem: %s", SDL_GetError() );
-            return;
-        }
-
     if (controller[cntrl].device >= 0) {
         controller[cntrl].joystick = SDL_JoystickOpen(controller[cntrl].device);
         if (!controller[cntrl].joystick)
@@ -910,6 +917,14 @@ EXPORT void CALL InitiateControllers(CONTROL_INFO ControlInfo)
     for (i = 0; i < 4; i++)
         controller[i].control = ControlInfo.Controls + i;
 
+    /* initialize the joystick subsystem if necessary (and leave it initialized) */
+    if (! SDL_WasInit(SDL_INIT_JOYSTICK))
+        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
+        {
+            DebugMessage(M64MSG_ERROR, "Couldn't init SDL joystick subsystem: %s", SDL_GetError() );
+            return;
+        }
+
     // read configuration
     load_configuration(0);