diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-03-04 13:36:09 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:39 +0100 |
| commit | 8e6960a69e0202cb1e6f3b3dc9f9bb34e1c1d889 (patch) | |
| tree | 67b81f61ea79e83d7877c77a302592b9c849991e /platform/osx | |
| parent | 9e08742de81b062c30b7984900a55d5150a4bd17 (diff) | |
Refactored input, goes all via windows now.
Also renamed Input to InputFilter because all it does is filter events.
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/joypad_osx.cpp | 2 | ||||
| -rw-r--r-- | platform/osx/joypad_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp index e9f46fb5a4..26735b71d1 100644 --- a/platform/osx/joypad_osx.cpp +++ b/platform/osx/joypad_osx.cpp @@ -573,7 +573,7 @@ void JoypadOSX::config_hid_manager(CFArrayRef p_matching_array) const { JoypadOSX::JoypadOSX() { self = this; - input = (InputDefault *)Input::get_singleton(); + input = (InputDefault *)InputFilter::get_singleton(); int okay = 1; const void *vals[] = { diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index 287cf63cc8..c8ed8fbfa9 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -40,7 +40,7 @@ #include <ForceFeedback/ForceFeedbackConstants.h> #include <IOKit/hid/IOHIDLib.h> -#include "core/input/input.h" +#include "core/input/input_filter.h" struct rec_element { IOHIDElementRef ref; diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index b98c279f92..de8a9345e3 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -33,7 +33,7 @@ #define BitMap _QDBitMap // Suppress deprecated QuickDraw definition. -#include "core/input/input.h" +#include "core/input/inpu_filter.h" #include "crash_handler_osx.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" #include "drivers/coremidi/midi_driver_coremidi.h" |