# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271420156 -10800 # Node ID 8c57b70b4bf31fa5eb5a9c388450ff2abf74c398 # Parent 603911b3f1665e464ac5c2bd7aa8b9923dfe87c8 Revision: 201011 Kit: 201015 diff -r 603911b3f166 -r 8c57b70b4bf3 hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h --- a/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Fri Mar 19 09:35:13 2010 +0200 +++ b/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Fri Apr 16 15:15:56 2010 +0300 @@ -71,24 +71,32 @@ // New types for S60 5.2: ETouchFeedbackBasicButton = 0x100, ETouchFeedbackSensitiveButton, - ETouchFeedbackList, - ETouchFeedbackSensitiveList, - ETouchFeedbackBoundaryList, - ETouchFeedbackSlider, - ETouchFeedbackEdit, + ETouchFeedbackBasicItem, + ETouchFeedbackSensitiveItem, + ETouchFeedbackBounceEffect, + ETouchFeedbackBasicSlider, + ETouchFeedbackEditor, ETouchFeedbackLineSelection, ETouchFeedbackBlankSelection, ETouchFeedbackTextSelection, - ETouchFeedbackEmptyLineSelection, - ETouchFeedbackTab, + ETouchFeedbackEmptyLineSelection, ETouchFeedbackPopUp, - ETouchFeedbackIncreasingPopUp, - ETouchFeedbackDecreasingPopUp, - ETouchFeedbackFlick, + ETouchFeedbackPopupOpen, + ETouchFeedbackPopupClose, + ETouchFeedbackItemScroll, ETouchFeedbackCheckbox, - ETouchFeedbackSensitiveInput, - ETouchFeedbackCharacterInputButton, - ETouchFeedbackMultiTouchRecognized + ETouchFeedbackSensitiveKeypad, + ETouchFeedbackMultitouchActivate, + // New types for 10.1: + ETouchFeedbackBasicKeypad, + ETouchFeedbackFlicked, + ETouchFeedbackItemDrop, + ETouchFeedbackItemMoveOver, + ETouchFeedbackItemPick, + ETouchFeedbackMultipleCheckbox, + ETouchFeedbackRotateStep, + ETouchFeedbackSensitiveSlider, + ETouchFeedbackStopFlick }; /** @@ -100,7 +108,8 @@ ETouchContinuousSmooth = 0x300, // For generic continuous feedback for custom controls ETouchContinuousSlider, ETouchContinuousInput, - ETouchContinuousFlick + ETouchContinuousPopup, + ETouchContinuousPinch }; /** diff -r 603911b3f166 -r 8c57b70b4bf3 package_definition.xml --- a/package_definition.xml Fri Mar 19 09:35:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/client/src/tacticon.cpp --- a/tacticonserver/client/src/tacticon.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/client/src/tacticon.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -19,7 +19,7 @@ #include #include "tacticontrace.h" #include "tacticondefs.h" -#include "osttracedefinitions.h" +#include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "tacticonTraces.h" #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/client/traces/OstTraceDefinitions.h --- a/tacticonserver/client/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/client/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/server/group/bld.inf --- a/tacticonserver/server/group/bld.inf Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/server/group/bld.inf Fri Apr 16 15:15:56 2010 +0300 @@ -21,8 +21,8 @@ DEFAULT PRJ_EXPORTS -../data/tacticons.ivt /epoc32/data/z/system/Sounds/Digital/tacticons.ivt -../data/tacticons.ivt /epoc32/release/winscw/udeb/Z/System/Sounds/Digital/tacticons.ivt +../data/Tacticons.ivt /epoc32/data/z/system/Sounds/Digital/tacticons.ivt +../data/Tacticons.ivt /epoc32/release/winscw/udeb/Z/System/Sounds/Digital/tacticons.ivt PRJ_MMPFILES ../tacticonpluginfw/group/tacticonpluginfw.mmp diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/server/src/tacticonserver.cpp --- a/tacticonserver/server/src/tacticonserver.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/server/src/tacticonserver.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -24,9 +24,9 @@ #include "tacticondefs.h" #include "tacticonshutdown.h" #include "tacticontrace.h" -#include "osttracedefinitions.h" +#include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE -#include "tacticonservertraces.h" +#include "tacticonserverTraces.h" #endif // -------------------------------------------------------------------------- diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp --- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -23,9 +23,9 @@ #include "tacticonhapticsplayer.h" #include "tacticonprivatecrkeys.h" #include "tacticontrace.h" -#include "osttracedefinitions.h" +#include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE -#include "tacticonhapticsplayertraces.h" +#include "tacticonhapticsplayerTraces.h" #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/traces/OstTraceDefinitions.h --- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tacticonserver/server/traces/OstTraceDefinitions.h --- a/tacticonserver/server/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tacticonserver/server/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/group/bld.inf --- a/tactilefeedback/group/bld.inf Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/group/bld.inf Fri Apr 16 15:15:56 2010 +0300 @@ -23,10 +23,10 @@ #ifndef TOOLS -#include "../TactileAreaRegistry/group/bld.inf" -#include "../TactileFeedbackResolver/group/bld.inf" -#include "../TactileClickPlugin/group/bld.inf" -#include "../TactileFeedbackClient/group/bld.inf" -#include "../TactileActionPlugin/group/bld.inf" +#include "../tactilearearegistry/group/bld.inf" +#include "../tactilefeedbackresolver/group/bld.inf" +#include "../tactileclickplugin/group/bld.inf" +#include "../tactilefeedbackclient/group/bld.inf" +#include "../tactileactionplugin/group/bld.inf" #endif // TOOLS diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilearearegistry/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilearearegistry/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilearearegistry/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactileclickplugin/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactileclickplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactileclickplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp --- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -1732,7 +1732,7 @@ // range check. update when logical feedback types are changed. if (! ( aFeedback >= ETouchFeedbackNone || aFeedback <= ETouchFeedbackSensitive) || ! ( aFeedback >= ETouchFeedbackBasicButton || - aFeedback <= ETouchFeedbackMultiTouchRecognized ) ) + aFeedback <= ETouchFeedbackStopFlick ) ) { return KErrArgument; } diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackclient/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackclient/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackclient/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/group/bld.inf --- a/tactilefeedback/tactilefeedbackresolver/group/bld.inf Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/group/bld.inf Fri Apr 16 15:15:56 2010 +0300 @@ -24,8 +24,8 @@ DEFAULT PRJ_EXPORTS -../data/TactileFeedbackEffects.ivt /epoc32/data/z/private/10003B20/TactileFeedbackEffects.ivt -../data/TactileFeedbackEffects.ivt /epoc32/release/winscw/udeb/Z/private/10003B20/TactileFeedbackEffects.ivt +../data/tactilefeedbackeffects.ivt /epoc32/data/z/private/10003B20/TactileFeedbackEffects.ivt +../data/tactilefeedbackeffects.ivt /epoc32/release/winscw/udeb/Z/private/10003B20/TactileFeedbackEffects.ivt // IBY file ../rom/tactilefeedbackresolver.iby CORE_IBY_EXPORT_PATH(mw, tactilefeedbackresolver.iby) diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp --- 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 #include -#include +#include #include #include @@ -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: diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -46,30 +46,38 @@ _LIT8( KTFSensitive, "TFSensitive"); _LIT8( KTFBasicButton, "TFBasicButton"); _LIT8( KTFSensitiveButton, "TFSensitiveButton"); -_LIT8( KTFList, "TFList"); -_LIT8( KTFSensitiveList, "TFSensitiveList"); -_LIT8( KTFBoundaryList, "TFBoundaryList"); -_LIT8( KTFSlider, "TFSlider"); -_LIT8( KTFEdit, "TFEdit"); +_LIT8( KTFBasicItem, "TFList"); // Mapped to IVT file version 9.2 +_LIT8( KTFSensitiveItem, "TFSensitiveList"); // Mapped to IVT file version 9.2 +_LIT8( KTFBounceEffect, "TFBoundaryList"); // Mapped to IVT file version 9.2 +_LIT8( KTFBasicSlider, "TFSlider"); // Mapped to IVT file version 9.2 +_LIT8( KTFEditor, "TFEdit"); // Mapped to IVT file version 9.2 _LIT8( KTFLineSelection, "TFLineSelection"); _LIT8( KTFBlankSelection, "TFBlankSelection"); _LIT8( KTFTextSelection, "TFTextSelection"); _LIT8( KTFEmptyLineSelection, "TFEmptyLineSelection"); -_LIT8( KTFTab, "TFTab"); _LIT8( KTFPopUp, "TFPopUp"); -_LIT8( KTFIncreasingPopUp, "TFIncreasingPopUp"); -_LIT8( KTFDecreasingPopUp, "TFDecreasingPopUp"); -_LIT8( KTFFlick, "TFFlick"); +_LIT8( KTFPopupOpen, "TFIncreasingPopUp"); // Mapped to IVT file version 9.2 +_LIT8( KTFPopupClose, "TFDecreasingPopUp"); // Mapped to IVT file version 9.2 +_LIT8( KTFItemScroll, "TFFlick"); // Mapped to IVT file version 9.2 _LIT8( KTFCheckbox, "TFCheckbox"); -_LIT8( KTFSensitiveInput, "TFSensitiveInput"); -_LIT8( KTFCharacterInputButton, "TFCharacterInputButton"); -_LIT8( KTFMultiTouchRecognized, "TFMultiTouchRecognized"); +_LIT8( KTFBasicKeypad, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFSensitiveKeypad, "TFSensitiveInput"); // Mapped to IVT file version 9.2 +_LIT8( KTFMultitouchActivate, "TFMultiTouchRecognized"); // Mapped to IVT file version 9.2 +_LIT8( KTFFlicked, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFItemDrop, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFItemMoveOver, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFItemPick, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFMultipleCheckbox, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFRotateStep, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFSensitiveSlider, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFStopFlick, "TFBasic"); // To be released in IVT file version 10.1 // Continuous feedback's names _LIT8( KTFContinuousSmooth, "TFContinuousSmooth"); _LIT8( KTFContinuousSlider, "TFContinuousSlider"); _LIT8( KTFContinuousInput, "TFContinuousInput"); -_LIT8( KTFContinuousFlick, "TFContinuousFlick"); +_LIT8( KTFContinuousPopup, "TFBasic"); // To be released in IVT file version 10.1 +_LIT8( KTFContinuousPinch, "TFBasic"); // To be released in IVT file version 10.1 // --------------------------------------------------------------------------- // Constructor. // --------------------------------------------------------------------------- @@ -211,20 +219,23 @@ case ETouchFeedbackSensitiveButton: name = KTFSensitiveButton; break; - case ETouchFeedbackList: - name = KTFList; + case ETouchFeedbackBasicItem: + name = KTFBasicItem; break; - case ETouchFeedbackSensitiveList: - name = KTFSensitiveList; + case ETouchFeedbackSensitiveItem: + name = KTFSensitiveItem; + break; + case ETouchFeedbackBasicSlider: + name = KTFBasicSlider; break; - case ETouchFeedbackBoundaryList: - name = KTFBoundaryList; + case ETouchFeedbackSensitiveSlider: + name = KTFSensitiveSlider; break; - case ETouchFeedbackSlider: - name = KTFSlider; + case ETouchFeedbackBounceEffect: + name = KTFBounceEffect; break; - case ETouchFeedbackEdit: - name = KTFEdit; + case ETouchFeedbackEditor: + name = KTFEditor; break; case ETouchFeedbackLineSelection: name = KTFLineSelection; @@ -238,32 +249,50 @@ case ETouchFeedbackEmptyLineSelection: name = KTFEmptyLineSelection; break; - case ETouchFeedbackTab: - name = KTFTab; - break; case ETouchFeedbackPopUp: name = KTFPopUp; break; - case ETouchFeedbackIncreasingPopUp: - name = KTFIncreasingPopUp; + case ETouchFeedbackPopupOpen: + name = KTFPopupOpen; break; - case ETouchFeedbackDecreasingPopUp: - name = KTFDecreasingPopUp; + case ETouchFeedbackPopupClose: + name = KTFPopupClose; break; - case ETouchFeedbackFlick: - name = KTFFlick; + case ETouchFeedbackItemScroll: + name = KTFItemScroll; break; case ETouchFeedbackCheckbox: name = KTFCheckbox; break; - case ETouchFeedbackSensitiveInput: - name = KTFSensitiveInput; + case ETouchFeedbackBasicKeypad: + name = KTFBasicKeypad; + break; + case ETouchFeedbackSensitiveKeypad: + name = KTFSensitiveKeypad; + break; + case ETouchFeedbackMultitouchActivate: + name = KTFMultitouchActivate; + break; + case ETouchFeedbackFlicked: + name = KTFFlicked; + break; + case ETouchFeedbackItemDrop: + name = KTFItemDrop; break; - case ETouchFeedbackCharacterInputButton: - name = KTFCharacterInputButton; + case ETouchFeedbackItemMoveOver: + name = KTFItemMoveOver; + break; + case ETouchFeedbackItemPick: + name = KTFItemPick; break; - case ETouchFeedbackMultiTouchRecognized: - name = KTFMultiTouchRecognized; + case ETouchFeedbackMultipleCheckbox: + name = KTFMultipleCheckbox; + break; + case ETouchFeedbackRotateStep: + name = KTFRotateStep; + break; + case ETouchFeedbackStopFlick: + name = KTFStopFlick; break; default: User::Leave( KErrArgument ); @@ -340,8 +369,11 @@ case ETouchContinuousInput: name = KTFContinuousInput; break; - case ETouchContinuousFlick: - name = KTFContinuousFlick; + case ETouchContinuousPopup: + name = KTFContinuousPopup; + break; + case ETouchContinuousPinch: + name = KTFContinuousPinch; break; default: ret = KErrArgument; diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -139,28 +139,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: effectIndex = 0; break; case ETouchFeedbackSensitive: // flow through case ETouchFeedbackSensitiveButton: // flow through - case ETouchFeedbackSensitiveList: + case ETouchFeedbackSensitiveItem: effectIndex = 1; break; default: diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "tactilefeedbackprivatecrkeys.h" #include "tactilefeedbacktrace.h" @@ -114,28 +114,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: effectIndex = 0; break; case ETouchFeedbackSensitive: // flow through case ETouchFeedbackSensitiveButton: // flow through - case ETouchFeedbackSensitiveList: + case ETouchFeedbackSensitiveItem: effectIndex = 1; break; default: diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/traces/OstTraceDefinitions.h --- a/tactilefeedback/tactilefeedbackresolver/traces/OstTraceDefinitions.h Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/traces/OstTraceDefinitions.h Fri Apr 16 15:15:56 2010 +0300 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL #define OST_TRACE_COMPILER_IN_USE -#include +#include #endif