tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Tue Aug 31 15:30:39 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Wed Sep 01 12:23:25 2010 +0100
@@ -67,7 +67,7 @@
// settings from profiles engine
InitializeProfilesEngineL();
- if ( iAudioLevel > EProfileAudioFeedbackLevel5 )
+ if ( iAudioLevel > EProfileAudioFeedbackLevel3 )
{
User::Leave( KErrGeneral );
}
@@ -139,36 +139,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:
@@ -220,7 +217,7 @@
TInt ret( KErrArgument );
if ( aLevel > EProfileAudioFeedbackOff &&
- aLevel <= EProfileAudioFeedbackLevel5 )
+ aLevel <= EProfileAudioFeedbackLevel3 )
{
iOriginalLevel = iAudioLevel;
iAudioLevel = aLevel;
@@ -365,42 +362,6 @@
iRepository.Get( KTactileAudioToneVolumeSensitiveLevel3,
sensitiveParams.iVolume );
}
- else if ( iAudioLevel == EProfileAudioFeedbackLevel4 )
- {
- // Read settings for ETouchFeedbackBasic, level 4
- iRepository.Get( KTactileAudioToneFreqBasicLevel4,
- basicParams.iFrequency );
- iRepository.Get( KTactileAudioToneDurationBasicLevel4,
- basicDuration );
- iRepository.Get( KTactileAudioToneVolumeBasicLevel4,
- basicParams.iVolume );
-
- // Read settings for ETouchFeedbackSensitive, level 4
- iRepository.Get( KTactileAudioToneFreqSensitiveLevel4,
- sensitiveParams.iFrequency );
- iRepository.Get( KTactileAudioToneDurationSensitiveLevel4,
- sensitiveDuration );
- iRepository.Get( KTactileAudioToneVolumeSensitiveLevel4,
- sensitiveParams.iVolume );
- }
- else if ( iAudioLevel == EProfileAudioFeedbackLevel5 )
- {
- // Read settings for ETouchFeedbackBasic, level 5
- iRepository.Get( KTactileAudioToneFreqBasicLevel5,
- basicParams.iFrequency );
- iRepository.Get( KTactileAudioToneDurationBasicLevel5,
- basicDuration );
- iRepository.Get( KTactileAudioToneVolumeBasicLevel5,
- basicParams.iVolume );
-
- // Read settings for ETouchFeedbackSensitive, level 5
- iRepository.Get( KTactileAudioToneFreqSensitiveLevel5,
- sensitiveParams.iFrequency );
- iRepository.Get( KTactileAudioToneDurationSensitiveLevel5,
- sensitiveDuration );
- iRepository.Get( KTactileAudioToneVolumeSensitiveLevel5,
- sensitiveParams.iVolume );
- }
// Clear old parameters. Only do it at end, so that we still have the
// old settings in case something fails when reading these from
@@ -421,9 +382,8 @@
sensitiveParams.iVolume = ScaleVolume( sensitiveParams.iVolume );
// Store parameters for different feedback types
- // if append fail just make its action like before
- TRAP_IGNORE( iSoundParams.AppendL( basicParams ) );
- TRAP_IGNORE( iSoundParams.AppendL( sensitiveParams ) );
+ iSoundParams.Append( basicParams );
+ iSoundParams.Append( sensitiveParams );
TRACE("CTactileTonePlayer::ReadSettingsL - End");
}