FCL/sf/mw/btservices: comparison bluetoothengine/btsac/src/btsacStateConnected.cpp

equal deleted inserted replaced

-:f63038272f30
+:6a1fe72036e3
 // -----------------------------------------------------------------------------
 // CBtsacConnected::CancelActionL
 // -----------------------------------------------------------------------------
 //
-void CBtsacConnected::CancelActionL(TInt aError, TBTSACGavdpResetReason aGavdpReset)
+void CBtsacConnected::CancelActionL(TInt aError)
 {
 TRACE_FUNC
 StopTimer();
 	Parent().CompletePendingRequests((KConnectReq | KOpenAudioReq), aError);
-	Parent().ChangeStateL(CBtsacListening::NewL(Parent(), aGavdpReset, aError));
+	Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, aError));
 }
 // -----------------------------------------------------------------------------
 // CBtsacConnected::OpenAudioLinkL
 // -----------------------------------------------------------------------------
 	TRACE_FUNC
 	if (Parent().GetRemoteAddr() != aAddr)
 		{
 		TRACE_INFO((_L("CBtsacConnected::OpenAudio, Error!")))
-		CancelActionL(KErrNotFound, EGavdpResetReasonGeneral);
+		CancelActionL(KErrNotFound);
 		return;
 		}
 	iAudioOpenedBy = EAudioOpenedByAFW;
 	Parent().SetRemoteAddr(aAddr);
 // -----------------------------------------------------------------------------
 //
 void CBtsacConnected::CancelOpenAudioLinkL()
 {
 TRACE_FUNC
-	CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+	CancelActionL(KErrCancel);
 }
 // -----------------------------------------------------------------------------
 // CBtsacConnected::DisconnectL
 // -----------------------------------------------------------------------------
 //
 void CBtsacConnected::DisconnectL()
 	{
 	TRACE_FUNC
 	Parent().CompletePendingRequests(KDisconnectReq, KErrNone);
-	CancelActionL(KErrCancel, EGavdpResetReasonDisconnect);
+	CancelActionL(KErrCancel);
 	}
 // -----------------------------------------------------------------------------
 // CBtsacConnected::CancelConnectL
 // -----------------------------------------------------------------------------
 void CBtsacConnected::CancelConnectL()
 {
 TRACE_FUNC
 if(!iBearersQuery)
 	{
-		CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+		CancelActionL(KErrCancel);
 	}
 else
 	{
 	// We have to wait bearers to be completed
 	TRACE_INFO((_L("CBtsacConnected::CancelConnectL() Wait for BearerReady.")))
 	RPointerArray<TAvdtpServiceCapability> SEPCapabilities;
 if ((Parent().iRemoteSEPs->GetCaps(Parent().GetSEPIndex(), SEPCapabilities)) )
 		{
 		TRACE_INFO((_L("CBtsacConnected::Configure() Couldn't retrieve Capabilities !")))
-		CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+		CancelActionL(KErrCancel);
 	   	SEPCapabilities.Close();
 		return;
 		}
 	TRACE_INFO((_L("CBtsacConnected::Configure() Retrieve %d capabilities"), SEPCapabilities.Count()))
 	TRACE_INFO((_L("CBtsacConnected::Configure() Accessory Min bitpool: %d"), SBCCaps.MinBitpoolValue()))
 	if (Parent().iStreamer->ConfigureSEP(SBCCaps) )
 		{
 		TRACE_INFO((_L("CBtsacConnected::Configure() Streamer couldn't configure SEP !")))
-CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+CancelActionL(KErrCancel);
 return;   // capabilites doesn't suit us
 		}
 	TAvdtpSEPInfo SEPInfo;
 	if (Parent().iRemoteSEPs->GetInfo(Parent().GetSEPIndex(), SEPInfo))
 		{
 		TRACE_INFO((_L("CBtsacConnected::Configure() Couldn't retrieve SEP Info !")))
-		CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+		CancelActionL(KErrCancel);
 return;   // capabilites doesn't suit us
 		}
 	TSEID remoteSEPid = SEPInfo.SEID();
 	// local sep index is hard coded cause current implementation is only sbc encoded
 	TSEID localSEPid = TSEID(1, ETrue);
 	StartTimer(KSEPConfigureResponseDelay, KRequestIdTimer);
 	if ( Parent().iGavdp->ConfigureSEP(localSEPid, remoteSEPid , SBCCaps, MedTransCaps ) )
 		{
 		TRACE_INFO((_L("CBtsacConnected::Configure() ConfigureSEP returned Error !!!")))
-		CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+		CancelActionL(KErrCancel);
 		}
 }
 // -----------------------------------------------------------------------------
 // CBtsacConnected::GetCapabilitiesOfAllSEPs
 			}
 		}
 	else // we have covered all SEPs
 		{
 		StopTimer();
-		// store all info in our db
-		//Parent().StoreAccInfo();  // stores iRemoteSEPs (SEPManager) into database
 		iSuitableSEPFoundAlready = EFalse;
 		if ( iSEPFound == ESEPConfigure )
 			{
 			TRAP_IGNORE(ConfigureL());
 			// GAVDP_ConfigurationStartIndication.
 			StartTimer(KWaitConfStartIndicationDelay, KRequestIdTimer);
 			}
 		else // no audio sbc sink sep found
 			{
-			TRAP_IGNORE(CancelActionL(KErrCancel, EGavdpResetReasonGeneral));
+			TRAP_IGNORE(CancelActionL(KErrCancel));
 			}
 		}
 	}
 // -----------------------------------------------------------------------------
 			{
 			Parent().iRemoteSEPs->SetState(aSEPInfo.SEID(), CBTSACStreamEndPoint::EDiscoveredRemote, &aSEPInfo);
 			}
 		else // internal problem
 			{
-			TRAP_IGNORE(CancelActionL(KErrCancel, EGavdpResetReasonGeneral));
+			TRAP_IGNORE(CancelActionL(KErrCancel));
 			}
 	}
 	}
 // -----------------------------------------------------------------------------
 		GetCapabilitiesOfAllSEPs();
 		}
 	else // remote A2DP has no 'audio' 'sink' SEPs ! naughty remote
 		{
 		TRACE_INFO((_L("CBtsacConnected::GAVDP_SEPDiscoveryComplete() Remote A2dP has no 'audio' 'sink' SEPs !")))
-		TRAP_IGNORE(CancelActionL(KErrCancel, EGavdpResetReasonGeneral));
+		TRAP_IGNORE(CancelActionL(KErrCancel));
 		}
 	}
 // -----------------------------------------------------------------------------
 // CBtsacConnected::GAVDP_SEPCapability
 	StopTimer();
 	TAvdtpSEPInfo SEPInfo;
 	if (Parent().iRemoteSEPs->GetInfo(Parent().GetSEPIndex(), SEPInfo))
 		{
 		TRACE_INFO((_L("CBtsacConnected::GAVDP_ConfigurationConfirm Couldn't retrieve SEP Info !")))
-		TRAP_IGNORE(CancelActionL(KErrCancel, EGavdpResetReasonGeneral));
+		TRAP_IGNORE(CancelActionL(KErrCancel));
 	return;   // cannot get remote SEP capabilites
 		}
 	TSEID remoteSEPid = SEPInfo.SEID();
 	TRACE_INFO((_L("CBtsacConnected::GAVDP_ConfigurationConfirm() Asking for bearer for remote SEID(%d)"), remoteSEPid.SEID()))
 	iBearersQuery = ETrue;
 //
 void CBtsacConnected::GAVDP_AbortIndication(TSEID aSEID)
 	{
 	TRACE_INFO((_L("CBtsacConnected::GAVDP_AbortIndication() SEID:%d"), aSEID.SEID()))
 	(void)aSEID;
-	TRAP_IGNORE(CancelActionL(KErrDisconnected, EGavdpResetReasonNone));
+	TRAP_IGNORE(CancelActionL(KErrDisconnected));
 	}
 // -----------------------------------------------------------------------------
 // CBtsacConnected::GAVDP_ConfigurationStartIndication
 // -----------------------------------------------------------------------------
 		{
 		case KRequestIdTimer:
 			{
 			if(!iBearersQuery)
 				{
-			// Go to listening state, gavdp will be shutdown in listening state
+// Go to listening state, gavdp will be shutdown in listening state
-			CancelActionL(KErrCancel, EGavdpResetReasonNone);
+CancelActionL(KErrDisconnected);
 				}
 			else
 				{
 				// If bearers query timer has expired, lets handle it separately.
 				Parent().iGavdp->Cancel();
 					{
 					Parent().ChangeStateL(CBtsacAborting::NewL(Parent()));
 					}
 				else
 					{
-					CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+					CancelActionL(KErrDisconnected);
 					}
 				}
 			break;
 			}
 		case KRequestIdWaitRemoteConfStart:
 		{
 		case KErrAvdtpRequestTimeout: // -18005
 			{
 			TRACE_INFO((_L("CBtsacConnected::HandleGavdpErrorL() Request TIMEOUT")))
 			// Go to listening state, gavdp will be shutdown in listening state
-			CancelActionL(KErrDisconnected, EGavdpResetReasonNone);
+			CancelActionL(KErrDisconnected);
 			break;
 			}
 		case KErrHCILinkDisconnection: // -6305
 		case KErrDisconnected: // -36
 			{
 			TRACE_INFO((_L("CBtsacConnected::HandleGavdpErrorL() Signalling disconnected.")))
 			// for both outgoing or incoming connection, if we have an error,
 			// this means there is disconnection
-			CancelActionL(aError, EGavdpResetReasonGeneral);
+			CancelActionL(aError);
 			break;
 			}
 		case (KErrAvdtpSignallingErrorBase - EAvdtpSEPInUse): // -18064
 			{
 		// KErrNotReady -18
 		// KErrInUse -14
 		// KErrCorrupt -20
 		// (KErrAvdtpSignallingErrorBase - EAvdtpBadState) -18094
 			{
-			CancelActionL(KErrDisconnected, EGavdpResetReasonGeneral);
+			CancelActionL(KErrDisconnected);
 			}
 		}
 	}
 //  End of File

changeset 1	6a1fe72036e3
parent 0	f63038272f30
child 45	b0aebde9b1fb