connected device name list

briaguya-ai · Jan 19, 2025 · ab9ca34 · ab9ca34
1 parent 5dba443
commit ab9ca34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/controller/physicaldevice/ConnectedPhysicalDeviceManager.cpp b/src/controller/physicaldevice/ConnectedPhysicalDeviceManager.cpp
@@ -13,6 +13,10 @@ ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadsForPort(uint8_t portIndex
     return mConnectedSDLGamepads;
 }
 
+std::vector<std::string> ConnectedPhysicalDeviceManager::GetConnectedSDLGamepadNames() {
+    return mConnectedSDLGamepadNames;
+}
+
 void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex) {
     RefreshConnectedSDLGamepads();
 }
@@ -23,6 +27,7 @@ void ConnectedPhysicalDeviceManager::HandlePhysicalDeviceDisconnect(int32_t sdlJ
 
 void ConnectedPhysicalDeviceManager::RefreshConnectedSDLGamepads() {
     mConnectedSDLGamepads.clear();
+    mConnectedSDLGamepadNames.clear();
     for (int32_t i = 0; i < SDL_NumJoysticks(); i++) {
         // skip if this SDL joystick isn't a Gamepad
         if (!SDL_IsGameController(i)) {
@@ -31,8 +36,10 @@ void ConnectedPhysicalDeviceManager::RefreshConnectedSDLGamepads() {
 
         auto gamepad = SDL_GameControllerOpen(i);
         auto instanceId = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gamepad));
+        auto name = SDL_GameControllerName(gamepad);
 
         mConnectedSDLGamepads[instanceId] = gamepad;
+        mConnectedSDLGamepadNames.push_back(name);
     }
 }
 } // namespace Ship
diff --git a/src/controller/physicaldevice/ConnectedPhysicalDeviceManager.h b/src/controller/physicaldevice/ConnectedPhysicalDeviceManager.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <unordered_map>
+#include <vector>
+#include <string>
 #include <SDL2/SDL.h>
 
 namespace Ship {
@@ -11,12 +13,14 @@ class ConnectedPhysicalDeviceManager {
     ~ConnectedPhysicalDeviceManager();
 
     std::unordered_map<int32_t, SDL_GameController*> GetConnectedSDLGamepadsForPort(uint8_t portIndex);
+    std::vector<std::string> GetConnectedSDLGamepadNames();
 
     void HandlePhysicalDeviceConnect(int32_t sdlDeviceIndex);
     void HandlePhysicalDeviceDisconnect(int32_t sdlJoystickInstanceId);
     void RefreshConnectedSDLGamepads();
 
   private:
     std::unordered_map<int32_t, SDL_GameController*> mConnectedSDLGamepads;
+    std::vector<std::string> mConnectedSDLGamepadNames;
 };
 } // namespace Ship