UI: have the controller input load on different controllers

Author: N3xoX1

src/nxemu/user_interface/sciter_main_window.cpp

@@ -662,9 +662,9 @@ void SciterMainWindow::SettingChanged(const char * setting, void * userData)
     }
 }
 
-bool SciterMainWindow::OnTimer(SCITER_ELEMENT /*Element*/, uint32_t* TimerId)
+bool SciterMainWindow::OnTimer(SCITER_ELEMENT /*element*/, uint32_t * timerId)
 {
-    if (TimerId == (uint32_t*)TIMER_UPDATE_INPUT)
+    if (timerId == (uint32_t*)TIMER_UPDATE_INPUT)
     {
         UpdateInputDrivers();
     }

src/nxemu/user_interface/settings/input_config.cpp

@@ -6,7 +6,17 @@
 InputConfig::InputConfig(ISciterUI & SciterUI) :
     m_sciterUI(SciterUI),
     m_window(nullptr),
-    m_inputDeviceList(nullptr)
+    m_inputDeviceList(nullptr),
+    m_playerMap({ 
+        {"Player1", {0, NpadIdType::Player1}},
+        {"Player2", {1, NpadIdType::Player2}},
+        {"Player3", {2, NpadIdType::Player3}},
+        {"Player4", {3, NpadIdType::Player4}},
+        {"Player5", {4, NpadIdType::Player5}},
+        {"Player6", {5, NpadIdType::Player6}},
+        {"Player7", {6, NpadIdType::Player7}},
+        {"Player8", {7, NpadIdType::Player8}}, 
+    })
 {
     SwitchSystem * system = SwitchSystem::GetInstance();
     if (system != nullptr)
@@ -68,9 +78,10 @@ bool InputConfig::PageNavChangeTo(const std::string & /*pageName*/, SCITER_ELEME
 
 void InputConfig::PageNavCreatedPage(const std::string & pageName, SCITER_ELEMENT page)
 {
-    if (pageName == "Player1")
+    PlayerInfo::const_iterator itr = m_playerMap.find(pageName);
+    if (itr != m_playerMap.end())
     {
-        m_playerConfig[0].reset(new InputConfigPlayer(m_sciterUI, *this, m_window->GetHandle(), page, NpadIdType::Player1));
+        m_playerConfig[itr->second.first].reset(new InputConfigPlayer(m_sciterUI, *this, m_window->GetHandle(), page, itr->second.second));
     }
 }
 

src/nxemu/user_interface/settings/input_config.h

@@ -2,16 +2,21 @@
 #include <sciter_handler.h>
 #include <widgets/page_nav.h>
 #include <memory>
+#include <unordered_map>
 
 __interface ISciterUI;
 __interface ISciterWindow;
 __interface IParamPackageList;
 class InputConfigPlayer;
 
+enum class NpadIdType : uint32_t;
+
 class InputConfig :
     public IPagesSink,
     public IClickSink
 {
+    typedef std::unordered_map<std::string, std::pair<size_t, NpadIdType>> PlayerInfo;
+
 public:
     InputConfig(ISciterUI & SciterUI);
     ~InputConfig();
@@ -39,4 +44,5 @@ class InputConfig :
     std::shared_ptr<IPageNav> m_pageNav;
     std::unique_ptr<InputConfigPlayer> m_playerConfig[8];
     IParamPackageList * m_inputDeviceList;
+    const PlayerInfo m_playerMap;
 };