diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-03 20:54:08 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-03 20:54:08 +0000 |
| commit | 536e7601cb2068e415ea1632e27d76aa8b6353c8 (patch) | |
| tree | f8585650813f8048b71958c452ca2d43aac76410 /plugins/dfinput/pad.c | |
| parent | 363e63c11d97a4370d81ad48befdeaa0599ac888 (diff) | |
| download | pcsxr-536e7601cb2068e415ea1632e27d76aa8b6353c8.tar.gz | |
dfinput: visual vibration option.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@71989 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput/pad.c')
| -rw-r--r-- | plugins/dfinput/pad.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index 501ba008..3900f0c4 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -460,15 +460,21 @@ unsigned char PADpoll(unsigned char value) { if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) {
#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
- if (g.PadState[CurPad].VibrateDev == -1 &&
- g.PadState[CurPad].JoyDev != NULL) {
- linux_set_vibrate(CurPad);
- }
- if (!linux_vibrate(&g.PadState[CurPad]))
- /* only do visual if joy fails */
+ if (g.PadState[CurPad].VibrateDev == -1 &&
+ g.PadState[CurPad].JoyDev != NULL) {
+ linux_set_vibrate(CurPad);
+ }
+ if (!linux_vibrate(&g.PadState[CurPad]))
+ /* only do visual if joy fails */
#endif
- if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]) && gpuVisualVibration != NULL)
- gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
+ //gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ }
+
+ if(gpuVisualVibration != NULL &&
+ g.cfg.PadDef[CurPad].VisualVibration) {
+ gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ }
}
}
@@ -477,15 +483,21 @@ unsigned char PADpoll(unsigned char value) { if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) {
#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
- if (g.PadState[CurPad].VibrateDev == -1 &&
- g.PadState[CurPad].JoyDev != NULL) {
- linux_set_vibrate(CurPad);
- }
- if (!linux_vibrate(&g.PadState[CurPad]))
+ if (g.PadState[CurPad].VibrateDev == -1 &&
+ g.PadState[CurPad].JoyDev != NULL) {
+ linux_set_vibrate(CurPad);
+ }
+ if (!linux_vibrate(&g.PadState[CurPad]))
/* only do visual if joy fails */
#endif
- if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]) && gpuVisualVibration != NULL)
- gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
+ //gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ }
+
+ if(gpuVisualVibration != NULL &&
+ g.cfg.PadDef[CurPad].VisualVibration) {
+ gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+ }
}
}
}
|