diff options
| author | JMC47 <JMC4789@gmail.com> | 2019-04-06 14:53:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 14:53:51 -0400 |
| commit | 75e74315e69df1dc03bbda4373528e9e26274d7d (patch) | |
| tree | 4b4a3e4afa2e08cf146f9d05997a2a5bdcee07d1 /Source/Core/InputCommon/ControllerInterface/evdev | |
| parent | b47f09c26db2194af568e5f960e915d224e94f99 (diff) | |
| parent | 0bdfa19650ef3b52ccfa5dee3eed5d42efb206b9 (diff) | |
Merge pull request #7689 from jordan-woyak/sdl-improve
ControllerInterface: SDL cleanups/fixes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/evdev')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/evdev/evdev.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index fe9e31dc21..f84f3b01c6 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -256,8 +256,8 @@ evdevDevice::evdevDevice(const std::string& devnode) : m_devfile(devnode) // Rumble (i.e. Left/Right) (i.e. Strong/Weak) effect if (libevdev_has_event_code(m_dev, EV_FF, FF_RUMBLE)) { - AddOutput(new RumbleEffect(m_fd, RumbleEffect::Motor::STRONG)); - AddOutput(new RumbleEffect(m_fd, RumbleEffect::Motor::WEAK)); + AddOutput(new RumbleEffect(m_fd, RumbleEffect::Motor::Strong)); + AddOutput(new RumbleEffect(m_fd, RumbleEffect::Motor::Weak)); } // TODO: Add leds as output devices @@ -388,7 +388,7 @@ std::string evdevDevice::PeriodicEffect::GetName() const std::string evdevDevice::RumbleEffect::GetName() const { - return (Motor::STRONG == m_motor) ? "Strong" : "Weak"; + return (Motor::Strong == m_motor) ? "Strong" : "Weak"; } void evdevDevice::Effect::SetState(ControlState state) @@ -482,7 +482,7 @@ bool evdevDevice::PeriodicEffect::UpdateParameters(ControlState state) bool evdevDevice::RumbleEffect::UpdateParameters(ControlState state) { - u16& value = (Motor::STRONG == m_motor) ? m_effect.u.rumble.strong_magnitude : + u16& value = (Motor::Strong == m_motor) ? m_effect.u.rumble.strong_magnitude : m_effect.u.rumble.weak_magnitude; const u16 old_value = value; diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h index 5196084d24..4b6d0bc0b2 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h @@ -90,8 +90,8 @@ private: public: enum class Motor : u8 { - WEAK, - STRONG, + Weak, + Strong, }; RumbleEffect(int fd, Motor motor); |