history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 13:15:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce ControllerInterface class, port SDL interface over

Browse Source 
This breaks controller support in the SDL frontend until it's ported
over to the common interface.
This commit is contained in:
Connor McLaughlin
2020-03-22 00:49:46 +10:00
parent 6ce97e0e13
commit 29a09a3685
14 changed files with 447 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/duckstation-sdl/sdl_host_interface.cpp
View File

@ -32,7 +32,6 @@ SDLHostInterface::SDLHostInterface()
SDLHostInterface::~SDLHostInterface()
{
g_sdl_controller_interface.Shutdown();
if (m_display)
{
DestroyDisplay();
@ -232,7 +231,6 @@ void SDLHostInterface::OnSystemCreated()
HostInterface::OnSystemCreated();
UpdateKeyboardControllerMapping();
g_sdl_controller_interface.SetDefaultBindings();
ClearImGuiFocus();
}
@ -254,7 +252,6 @@ void SDLHostInterface::OnControllerTypeChanged(u32 slot)
HostInterface::OnControllerTypeChanged(slot);
UpdateKeyboardControllerMapping();
g_sdl_controller_interface.SetDefaultBindings();
}
void SDLHostInterface::RunLater(std::function<void()> callback)
@ -309,12 +306,6 @@ std::unique_ptr<SDLHostInterface> SDLHostInterface::Create()
return nullptr;
}
if (!g_sdl_controller_interface.Initialize(intf.get()))
{
Log_ErrorPrintf("Failed to initialize controller interface.");
return nullptr;
}
intf->CreateImGuiContext();
if (!intf->CreateDisplay())
{
@ -365,7 +356,7 @@ bool SDLHostInterface::ConfirmMessage(const char* message)
void SDLHostInterface::HandleSDLEvent(const SDL_Event* event)
{
ImGui_ImplSDL2_ProcessEvent(event);
g_sdl_controller_interface.ProcessSDLEvent(event);
//g_sdl_controller_interface.ProcessSDLEvent(event);
switch (event->type)
{
@ -397,7 +388,7 @@ void SDLHostInterface::HandleSDLEvent(const SDL_Event* event)
case SDL_CONTROLLERDEVICEADDED:
case SDL_CONTROLLERDEVICEREMOVED:
g_sdl_controller_interface.SetDefaultBindings();
//g_sdl_controller_interface.SetDefaultBindings();
break;
case SDL_CONTROLLERBUTTONDOWN:
@ -1435,7 +1426,7 @@ void SDLHostInterface::Run()
}
}
g_sdl_controller_interface.UpdateControllerRumble();
//g_sdl_controller_interface.UpdateControllerRumble();
// rendering
{

3
src/duckstation-sdl/sdl_host_interface.h
View File

@ -3,6 +3,7 @@
#include "common/gl/texture.h"
#include "core/host_display.h"
#include "core/host_interface.h"
#include "frontend-common/sdl_controller_interface.h"
#include <SDL.h>
#include <array>
#include <deque>
@ -121,7 +122,7 @@ private:
std::unique_ptr<HostDisplayTexture> m_app_icon_texture;
KeyboardControllerActionMap m_keyboard_button_mapping;
u32 m_run_later_event_id = 0;
bool m_fullscreen = false;