diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-28 16:20:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 16:20:20 +0200 |
| commit | d44c5cfcf72eec2fbf76afe6fd9e43ee3bcab216 (patch) | |
| tree | 4ce75cb592dbf7ce1f367f778a8b3b306727b2f8 /platform/linuxbsd/joypad_linux.h | |
| parent | b9e58ed5b869cf2caf946be9a5e3b9066e1387eb (diff) | |
| parent | fdf58a585839804c89798392dd93025dbe8654e4 (diff) | |
Merge pull request #38295 from akien-mga/input-is-back
Rename InputFilter back to Input
Diffstat (limited to 'platform/linuxbsd/joypad_linux.h')
| -rw-r--r-- | platform/linuxbsd/joypad_linux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/linuxbsd/joypad_linux.h b/platform/linuxbsd/joypad_linux.h index 1d2ed5bbc1..0d175193a5 100644 --- a/platform/linuxbsd/joypad_linux.h +++ b/platform/linuxbsd/joypad_linux.h @@ -33,7 +33,7 @@ #define JOYPAD_LINUX_H #ifdef JOYDEV_ENABLED -#include "core/input/input_filter.h" +#include "core/input/input.h" #include "core/os/mutex.h" #include "core/os/thread.h" @@ -41,7 +41,7 @@ struct input_absinfo; class JoypadLinux { public: - JoypadLinux(InputFilter *in); + JoypadLinux(Input *in); ~JoypadLinux(); void process_joypads(); @@ -53,7 +53,7 @@ private: }; struct Joypad { - InputFilter::JoyAxis curr_axis[MAX_ABS]; + Input::JoyAxis curr_axis[MAX_ABS]; int key_map[MAX_KEY]; int abs_map[MAX_ABS]; int dpad; @@ -74,7 +74,7 @@ private: bool exit_udev; Mutex joy_mutex; Thread *joy_thread; - InputFilter *input; + Input *input; Joypad joypads[JOYPADS_MAX]; Vector<String> attached_devices; @@ -95,7 +95,7 @@ private: void joypad_vibration_start(int p_id, float p_weak_magnitude, float p_strong_magnitude, float p_duration, uint64_t p_timestamp); void joypad_vibration_stop(int p_id, uint64_t p_timestamp); - InputFilter::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; + Input::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; }; #endif |