tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Tue Aug 31 15:30:39 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Wed Sep 01 12:23:25 2010 +0100
@@ -52,7 +52,7 @@
User::LeaveIfError( iRepository.Get( KTactileFeedbackHapticsStrength,
iVibraLevel ) );
- if ( iVibraLevel > EProfileTactileFeedbackLevel5 )
+ if ( iVibraLevel > EProfileTactileFeedbackLevel3 )
{
User::Leave( KErrGeneral );
}
@@ -114,36 +114,33 @@
{
case ETouchFeedbackBasic: // flow through
case ETouchFeedbackBasicButton: // flow through
- case ETouchFeedbackBasicItem: // flow through
- case ETouchFeedbackBounceEffect: // flow through
- case ETouchFeedbackBasicSlider: // flow through
- case ETouchFeedbackEditor: // flow through
+ case ETouchFeedbackList: // flow through
+ case ETouchFeedbackBoundaryList: // flow through
+ case ETouchFeedbackSlider: // flow through
+ case ETouchFeedbackEdit: // flow through
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 ETouchFeedbackPopupOpen: // flow through
- case ETouchFeedbackPopupClose: // flow through
- case ETouchFeedbackItemScroll: // flow through
+ case ETouchFeedbackIncreasingPopUp: // flow through
+ case ETouchFeedbackDecreasingPopUp: // flow through
+ case ETouchFeedbackFlick: // flow through
case ETouchFeedbackCheckbox: // flow through
- case ETouchFeedbackMultitouchActivate:
- case ETouchFeedbackBasicKeypad:
- case ETouchFeedbackFlick:
- case ETouchFeedbackItemDrop:
- case ETouchFeedbackItemMoveOver:
- case ETouchFeedbackItemPick:
- case ETouchFeedbackMultipleCheckbox:
- case ETouchFeedbackRotateStep:
- case ETouchFeedbackStopFlick:
- case ETouchFeedbackLongPress:
+ case ETouchFeedbackCharacterInputButton:
+ case ETouchFeedbackOptionsMenuOpened:
+ case ETouchFeedbackOptionsMenuClosed:
+ case ETouchFeedbackSubMenuOpened:
+ case ETouchFeedbackSubMenuClosed:
+ case ETouchFeedbackLongTap:
+ case ETouchFeedbackMultiTouchRecognized:
effectIndex = 0;
break;
case ETouchFeedbackSensitive: // flow through
case ETouchFeedbackSensitiveButton: // flow through
- case ETouchFeedbackSensitiveItem:
- case ETouchFeedbackSensitiveKeypad:
- case ETouchFeedbackSensitiveSlider:
+ case ETouchFeedbackSensitiveList:
+ case ETouchFeedbackSensitiveInput:
effectIndex = 1;
break;
default:
@@ -216,7 +213,7 @@
TInt ret( KErrArgument );
if ( aLevel > EProfileTactileFeedbackOff &&
- aLevel <= EProfileTactileFeedbackLevel5 )
+ aLevel <= EProfileTactileFeedbackLevel3 )
{
iOriginalLevel = iVibraLevel;
iVibraLevel = aLevel;
@@ -286,39 +283,11 @@
iRepository.Get( KTactileVibraDurationSensitiveLevel3,
sensitiveParams.iTime );
}
- else if ( iVibraLevel == EProfileTactileFeedbackLevel4 )
- {
- // Read settings for ETouchFeedbackBasic
- iRepository.Get( KTactileVibraIntensityBasicLevel4,
- basicParams.iIntensity );
- iRepository.Get( KTactileVibraDurationBasicLevel4,
- basicParams.iTime );
-
- // Read settings for ETouchFeedbackSensitive
- iRepository.Get( KTactileVibraIntensitySensitiveLevel4,
- sensitiveParams.iIntensity );
- iRepository.Get( KTactileVibraDurationSensitiveLevel4,
- sensitiveParams.iTime );
- }
- else if ( iVibraLevel == EProfileTactileFeedbackLevel5 )
- {
- // Read settings for ETouchFeedbackBasic
- iRepository.Get( KTactileVibraIntensityBasicLevel5,
- basicParams.iIntensity );
- iRepository.Get( KTactileVibraDurationBasicLevel5,
- basicParams.iTime );
-
- // Read settings for ETouchFeedbackSensitive
- iRepository.Get( KTactileVibraIntensitySensitiveLevel5,
- sensitiveParams.iIntensity );
- iRepository.Get( KTactileVibraDurationSensitiveLevel5,
- sensitiveParams.iTime );
- }
iVibraParams.Reset();
- TRAP_IGNORE( iVibraParams.AppendL( basicParams ) );
- TRAP_IGNORE( iVibraParams.AppendL( sensitiveParams ) );
+ iVibraParams.Append( basicParams );
+ iVibraParams.Append( sensitiveParams );
TRACE("CTactileVibraPlayer::ReadSettings - End");
}