--- a/bluetooth/btstack/avdtp/avdtpStream.h	Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpStream.h	Wed Oct 13 15:48:34 2010 +0300
@@ -149,8 +149,7 @@
 	
 	TInt AddSession(TAvdtpTransportSessionType aType,
 					CUserPlaneTransportSession& aSession,
-					CTransportChannel*& aTransportChannel,
-					TL2CapConfig::TChannelPriority aPriority = TL2CapConfig::ELow);
+					CTransportChannel*& aTransportChannel);
 	void DropSession(TAvdtpTransportSessionType aType, CUserPlaneTransportSession& aSession);
 	void ClearSession(CUserPlaneTransportSession& aSession);
 
@@ -254,6 +253,7 @@
 	{
 public:
 	static CWatchdogTimer* NewL(CAVStream& aObserver);
+	~CWatchdogTimer();
 private:
 	CWatchdogTimer(CAVStream& aObserver);
 	void RunL();
@@ -304,8 +304,7 @@
 	virtual TInt AddSession(CAVStream& aStream, 
 							TAvdtpTransportSessionType aType,
 							CUserPlaneTransportSession& aSession,
-							CTransportChannel*& aTransportChannel,
-							TL2CapConfig::TChannelPriority aPriority) const;
+							CTransportChannel*& aTransportChannel) const;
 	virtual void DropSession(CAVStream& aStream, TAvdtpTransportSessionType aType,
 							 CUserPlaneTransportSession& aSession) const;
 	
@@ -400,8 +399,7 @@
 	virtual TInt AddSession(CAVStream& aStream,
 					TAvdtpTransportSessionType aType,
 					CUserPlaneTransportSession& aSession,
-					CTransportChannel*& aChannel,
-					TL2CapConfig::TChannelPriority aPriority) const;
+					CTransportChannel*& aChannel) const;
 	virtual void DropSession(CAVStream& aStream, TAvdtpTransportSessionType aType,
 					 CUserPlaneTransportSession& aSession) const;
 	virtual void SetConfigurationL(CAVStream& aStream, 
@@ -422,8 +420,7 @@
 	TInt AddSession(CAVStream& aStream, 
 							TAvdtpTransportSessionType aType,
 							CUserPlaneTransportSession& aSession,
-							CTransportChannel*& aTransportChannel,
-							TL2CapConfig::TChannelPriority aPriority) const;
+							CTransportChannel*& aTransportChannel) const;
 	virtual void Enter(CAVStream& aStream) const;
 private:
 	void TryToOpen(CAVStream& aStream) const;
@@ -444,8 +441,7 @@
 	virtual TInt AddSession(CAVStream& aStream,
 					TAvdtpTransportSessionType aType,
 					CUserPlaneTransportSession& aSession,
-					CTransportChannel*& aChannel,
-					TL2CapConfig::TChannelPriority aPriority) const;
+					CTransportChannel*& aChannel) const;
 				
 	virtual TInt StartReceived(CAVStream& aStream) const;
 	virtual void Enter(CAVStream& aStream) const;
@@ -459,8 +455,7 @@
 	virtual TInt AddSession(CAVStream& aStream,
 					TAvdtpTransportSessionType aType,
 					CUserPlaneTransportSession& aSession,
-					CTransportChannel*& aChannel,
-					TL2CapConfig::TChannelPriority aPriority) const;
+					CTransportChannel*& aChannel) const;
 	
 	virtual TInt StartReceived(CAVStream& aStream) const;
 	virtual void Enter(CAVStream& aStream) const;
@@ -500,8 +495,7 @@
 	virtual TInt AddSession(CAVStream& aStream,
 			TAvdtpTransportSessionType aType,
 			CUserPlaneTransportSession& aSession,
-			CTransportChannel*& aChannel,
-			TL2CapConfig::TChannelPriority aPriority) const;
+			CTransportChannel*& aChannel) const;
 	// next pertains to reconfiguration
 	void SetConfigurationL(CAVStream& aStream, 
 									RBuf8& aPacketBuffer,