diff options
| author | Mat M <mathew1800@gmail.com> | 2017-02-10 13:50:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 13:50:33 -0500 |
| commit | f6d364e37b35c7743d64cade8e7367457b372dfc (patch) | |
| tree | 584416b87bbc0589a8541cf2236dfc960c052664 /Source/Core/InputCommon/InputConfig.h | |
| parent | 8f81051df3df66a9647dbaeab8273dba7127a5c7 (diff) | |
| parent | 6a75ea5653ec596b1a08e985e98fca0b05ccd6f7 (diff) | |
Merge pull request #4873 from lioncash/controller-emu
ControllerEmu: Separate ControlGroup from ControllerEmu
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.h')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index 27cc70198e..fcbd8a59f9 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -9,16 +9,18 @@ #include <utility> #include <vector> -class ControllerEmu; +namespace ControllerEmu +{ +class EmulatedController; +} class InputConfig { public: InputConfig(const std::string& ini_name, const std::string& gui_name, - const std::string& profile_name) - : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_name(profile_name) - { - } + const std::string& profile_name); + + ~InputConfig(); bool LoadConfig(bool isGC); void SaveConfig(); @@ -29,7 +31,7 @@ public: m_controllers.emplace_back(std::make_unique<T>(std::forward<Args>(args)...)); } - ControllerEmu* GetController(int index); + ControllerEmu::EmulatedController* GetController(int index); void ClearControllers(); bool ControllersNeedToBeCreated() const; bool IsControllerControlledByGamepadDevice(int index) const; @@ -37,7 +39,7 @@ public: std::string GetGUIName() const { return m_gui_name; } std::string GetProfileName() const { return m_profile_name; } private: - std::vector<std::unique_ptr<ControllerEmu>> m_controllers; + std::vector<std::unique_ptr<ControllerEmu::EmulatedController>> m_controllers; const std::string m_ini_name; const std::string m_gui_name; const std::string m_profile_name; |
