# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1287497522 -3600
# Node ID 6da0c4c8b8400a7814944eac7662fc2334e15840
# Parent  f9a00adead4a451c7a8f71243051d408879a877e# Parent  9c9c77f57686e478cafe31357c6901f12734fd49
Merge workaround for Bug 3311 - hbfeedback fails to build due to missing enum ETouchFeedbackLongTap

diff -r f9a00adead4a -r 6da0c4c8b840 hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h
--- a/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h	Fri Oct 01 17:10:16 2010 +0800
+++ b/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h	Tue Oct 19 15:12:02 2010 +0100
@@ -97,7 +97,8 @@
     ETouchFeedbackRotateStep,
     ETouchFeedbackSensitiveSlider,
     ETouchFeedbackStopFlick,
-    ETouchFeedbackLongPress
+    ETouchFeedbackLongPress,
+	ETouchFeedbackLongTap
     };
     
 /**  
diff -r f9a00adead4a -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Fri Oct 01 17:10:16 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Tue Oct 19 15:12:02 2010 +0100
@@ -145,6 +145,14 @@
     TBool aPlayAudio )
     {
     // TRACE("CTactileFeedbackResolver::PlayFeedback - Begin");
+    
+    // A temporary solution to change effect of ETouchFeedbackSensitiveSlider,
+    // it will be removed when the IVT files is ready.
+    if( ETouchFeedbackSensitiveSlider == aFeedback )
+        {
+        aFeedback = ETouchFeedbackBasicSlider;
+        }
+
     // Feedback filtering in order to prevent too many feedbacks
     // in a short time (e.g. when doing text selection).    
     TTime now;
@@ -402,6 +410,13 @@
                           TTouchLogicalFeedback aFeedback,
                           TTouchFeedbackType aType )
     {
+    // A temporary solution to change effect of ETouchFeedbackSensitiveSlider,
+    // it will be removed when the IVT files is ready.
+    if( ETouchFeedbackSensitiveSlider == aFeedback )
+        {
+        aFeedback = ETouchFeedbackBasicSlider;
+        }
+    
     if ( aType & ETouchFeedbackVibra && iHapticsPlayer )
         {
         iHapticsPlayer->PlayPreviewFeedback( aLevel, aFeedback );