FCL/sf/os/cellularsrv: comparison telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 //  INCLUDE FILES
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmmconferencecallgsmwcdmaextTraces.h"
+#endif
 #include "cmmconferencecallgsmwcdmaext.h"
 #include "cmmphonetsy.h"
 #include "cmmconferencecalltsy.h"
 #include "cmmvoicecalltsy.h"
 #include "cmmcalllist.h"
 //
 TInt CMmConferenceCallGsmWcdmaExt::SwapL(
 	RMobileConferenceCall::TMobileConferenceStatus aStatus,
 CMmCallList* aCallList )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::SwapL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_1, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL");
 	TInt ret = KErrArgument;
 	// conference must be active or held
 if ( aStatus == RMobileConferenceCall::EConferenceIdle )
 {
 {
 // Call found, increase the counter.
 iNumberOfCallsToBeSwapped++;
 }
 }
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_2, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped);
 // Find active and held call objects:
 CMmCallTsy* mmActiveCall =
 aCallList->GetMmCallByStatus( RMobileCall::EStatusConnected );
 CMmCallTsy* mmHeldCall =
 //
 TBool CMmConferenceCallGsmWcdmaExt::CallStatusChanged(
 RMobileCall::TMobileCallStatus aNewStatus,
 TInt aCallId )
 {
-TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_1, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId );
 TBool statusChanged( EFalse );
 //get current conference call status
 RMobileConferenceCall::TMobileConferenceStatus status
 = iMmConferenceCallTsy->Status();
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_2, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status);
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_3, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus);
 //get call list
 CMmCallList* callList = iMmConferenceCallTsy->Phone()->CallList();
 switch( aNewStatus )
 {
 if ( statusChanged )
 {
 // -1 indicates that there is no unhandled ghost operation anymore
 iCurrentGhostOperation = -1;
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! ");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_4, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! ");
 }
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_5, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus);
 return statusChanged;
 }
 // ---------------------------------------------------------------------------
 //
 void CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability(
 RMobileConferenceCall::TMobileConferenceStatus aStatus,
 CMmCallList* aCallList )
 {
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CHECKCONFERENCECAPABILITY_1, "TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus);
 //Check if conference creation is possible. CC has to be in Idle state
 if ( RMobileConferenceCall::EConferenceIdle == aStatus  )
 {
 TUint8 connectedCount( 0 ); //how many calls are in active state
 TUint8 heldCount( 0 ); //how many calls are in hold state
 //
 TBool CMmConferenceCallGsmWcdmaExt::HandleSwap(
 RMobileConferenceCall::TMobileConferenceStatus aStatus,
 CMmCallList& aCallList )
 {
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLESWAP_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus);
 TBool statusChanged( EFalse );
 //increment counter telling how many calls will still change state
 iNumberOfCallsToBeSwapped--;
 TBool CMmConferenceCallGsmWcdmaExt::HandleAddCall(
 RMobileConferenceCall::TMobileConferenceStatus aStatus,
 CMmCallList& aCallList,
 RMobileCall::TMobileCallStatus aNewStatus )
 {
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus);
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus);
 TBool statusChanged( EFalse );
 //Handle adding a call to conference call
 if ( RMobileCall::EStatusConnected == aNewStatus ||
 RMobileCall::EStatusIdle == aNewStatus )
 //Call method that updates the caps of the joined calls
 UpdateCapsAfterJoin( aCallList );
 }
 }
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_3, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged);
 return statusChanged;
 }
 	{
 	TBool statusChanged( EFalse );
 	TBool callFound( EFalse );
 	CMmCallTsy* mmCall = NULL;
-	TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId );
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId );
-	TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference());
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference());
 	//first find the call object which has gone to idle state
 	for ( TInt i = 0; i < aCallList.GetNumberOfObjects(); i++ )
 		{
 		mmCall = aCallList.GetMmCallByIndex( i );
 		if(mmCall)
 			{
-			TFLOGSTRING2("TSY: Previous Call ID: %d", mmCall->PreviousCallId() );
+			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_3, "TSY: Previous Call ID: %d", mmCall->PreviousCallId() );
 			if ( mmCall->PreviousCallId() == aCallId )
 				{
 				if ( 2 == iMmConferenceCallTsy->NumberOfCallsInConference() && mmCall->IsPartOfConference() &&
 						iMmConferenceCallTsy->ServiceRequested(
 								CMmConferenceCallTsy::EMultimodeConferenceCallAddCall ) )
 					{
-					TFLOGSTRING("TSY: STOP handling this case");
+					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_4, "TSY: STOP handling this case");
 					return EFalse;
 					}
 				mmCall->ResetPreviousCallId();
 				callFound = ETrue;
 				break;
 					CMmCallTsy* remainingCall = aCallList.GetMmCallByIndex(d);
 					if( remainingCall->MobileCallStatus() == RMobileCall::EStatusHold )
 						{
 						callStatus = RMobileCall::EStatusHold;
-						TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" );
+						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_5, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" );
 						break;
 						}
 					}
 				}
 // ---------------------------------------------------------------------------
 //
 TInt CMmConferenceCallGsmWcdmaExt::GetNewStatus(
 RMobileConferenceCall::TMobileConferenceStatus* aNewStatus )
 {
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_GETNEWSTATUS_1, "TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus );
 //copy new status
 *aNewStatus = iNewStatus;
 //delete new status from GSM extension
 iNewStatus = RMobileConferenceCall::EConferenceIdle;
 // Resets internal attributes.
 // ---------------------------------------------------------------------------
 //
 void CMmConferenceCallGsmWcdmaExt::ResetAttributes()
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_RESETATTRIBUTES_1, "TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " );
 //Flag telling if this is not the first hold/active status indication
 //caused by client asking hold/resume for a single call.
 iCallControlStarted = EFalse;
 //Counter telling how many calls should still change their state before
 //Conference call changes its' state.
 callDataPackage->UnPackData( confEvent );
 //get current conference call status
 RMobileConferenceCall::TMobileConferenceStatus status
 = iMmConferenceCallTsy->Status();
-TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_1, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status );
 switch( confEvent )
 {
 case RMobileConferenceCall::EConferenceBuilt:
 //if createConference has not been requested using ETel API
 //and conference status is idle
 if ( RMobileConferenceCall::EConferenceIdle == status &&
 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
 EMultimodeConferenceCallCreateConference ) )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_2, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build");
 //We have to get 2 active status indications before the
 //conference has really gone to active state.
 iCreateConferenceCounter = 2;
 iCurrentGhostOperation = confEvent;
 }
 //and conference status is Hold or Active
 else if ( RMobileConferenceCall::EConferenceIdle != status &&
 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
 EMultimodeConferenceCallAddCall ) )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_3, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add");
 iCurrentGhostOperation = confEvent;
 }
 break;
 case RMobileConferenceCall::EConferenceCallAdded:
 //if addCall has not been requested using ETel API
 //and conference status is Hold or Active
 if ( RMobileConferenceCall::EConferenceIdle != status &&
 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
 EMultimodeConferenceCallAddCall ) )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_4, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add");
 iCurrentGhostOperation = confEvent;
 }
 break;
 case RMobileConferenceCall::EConferenceSwapped:
 //if swap has not been requested using ETel API
 if ( RMobileConferenceCall::EConferenceIdle != status &&
 !iMmConferenceCallTsy->ServiceRequested(
 CMmConferenceCallTsy::EMultimodeConferenceCallSwap ) )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_5, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap");
 iNumberOfCallsToBeSwapped
 = iMmConferenceCallTsy->NumberOfCallsInConference();
 iCurrentGhostOperation = confEvent;
 }
 break;
 //GoOneToOne has been requested
 case RMobileConferenceCall::EConferenceSplit:
 if ( !iGoOneToOneHandlingStarted )
 {
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_6, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split");
 iGoOneToOneHandlingStarted = ETrue;
 iCurrentGhostOperation = confEvent;
 iGoOneToOneCallId = callId;
 }
 break;
 default:
-TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_7, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions");
 break;
 }
 }

branch	RCL_3
changeset 65	630d2f34d719
parent 14	7ef16719d8cb
child 66	07a122eea281