--- a/bluetooth/btstack/avdtp/avdtpStreamStates.cpp Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpStreamStates.cpp Wed Oct 13 15:48:34 2010 +0300
@@ -254,8 +254,7 @@
TInt TAVStreamState::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/,
- TL2CapConfig::TChannelPriority /*aPriority*/) const
+ CTransportChannel*& /*aTransportChannel*/) const
{
LOG_FUNC
DEBUGPANICINSTATE(EAvdtpUnexpectedAddSessionEvent);
@@ -491,8 +490,7 @@
TInt TAVStreamStateINTConfigured::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel,
- TL2CapConfig::TChannelPriority aPriority) const
+ CTransportChannel*& aChannel) const
{
LOG_FUNC
TInt ret = KErrNone;
@@ -515,7 +513,7 @@
if (aChannel)
{
// bind session to channel
- ret = aChannel->AttachTransportSession(aSession, aType, aPriority);
+ ret = aChannel->AttachTransportSession(aSession, aType);
if (ret==KErrNone)
{
// keep a copy of this binding
@@ -776,8 +774,7 @@
TInt TAVStreamStateACPConfigured::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/,
- TL2CapConfig::TChannelPriority /*aPriority*/) const
+ CTransportChannel*& /*aTransportChannel*/) const
{
LOG_FUNC
return KErrNotReady;
@@ -831,8 +828,7 @@
TInt TAVStreamStateReady::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/,
- TL2CapConfig::TChannelPriority /*aPriority*/) const
+ CTransportChannel*& /*aTransportChannel*/) const
{
LOG_FUNC
#ifdef _DEBUG
@@ -923,6 +919,7 @@
sigch->SendAbort(aStream, aStream.RemoteSEID());
}
+ // no need to tell signalling session as Opening is not available to RGavdp
// Opening is performed when the necessary sockets are created and connected in a stream
aStream.NotifyUserPlaneTransportSessionsError(NULL, aResult);
}
@@ -1197,8 +1194,7 @@
TInt TAVStreamStateWaitForSessions::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel,
- TL2CapConfig::TChannelPriority aPriority) const
+ CTransportChannel*& aChannel) const
{
LOG_FUNC
TInt ret = KErrNone;
@@ -1241,7 +1237,7 @@
if (ret == KErrNone)
{
- ret = b->iChannel->AttachTransportSession(aSession, aType, aPriority);
+ ret = b->iChannel->AttachTransportSession(aSession, aType);
if (ret==KErrNone)
{
// stream needs to remember binding
@@ -1281,12 +1277,11 @@
TInt TAVStreamStateWaitForSessionsStartReceived::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel,
- TL2CapConfig::TChannelPriority aPriority) const
+ CTransportChannel*& aChannel) const
{
LOG_FUNC
// Call the function from the parent class to bind the session
- TInt ret = TAVStreamStateWaitForSessions::AddSession(aStream,aType,aSession,aChannel, aPriority);
+ TInt ret = TAVStreamStateWaitForSessions::AddSession(aStream,aType,aSession,aChannel);
// if that worked, and all the channels are bound, we can now issue the delayed start
if((ret == KErrNone) && (!aStream.iNumSessionsRequired))