From 536e7601cb2068e415ea1632e27d76aa8b6353c8 Mon Sep 17 00:00:00 2001
From: "SND\\edgbla_cp" <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 3 Nov 2011 20:54:08 +0000
Subject: dfinput: visual vibration option.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@71989 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfinput/pad.c | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

(limited to 'plugins/dfinput/pad.c')

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]);
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3