--- a/bluetooth/btstack/avdtp/avdtpStreamStates.cpp Thu Jul 15 19:55:36 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpStreamStates.cpp Thu Aug 19 11:01:00 2010 +0300
@@ -254,7 +254,8 @@
TInt TAVStreamState::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/) const
+ CTransportChannel*& /*aTransportChannel*/,
+ TL2CapConfig::TChannelPriority /*aPriority*/) const
{
LOG_FUNC
DEBUGPANICINSTATE(EAvdtpUnexpectedAddSessionEvent);
@@ -490,7 +491,8 @@
TInt TAVStreamStateINTConfigured::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel) const
+ CTransportChannel*& aChannel,
+ TL2CapConfig::TChannelPriority aPriority) const
{
LOG_FUNC
TInt ret = KErrNone;
@@ -513,7 +515,7 @@
if (aChannel)
{
// bind session to channel
- ret = aChannel->AttachTransportSession(aSession, aType);
+ ret = aChannel->AttachTransportSession(aSession, aType, aPriority);
if (ret==KErrNone)
{
// keep a copy of this binding
@@ -774,7 +776,8 @@
TInt TAVStreamStateACPConfigured::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/) const
+ CTransportChannel*& /*aTransportChannel*/,
+ TL2CapConfig::TChannelPriority /*aPriority*/) const
{
LOG_FUNC
return KErrNotReady;
@@ -828,7 +831,8 @@
TInt TAVStreamStateReady::AddSession(CAVStream& /*aStream*/,
TAvdtpTransportSessionType /*aType*/,
CUserPlaneTransportSession& /*aSession*/,
- CTransportChannel*& /*aTransportChannel*/) const
+ CTransportChannel*& /*aTransportChannel*/,
+ TL2CapConfig::TChannelPriority /*aPriority*/) const
{
LOG_FUNC
#ifdef _DEBUG
@@ -919,7 +923,6 @@
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);
}
@@ -1194,7 +1197,8 @@
TInt TAVStreamStateWaitForSessions::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel) const
+ CTransportChannel*& aChannel,
+ TL2CapConfig::TChannelPriority aPriority) const
{
LOG_FUNC
TInt ret = KErrNone;
@@ -1237,7 +1241,7 @@
if (ret == KErrNone)
{
- ret = b->iChannel->AttachTransportSession(aSession, aType);
+ ret = b->iChannel->AttachTransportSession(aSession, aType, aPriority);
if (ret==KErrNone)
{
// stream needs to remember binding
@@ -1277,11 +1281,12 @@
TInt TAVStreamStateWaitForSessionsStartReceived::AddSession(CAVStream& aStream,
TAvdtpTransportSessionType aType,
CUserPlaneTransportSession& aSession,
- CTransportChannel*& aChannel) const
+ CTransportChannel*& aChannel,
+ TL2CapConfig::TChannelPriority aPriority) const
{
LOG_FUNC
// Call the function from the parent class to bind the session
- TInt ret = TAVStreamStateWaitForSessions::AddSession(aStream,aType,aSession,aChannel);
+ TInt ret = TAVStreamStateWaitForSessions::AddSession(aStream,aType,aSession,aChannel, aPriority);
// if that worked, and all the channels are bound, we can now issue the delayed start
if((ret == KErrNone) && (!aStream.iNumSessionsRequired))