sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FrontendCommon: Use SDL_InitSubSystem() for lazy initialization

Browse Source
This commit is contained in:
Connor McLaughlin
2020-02-16 00:15:05 +09:00
parent 78a6666439
commit 06f4d72631
10 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend-common/sdl_controller_interface.cpp
View File

@ -4,6 +4,7 @@
#include "core/controller.h"
#include "core/host_interface.h"
#include "core/system.h"
#include "sdl_initializer.h"
#include <SDL.h>
Log_SetChannel(SDLControllerInterface);
@ -16,19 +17,19 @@ SDLControllerInterface::~SDLControllerInterface()
Assert(m_controllers.empty());
}
bool SDLControllerInterface::Initialize(HostInterface* host_interface, bool init_sdl)
bool SDLControllerInterface::Initialize(HostInterface* host_interface)
{
if (init_sdl)
FrontendCommon::EnsureSDLInitialized();
if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0)
{
if (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0)
{
Log_ErrorPrintf("SDL_Init() failed");
return false;
}
Log_ErrorPrintf("SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) failed");
return false;
}
// we should open the controllers as the connected events come in, so no need to do any more here
m_host_interface = host_interface;
m_initialized = true;
return true;
}
@ -37,10 +38,10 @@ void SDLControllerInterface::Shutdown()
while (!m_controllers.empty())
CloseGameController(m_controllers.begin()->first);
if (m_sdl_initialized_by_us)
if (m_initialized)
{
SDL_Quit();
m_sdl_initialized_by_us = false;
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC);
m_initialized = false;
}
m_host_interface = nullptr;