--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp	Fri Mar 19 09:35:13 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp	Fri Apr 16 15:15:56 2010 +0300
@@ -22,7 +22,7 @@
 #include <centralrepository.h>
 #include <ecom/implementationproxy.h>
 
-#include <audiopreference.h>
+#include <AudioPreference.h>
 #include <mda/common/audio.h>
 #include <mdaaudiooutputstream.h>
 
@@ -134,28 +134,26 @@
         {
         case ETouchFeedbackBasic:               // flow through
         case ETouchFeedbackBasicButton:         // flow through
-        case ETouchFeedbackList:                // flow through
-        case ETouchFeedbackBoundaryList:        // flow through
-        case ETouchFeedbackSlider:              // flow through
-        case ETouchFeedbackEdit:                // flow through
-        case ETouchFeedbackSensitiveInput:
+        case ETouchFeedbackBasicItem:           // flow through
+        case ETouchFeedbackBounceEffect:        // flow through
+        case ETouchFeedbackBasicSlider:         // flow through
+        case ETouchFeedbackEditor:              // flow through
+        case ETouchFeedbackSensitiveKeypad:
         case ETouchFeedbackLineSelection:       // flow through
         case ETouchFeedbackBlankSelection:      // flow through
         case ETouchFeedbackTextSelection:       // flow through
         case ETouchFeedbackEmptyLineSelection:  // flow through
-        case ETouchFeedbackTab:                 // flow through
         case ETouchFeedbackPopUp:               // flow through
-        case ETouchFeedbackIncreasingPopUp:     // flow through
-        case ETouchFeedbackDecreasingPopUp:     // flow through
-        case ETouchFeedbackFlick:               // flow through
+        case ETouchFeedbackPopupOpen:           // flow through
+        case ETouchFeedbackPopupClose:          // flow through
+        case ETouchFeedbackItemScroll:          // flow through
         case ETouchFeedbackCheckbox:            // flow through
-        case ETouchFeedbackCharacterInputButton:
-        case ETouchFeedbackMultiTouchRecognized:
+        case ETouchFeedbackMultitouchActivate:
             volumeIndex = 0;
             break;
         case ETouchFeedbackSensitive:           // flow through
         case ETouchFeedbackSensitiveButton:     // flow through
-        case ETouchFeedbackSensitiveList:      
+        case ETouchFeedbackSensitiveItem:      
             volumeIndex = 1;
             break;
         default: