From ba0dbeac80659a09da19d0373ce2b86b3ba3ffb1 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 1 Nov 2016 13:36:20 -0700
Subject: [PATCH] Add InputManager::getSubdeviceNames

---
 libraries/plugins/src/plugins/InputPlugin.h | 3 +++
 plugins/hifiSdl2/src/SDL2Manager.cpp        | 8 +++++++-
 plugins/hifiSdl2/src/SDL2Manager.h          | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libraries/plugins/src/plugins/InputPlugin.h b/libraries/plugins/src/plugins/InputPlugin.h
index f68be3edf6..0db0b24420 100644
--- a/libraries/plugins/src/plugins/InputPlugin.h
+++ b/libraries/plugins/src/plugins/InputPlugin.h
@@ -21,6 +21,9 @@ public:
     virtual void pluginFocusOutEvent() = 0;
     virtual void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) = 0;
 
+    // Some input plugins are comprised of multiple subdevices (SDL2, for instance).
+    // If an input plugin is only a single device, it will only return it's primary name.
+    virtual QStringList getSubdeviceNames() { return { getName() }; };
     virtual bool isHandController() const = 0;
 };
 
diff --git a/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp
index b9a19658e2..91a693cc09 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.cpp
+++ b/plugins/hifiSdl2/src/SDL2Manager.cpp
@@ -65,8 +65,10 @@ void SDL2Manager::init() {
                     _openJoysticks[id] = joystick;
                     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
                     userInputMapper->registerDevice(joystick);
+                    auto name = SDL_GameControllerName(controller);
+                    _subdeviceNames << name;
                     emit joystickAdded(joystick.get());
-                    emit subdeviceConnected(getName(), SDL_GameControllerName(controller));
+                    emit subdeviceConnected(getName(), name);
                 }
             }
         }
@@ -78,6 +80,10 @@ void SDL2Manager::init() {
     }
 }
 
+QStringList SDL2Manager::getSubdeviceNames() {
+    return _subdeviceNames;
+}
+
 void SDL2Manager::deinit() {
     _openJoysticks.clear();
 
diff --git a/plugins/hifiSdl2/src/SDL2Manager.h b/plugins/hifiSdl2/src/SDL2Manager.h
index 44b75abd2f..fc1654bce1 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.h
+++ b/plugins/hifiSdl2/src/SDL2Manager.h
@@ -26,6 +26,7 @@ public:
     bool isSupported() const override;
     const QString& getName() const override { return NAME; }
 
+    QStringList getSubdeviceNames() override;
     bool isHandController() const override { return false; }
 
     void init() override;
@@ -79,6 +80,7 @@ private:
     QMap<SDL_JoystickID, Joystick::Pointer> _openJoysticks;
     bool _isInitialized { false } ;
     static const QString NAME;
+    QStringList _subdeviceNames;
 };
 
 #endif // hifi__SDL2Manager_h