From dd7a3cb30b0d67ddf69a55ff83512a41424b4396 Mon Sep 17 00:00:00 2001 From: Mario Liebisch Date: Tue, 15 Apr 2014 18:16:42 +0200 Subject: [PATCH] Fixed missing JoystickImpl member on Android --- src/SFML/Window/Android/JoystickImpl.cpp | 7 +++++++ src/SFML/Window/Android/JoystickImpl.hpp | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/SFML/Window/Android/JoystickImpl.cpp b/src/SFML/Window/Android/JoystickImpl.cpp index a6fac37b7..58dfc829c 100644 --- a/src/SFML/Window/Android/JoystickImpl.cpp +++ b/src/SFML/Window/Android/JoystickImpl.cpp @@ -78,6 +78,13 @@ JoystickCaps JoystickImpl::getCapabilities() const } +//////////////////////////////////////////////////////////// +Joystick::Identification JoystickImpl::getIdentification() const +{ + return m_identification; +} + + //////////////////////////////////////////////////////////// JoystickState JoystickImpl::update() { diff --git a/src/SFML/Window/Android/JoystickImpl.hpp b/src/SFML/Window/Android/JoystickImpl.hpp index 36972c5ad..82d3c3756 100644 --- a/src/SFML/Window/Android/JoystickImpl.hpp +++ b/src/SFML/Window/Android/JoystickImpl.hpp @@ -84,6 +84,14 @@ public : //////////////////////////////////////////////////////////// JoystickCaps getCapabilities() const; + //////////////////////////////////////////////////////////// + /// \brief Get the joystick identification + /// + /// \return Joystick identification + /// + //////////////////////////////////////////////////////////// + Joystick::Identification getIdentification() const; + //////////////////////////////////////////////////////////// /// \brief Update the joystick and get its new state /// @@ -97,7 +105,8 @@ private : //////////////////////////////////////////////////////////// // Member data //////////////////////////////////////////////////////////// - int m_index; ///< Index of the joystick + int m_index; ///< Index of the joystick + Joystick::Identification m_identification; ///< Joystick identification }; } // namespace priv