diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 11:16:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 11:16:51 +0100 |
| commit | 1e255532e90fa35148167e4c153ad39f77010a04 (patch) | |
| tree | a9a9899a6de530fd049eae57e357ce8f26518337 /platform/osx/joypad_osx.h | |
| parent | b61fedbb1d669901bcc52c0957a3824e37647b16 (diff) | |
| parent | 6b23e36dbc2b1ae265427fd568bec3908c910987 (diff) | |
Merge pull request #36845 from bruvzg/macos10_15_gamepad_fix
Fix gamepad disconnection callback on macOS Catalina.
Diffstat (limited to 'platform/osx/joypad_osx.h')
| -rw-r--r-- | platform/osx/joypad_osx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index 388251016b..2c076b3680 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -103,6 +103,7 @@ private: bool configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy); int get_joy_index(int p_id) const; + int get_joy_ref(IOHIDDeviceRef p_device) const; void poll_joypads() const; void setup_joypad_objects(); @@ -115,7 +116,7 @@ public: void process_joypads(); void _device_added(IOReturn p_res, IOHIDDeviceRef p_device); - void _device_removed(int p_id); + void _device_removed(IOReturn p_res, IOHIDDeviceRef p_device); JoypadOSX(); ~JoypadOSX(); |