bluetoothengine/btsac/src/btsacStateConfigured.cpp
changeset 1 6a1fe72036e3
parent 0 f63038272f30
child 45 b0aebde9b1fb
--- a/bluetoothengine/btsac/src/btsacStateConfigured.cpp	Mon Jan 18 20:28:57 2010 +0200
+++ b/bluetoothengine/btsac/src/btsacStateConfigured.cpp	Tue Jan 26 12:06:42 2010 +0200
@@ -169,11 +169,11 @@
 // CBtsacConfigured::CancelActionL
 // -----------------------------------------------------------------------------
 //
-void CBtsacConfigured::CancelActionL(TInt aError, TBTSACGavdpResetReason aGavdpReset)
+void CBtsacConfigured::CancelActionL(TInt aError)
     {
     TRACE_FUNC
 	Parent().CompletePendingRequests(KOpenAudioReq, aError);
-	Parent().ChangeStateL(CBtsacListening::NewL(Parent(), aGavdpReset, aError));
+	Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, aError));
     }
 
 // -----------------------------------------------------------------------------
@@ -183,7 +183,7 @@
 void CBtsacConfigured::CancelConnectL()
     {
 	TRACE_FUNC	
-	CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+	CancelActionL(KErrCancel);
     }
 
 // -----------------------------------------------------------------------------
@@ -224,7 +224,7 @@
 void CBtsacConfigured::CancelOpenAudioLinkL()
     {
     TRACE_FUNC
-	CancelActionL(KErrCancel, EGavdpResetReasonGeneral);
+	CancelActionL(KErrCancel);
     }
 
 // -----------------------------------------------------------------------------
@@ -255,7 +255,7 @@
 			{
 			TRACE_INFO((_L("CBtsacConfigured::GAVDP_StartStreamsConfirm() [ERR] Couldn't abort stream.")))
 			}
-		TRAP_IGNORE(CancelActionL(KErrNotReady, EGavdpResetReasonGeneral));
+		TRAP_IGNORE(CancelActionL(KErrNotReady));
 	 	}
 	 else
 	 	{
@@ -366,7 +366,7 @@
 				}
 			else
 				{
-				CancelActionL(KErrDisconnected, EGavdpResetReasonGeneral);
+				CancelActionL(KErrDisconnected);
 				}
 			break;
 			}
@@ -374,12 +374,12 @@
 		case KErrDisconnected: // -36
 			{
 			TRACE_INFO((_L("CBtsacConfigured::HandleGavdpErrorL() Signalling disconnected.")))
-			CancelActionL(aError, EGavdpResetReasonNone);
+			CancelActionL(aError);
 			break;
 			}
 		default:
 			{
-			CancelActionL(KErrDisconnected, EGavdpResetReasonGeneral);
+			CancelActionL(KErrDisconnected);
 			break;
 			}
 		}