From 099dde82a24046802b018f63b2d22fd490e47b4d Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Wed, 11 Dec 2024 23:06:20 +0000
Subject: [PATCH] hid: clean-up

---
 UnleashedRecomp/hid/driver/sdl_hid.cpp | 90 +++++++++++++-------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/UnleashedRecomp/hid/driver/sdl_hid.cpp b/UnleashedRecomp/hid/driver/sdl_hid.cpp
index 084d50f..f7c142d 100644
--- a/UnleashedRecomp/hid/driver/sdl_hid.cpp
+++ b/UnleashedRecomp/hid/driver/sdl_hid.cpp
@@ -169,6 +169,52 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
 {
     switch (event->type)
     {
+        case SDL_CONTROLLERDEVICEADDED:
+        {
+            const auto freeIndex = FindFreeController();
+
+            if (freeIndex != -1)
+                g_controllers[freeIndex] = Controller(event->cdevice.which);
+
+            break;
+        }
+
+        case SDL_CONTROLLERDEVICEREMOVED:
+        {
+            auto* controller = FindController(event->cdevice.which);
+
+            if (controller)
+                controller->Close();
+
+            break;
+        }
+
+        case SDL_CONTROLLERBUTTONDOWN:
+        case SDL_CONTROLLERBUTTONUP:
+        case SDL_CONTROLLERAXISMOTION:
+        {
+            auto* controller = FindController(event->cdevice.which);
+
+            if (controller)
+            {
+                if (event->type == SDL_CONTROLLERAXISMOTION)
+                {
+                    if (abs(event->caxis.value) > 8000)
+                        SetControllerInputDevice(controller);
+
+                    controller->PollAxis();
+                }
+                else
+                {
+                    SetControllerInputDevice(controller);
+
+                    controller->Poll();
+                }
+            }
+
+            break;
+        }
+
         case SDL_KEYDOWN:
         case SDL_KEYUP:
             hid::detail::g_inputDevice = hid::detail::EInputDevice::Keyboard;
@@ -191,50 +237,6 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
 
             break;
         }
-
-        default:
-        {
-            if (event->type >= SDL_CONTROLLERAXISMOTION && event->type < SDL_FINGERDOWN)
-            {
-                if (event->type == SDL_CONTROLLERDEVICEADDED)
-                {
-                    const auto freeIndex = FindFreeController();
-
-                    if (freeIndex != -1)
-                        g_controllers[freeIndex] = Controller(event->cdevice.which);
-                }
-                if (event->type == SDL_CONTROLLERDEVICEREMOVED)
-                {
-                    auto* controller = FindController(event->cdevice.which);
-
-                    if (controller)
-                        controller->Close();
-                }
-                else if (event->type == SDL_CONTROLLERBUTTONDOWN || event->type == SDL_CONTROLLERBUTTONUP || event->type == SDL_CONTROLLERAXISMOTION)
-                {
-                    auto* controller = FindController(event->cdevice.which);
-
-                    if (controller)
-                    {
-                        if (event->type == SDL_CONTROLLERAXISMOTION)
-                        {
-                            if (abs(event->caxis.value) > 8000)
-                                SetControllerInputDevice(controller);
-
-                            controller->PollAxis();
-                        }
-                        else
-                        {
-                            SetControllerInputDevice(controller);
-
-                            controller->Poll();
-                        }
-                    }
-                }
-            }
-
-            break;
-        }
     }
 
     return 0;