diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,10 +29,11 @@ #include "cmtpplaybackproperty.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" - +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcskipTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"Skip");) /** Two-phase constructor. @@ -45,7 +46,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCSKIP_NEWL_ENTRY ); CMTPPbcSkip* self = new (ELeave) CMTPPbcSkip(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCSKIP_NEWL_EXIT ); return self; } @@ -54,10 +57,9 @@ */ CMTPPbcSkip::~CMTPPbcSkip() { - __FLOG(_L8("CMTPPbcSkip - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_CMTPPBCSKIP_ENTRY ); delete iPbCmd; - __FLOG(_L8("CMTPPbcSkip - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCSKIP_CMTPPBCSKIP_EXIT ); } /** @@ -69,8 +71,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCSKIP_CMTPPBCSKIP_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCSKIP_CMTPPBCSKIP_EXIT ); } /** @@ -78,7 +80,7 @@ */ TMTPResponseCode CMTPPbcSkip::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -89,7 +91,7 @@ respCode = EMTPRespCodeOK; } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_CHECKREQUESTL_EXIT ); return respCode; } @@ -98,7 +100,7 @@ */ void CMTPPbcSkip::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_SERVICEL_ENTRY ); CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap()); MMTPPlaybackControl& control(iPlaybackControlDp.GetPlaybackControlL()); @@ -117,14 +119,14 @@ { SendResponseL(EMTPRespCodeInvalidParameter); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_SERVICEL_EXIT ); } void CMTPPbcSkip::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); - + OstTraceFunctionEntry0( CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); + //Handle error response. TMTPResponseCode response; switch(aErr) @@ -157,8 +159,8 @@ if(aCmd != NULL) { __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand() ); } - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); }