--- a/bluetoothengine/btsac/src/btsacStateStreaming.cpp Thu Jul 15 18:50:18 2010 +0300
+++ b/bluetoothengine/btsac/src/btsacStateStreaming.cpp Thu Aug 19 10:05:41 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -99,7 +99,7 @@
TRACE_INFO((_L("CBtsacStreaming::Cancel() iStreamer.StopStream() returned error(%d) !!!"), ret))
}
Parent().CompletePendingRequests(KCompleteAllReqs, aError);
- Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, aError));
+ Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, aError));
}
// -----------------------------------------------------------------------------
@@ -151,7 +151,7 @@
TRACE_FUNC
// For safety sake complete all pending requests
Parent().CompletePendingRequests(KCompleteAllReqs, KErrNone);
- TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected)));
+ TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected)));
}
@@ -171,7 +171,7 @@
{
TRACE_INFO((_L("CBtsacStreaming::StartRecording() Couldn't abort stream.")))
}
- TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected)));
+ TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected)));
}
}
@@ -188,7 +188,7 @@
TRACE_INFO((_L("CBtsacStreaming::DisconnectL() StopStream() returned error: %d"), ret))
}
Parent().CompletePendingRequests(KDisconnectReq, ret);
- Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrNone));
+ Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrNone));
}
// -----------------------------------------------------------------------------
@@ -220,7 +220,7 @@
// It is possible the remote disconnected while we have active close audio request.
Parent().CompletePendingRequests(KCompleteAllReqs, KErrNone);
- TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected)));
+ TRAP_IGNORE(Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected)));
}
// -----------------------------------------------------------------------------
@@ -339,7 +339,7 @@
else
{
Parent().CompletePendingRequests(KCompleteAllReqs, aError);
- Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected));
+ Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected));
}
break;
}
@@ -347,7 +347,7 @@
case KErrDisconnected: // -36
{
Parent().CompletePendingRequests(KCompleteAllReqs, aError);
- Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, aError));
+ Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, aError));
break;
}
default:
@@ -355,7 +355,7 @@
// Unknown error. For safety's sake let's disconnect a2dp link and inform btaudioman
TRACE_INFO((_L("CBtsacStreaming::HandleGavdpErrorL() Unknown error, goes to listening")))
Parent().CompletePendingRequests(KCompleteAllReqs, aError);
- Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected));
+ Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected));
break;
}
}