diff -r 40261b775718 -r efebd1779a59 devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.h
--- a/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.h	Tue Feb 02 01:56:55 2010 +0200
+++ b/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.h	Fri Apr 16 16:34:49 2010 +0300
@@ -47,7 +47,8 @@
 enum TMMFDevSoundSessionPanicCodes
 	{
 	EMsgQueueFailedToSendMsg =1,
-	EQueueRequestsFailedToAppend
+	EQueueRequestsFailedToAppend,
+	EUnexpectedAsyncOpCompleteHandlingCI
 	};
 
 // CLASS DECLARATION
@@ -1310,6 +1311,9 @@
 	 */
 	void PreemptionFinishedCallbackReceived(TBool aCanStartNewOperation);
 
+	// from MDevSoundAdaptationObserver
+	TBool AdaptorControlsContext() const;
+
 	/**
 		MDevSoundAdaptationObserver callback.
 		Indicates that a low layer operation completion
@@ -1486,6 +1490,7 @@
 	RArray<TMMFDevSoundRequest> iQueuedRequests;
 	TMMFDevSoundRequest			iRequestBeingServiced;
 	TBool						iOperationCompletePending;
+	TBool                       iHandlingExtdCI;
 	TBool						iPlayErrorOccured;
 	
 	//Check if the call of SetClientConfigL was alredy made