diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-08-23 00:51:12 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-08-23 00:51:12 +1200 |
| commit | b6e054a2beef3236822e27d95dfe38a4ccee2eb1 (patch) | |
| tree | 6f744593b14def9c2fbc7be9e509df5507835cc4 /Source/Core/InputCommon/Src/ControllerInterface/SDL | |
| parent | f274b3b074fb8bb0477b0e9f4e88db0e08bf4f2c (diff) | |
| parent | 41c25d0c90a2461c3e34bf9659dcf1da5e1e8580 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/CoreParameter.cpp
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/SDL')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index 006b82d4ac..40c822c577 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -131,12 +131,14 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi AddOutput(new SineEffect(m_state_out.back())); } +#ifdef SDL_HAPTIC_SQUARE // square effect if (supported_effects & SDL_HAPTIC_SQUARE) { m_state_out.push_back(EffectIDState()); AddOutput(new SquareEffect(m_state_out.back())); } +#endif // defined(SDL_HAPTIC_SQUARE) // triangle effect if (supported_effects & SDL_HAPTIC_TRIANGLE) @@ -187,10 +189,12 @@ std::string Joystick::SineEffect::GetName() const return "Sine"; } +#ifdef SDL_HAPTIC_SQUARE std::string Joystick::SquareEffect::GetName() const { return "Square"; } +#endif // defined(SDL_HAPTIC_SQUARE) std::string Joystick::TriangleEffect::GetName() const { @@ -255,6 +259,7 @@ void Joystick::SineEffect::SetState(const ControlState state) m_effect.changed = true; } +#ifdef SDL_HAPTIC_SQUARE void Joystick::SquareEffect::SetState(const ControlState state) { if (state) @@ -276,6 +281,7 @@ void Joystick::SquareEffect::SetState(const ControlState state) if (old != m_effect.effect.periodic.magnitude) m_effect.changed = true; } +#endif // defined(SDL_HAPTIC_SQUARE) void Joystick::TriangleEffect::SetState(const ControlState state) { diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h index 6a65efeedb..9b9794c481 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -106,6 +106,7 @@ private: EffectIDState& m_effect; }; +#ifdef SDL_HAPTIC_SQUARE class SquareEffect : public Output { public: @@ -115,6 +116,7 @@ private: private: EffectIDState& m_effect; }; +#endif // defined(SDL_HAPTIC_SQUARE) class TriangleEffect : public Output { |