--- a/devsound/a3facf/group/bld.inf	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3facf/group/bld.inf	Wed Jun 09 11:20:54 2010 +0300
@@ -40,6 +40,7 @@
 ../inc/mbuffersource.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/mbuffersource.h)
 ../inc/msynccisupport.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/msynccisupport.h)
 ../inc/tonedata.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/tonedata.h)
+../inc/mcontexteffectiveclient.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(a3f/mcontexteffectiveclient.h)
 
 // DEF FILES
 ../bwins/audiocontextfactory.def	/epoc32/include/def/bwins/audiocontextfactory.def

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devsound/a3facf/inc/mcontexteffectiveclient.h	Wed Jun 09 11:20:54 2010 +0300
@@ -0,0 +1,34 @@
+// Copyright (c) 2006-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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef MCONTEXTEFFECTIVECLIENT_H
+#define MCONTEXTEFFECTIVECLIENT_H
+
+#include <e32base.h>
+#include <a3f/a3fbase.h>
+
+const TUid KSetClientInfoUid = {0x2002C396};
+class MContextSetEffectiveClient
+    {
+public:
+    /**
+     * Add process id of effective client (usually the effective devsound client)
+     * @param aActualProcessId process id of actual/effective client
+     * @return An error code. KErrNone on success, otherwise one of the system wide error codes.
+     */
+    virtual TInt SetEffectiveClientInfo(const TProcessId& aActualProcessId) = 0;
+    };
+
+#endif // MCONTEXTEFFECTIVECLIENT_H

--- a/devsound/a3fdevsound/bwins/mmfdevsoundadaptor.def	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/bwins/mmfdevsoundadaptor.def	Wed Jun 09 11:20:54 2010 +0300
@@ -2,7 +2,7 @@
 	??1CMMFDevSoundAdaptation@@UAE@XZ @ 1 NONAME ; CMMFDevSoundAdaptation::~CMMFDevSoundAdaptation(void)
 	?CancelInitialize@CMMFDevSoundAdaptation@@QAEHXZ @ 2 NONAME ; int CMMFDevSoundAdaptation::CancelInitialize(void)
 	?Capabilities@CMMFDevSoundAdaptation@@QAEHAAVTMMFCapabilities@@@Z @ 3 NONAME ; int CMMFDevSoundAdaptation::Capabilities(class TMMFCapabilities &)
-	?ClientConfig@CMMFDevSoundAdaptation@@QBEABVTMMFClientConfig@@XZ @ 4 NONAME ; class TMMFClientConfig const & CMMFDevSoundAdaptation::ClientConfig(void) const
+	?ClientConfig@CMMFDevSoundAdaptation@@QBEABVTMMFClientConfig@@XZ @ 4 NONAME ABSENT ; class TMMFClientConfig const & CMMFDevSoundAdaptation::ClientConfig(void) const
 	?CloseDevSound@CMMFDevSoundAdaptation@@QAEHXZ @ 5 NONAME ; int CMMFDevSoundAdaptation::CloseDevSound(void)
 	?Config@CMMFDevSoundAdaptation@@QBE?AVTMMFCapabilities@@XZ @ 6 NONAME ; class TMMFCapabilities CMMFDevSoundAdaptation::Config(void) const
 	?CustomInterface@CMMFDevSoundAdaptation@@QAEPAXVTUid@@@Z @ 7 NONAME ; void * CMMFDevSoundAdaptation::CustomInterface(class TUid)
@@ -34,7 +34,7 @@
 	?RecordInitL@CMMFDevSoundAdaptation@@QAEXXZ @ 33 NONAME ; void CMMFDevSoundAdaptation::RecordInitL(void)
 	?SamplesPlayed@CMMFDevSoundAdaptation@@QAEHXZ @ 34 NONAME ; int CMMFDevSoundAdaptation::SamplesPlayed(void)
 	?SamplesRecorded@CMMFDevSoundAdaptation@@QAEHXZ @ 35 NONAME ; int CMMFDevSoundAdaptation::SamplesRecorded(void)
-	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTMMFClientConfig@@@Z @ 36 NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TMMFClientConfig const &)
+	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTProcessId@@@Z @ 36  NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TProcessId const &)
 	?SetConfigL@CMMFDevSoundAdaptation@@QAEXABVTMMFCapabilities@@@Z @ 37 NONAME ; void CMMFDevSoundAdaptation::SetConfigL(class TMMFCapabilities const &)
 	?SetDTMFLengths@CMMFDevSoundAdaptation@@QAEHAAVTTimeIntervalMicroSeconds32@@00@Z @ 38 NONAME ; int CMMFDevSoundAdaptation::SetDTMFLengths(class TTimeIntervalMicroSeconds32 &, class TTimeIntervalMicroSeconds32 &, class TTimeIntervalMicroSeconds32 &)
 	?SetGain@CMMFDevSoundAdaptation@@QAEHHAAH@Z @ 39 NONAME ; int CMMFDevSoundAdaptation::SetGain(int, int &)
@@ -56,4 +56,5 @@
 	?BufferErrorEvent@CMMFDevSoundAdaptation@@QAEXXZ @ 55 NONAME ; void CMMFDevSoundAdaptation::BufferErrorEvent(void)
 	?ProcessingError@CMMFDevSoundAdaptation@@QAEHAAH@Z @ 56 NONAME ; int CMMFDevSoundAdaptation::ProcessingError(int &)
 	?RollbackAdaptorActiveStateToBeforeCommit@CMMFDevSoundAdaptation@@QAEXXZ @ 57 NONAME ; void CMMFDevSoundAdaptation::RollbackAdaptorActiveStateToBeforeCommit(void)
+	?SetClientConfig@CMMFDevSoundAdaptation@@QAEHABVTProcessId@@0@Z @ 58  NONAME ; int CMMFDevSoundAdaptation::SetClientConfig(class TProcessId const &, class TProcessId const &)
 

--- a/devsound/a3fdevsound/eabi/mmfdevsoundadaptor.def	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/eabi/mmfdevsoundadaptor.def	Wed Jun 09 11:20:54 2010 +0300
@@ -17,7 +17,7 @@
 	_ZN22CMMFDevSoundAdaptation15GetPlayBalanceLERiS0_ @ 16 NONAME
 	_ZN22CMMFDevSoundAdaptation15PlayDTMFStringLERK7TDesC16 @ 17 NONAME
 	_ZN22CMMFDevSoundAdaptation15SamplesRecordedEv @ 18 NONAME
-	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK16TMMFClientConfig @ 19 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK16TMMFClientConfig @ 19 NONAME ABSENT
 	_ZN22CMMFDevSoundAdaptation15SetPlayBalanceLEiiRi @ 20 NONAME
 	_ZN22CMMFDevSoundAdaptation16CancelInitializeEv @ 21 NONAME
 	_ZN22CMMFDevSoundAdaptation17FixedSequenceNameEi @ 22 NONAME
@@ -44,7 +44,7 @@
 	_ZN22CMMFDevSoundAdaptationD0Ev @ 43 NONAME
 	_ZN22CMMFDevSoundAdaptationD1Ev @ 44 NONAME
 	_ZN22CMMFDevSoundAdaptationD2Ev @ 45 NONAME
-	_ZNK22CMMFDevSoundAdaptation12ClientConfigEv @ 46 NONAME
+	_ZNK22CMMFDevSoundAdaptation12ClientConfigEv @ 46 NONAME ABSENT
 	_ZNK22CMMFDevSoundAdaptation27GetSupportedInputDataTypesLER6RArrayI7TFourCCERK20TMMFPrioritySettings @ 47 NONAME
 	_ZNK22CMMFDevSoundAdaptation28GetSupportedOutputDataTypesLER6RArrayI7TFourCCERK20TMMFPrioritySettings @ 48 NONAME
 	_ZNK22CMMFDevSoundAdaptation6ConfigEv @ 49 NONAME
@@ -63,4 +63,6 @@
 	_ZN22CMMFDevSoundAdaptation16BufferErrorEventEv @ 62 NONAME
 	_ZN22CMMFDevSoundAdaptation15ProcessingErrorERi @ 63 NONAME
 	_ZN22CMMFDevSoundAdaptation40RollbackAdaptorActiveStateToBeforeCommitEv @ 64 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK10TProcessId @ 65 NONAME
+	_ZN22CMMFDevSoundAdaptation15SetClientConfigERK10TProcessIdS2_ @ 66 NONAME
 

--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -28,6 +28,7 @@
 #include <a3f/audiocontextfactory.h>
 #include <a3f/maudioprocessingunit.h>
 #include <a3f/maudiocontext.h>
+#include <a3f/mcontexteffectiveclient.h>
 #include <a3f/maudiostream.h>
 #include <a3f/maudiocodec.h>
 #include <a3f/maudiogaincontrol.h>
@@ -495,11 +496,6 @@
 	DP_IN();
 	TInt err(KErrNone);
 
-	if(	iActiveState != EDevSoundAdaptorInitialised_Initialised)
-		{
-		DP0_RET(KErrNotReady, "%d");
-		}
-
 	// Redo partial cancelling of initialization after pre-emption clash event in
 	// EDevSoundAdaptorRemovingProcessingUnits state.
 	if (iActiveState == EDevSoundAdaptorUnitialised_Uninitialised &&
@@ -508,7 +504,11 @@
 		err = iCurrentAudioControl->RemoveProcessingUnits();
 		DP0_RET(err, "%d");
 		}
-			
+	else if(iActiveState != EDevSoundAdaptorInitialised_Initialised)
+		{
+		DP0_RET(KErrNotReady, "%d");
+		}
+
 	err = iCurrentAudioControl->Uninitialize();
 	
 	DP0_RET(err, "%d");
@@ -557,18 +557,19 @@
 	{
 	return iPriorityFlag;
 	}
+
 // -----------------------------------------------------------------------------
 // CDevAudio::SetClientConfig
 // -----------------------------------------------------------------------------
 //
-TInt CDevAudio::SetClientConfig(const TMMFClientConfig& aClientConfig)
+TInt CDevAudio::SetClientConfig(const TProcessId& aProcessId)
 	{
 	DP_CONTEXT(CDevAudio::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
 	DP_IN();
 	// TODO: Check if the TClientContextSettings atributte go back since 
 	// if not there is no way to send the vendor id
 	TClientContextSettings context;
-	context.iProcessId = aClientConfig.iProcessId;
+	context.iProcessId = aProcessId;
 	TInt err = iAudioContext->SetClientSettings(context);
 	if (err != KErrNone)
 		{
@@ -577,6 +578,43 @@
 	DP0_RET(err, "%d");
 	}
 
+TInt CDevAudio::SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId)
+	{
+	DP_CONTEXT(CDevAudio::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+	DP_IN();
+	
+	MContextSetEffectiveClient* setEffectiveClient
+        = static_cast<MContextSetEffectiveClient*>(iAudioContext->Interface(KSetClientInfoUid));
+	
+	TInt err;
+	
+	if (!setEffectiveClient)
+	    {
+        DP0(DLINFO, "MContextSetEffectiveClient not supported, revert to old behaviour of just passing actual client info");
+        err = SetClientConfig(aActualProcessId);
+	    }
+	else
+	    {
+        TClientContextSettings context;
+        context.iProcessId = aProcessId;
+        err = iAudioContext->SetClientSettings(context);
+        if (err != KErrNone)
+            {
+            DP1(DLERR, "Error %d setting client context!",err);
+            }
+        if (!err)
+            {
+            err = setEffectiveClient->SetEffectiveClientInfo(aActualProcessId);
+            if (err != KErrNone)
+                {
+                DP1(DLERR, "Error %d setting effective client context!",err);
+                }
+            }
+	    }
+
+	DP0_RET(err, "%d");
+	}
+
 
 void CDevAudio::ContextEvent(TUid /*aEvent*/, TInt /*aError*/)
 	{

--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.h	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevaudio.h	Wed Jun 09 11:20:54 2010 +0300
@@ -143,10 +143,11 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+	* @param aProcessId DevSound's client process
+	* @param aActualProcessId DevSound's effective/actual client (supplied by SetClientThreadInfo)
 	*/
-	TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
+    TInt SetClientConfig(const TProcessId& aProcessId);
+    TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 
 	/**

--- a/devsound/a3fdevsound/src/devsoundadaptor/cdevcommoncontrol.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/cdevcommoncontrol.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -107,10 +107,6 @@
     DP_IN();
     
     TInt err = KErrNone;
-    if(iDevAudio->iActiveState != EDevSoundAdaptorPaused_Primed)
-        {
-        err = KErrNotReady;
-        }
 
     //If following condition is true, then we are here because of a
     //pre-emption clash in last Commit cycle started from
@@ -121,6 +117,10 @@
 		err = Unload();
 		DP0_RET(err,"%d");
     	}
+    else if(iDevAudio->iActiveState != EDevSoundAdaptorPaused_Primed)
+        {
+        DP0_RET(KErrNotReady, "%d");
+        }
 
     if(err == KErrNone)
         {

--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -750,27 +750,23 @@
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TInt CMMFDevSoundAdaptation::SetClientConfig(
-								const TMMFClientConfig& aClientConfig)
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	TInt retVal = iBody->SetClientConfig(aClientConfig);
-	DP0_RET(retVal, "%d");
-	}
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
+    TInt retVal = iBody->SetClientConfig(aProcessId);
+    DP0_RET(retVal, "%d");
+    }
 
-// -----------------------------------------------------------------------------
-// CMMFDevSoundAdaptation::ClientConfig
-// Returns client capabilities of this instance of DevSound Adaptation.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TMMFClientConfig& CMMFDevSoundAdaptation::ClientConfig() const
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::ClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	DP_OUT();
-	return(iBody->ClientConfig());
-	}
+EXPORT_C TInt CMMFDevSoundAdaptation::SetClientConfig(
+                                const TProcessId& aActualProcessId,
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
+    TInt retVal = iBody->SetClientConfig(aActualProcessId, aProcessId);
+    DP0_RET(retVal, "%d");
+    }
 
 // -----------------------------------------------------------------------------
 // CMMFDevSoundAdaptation::EmptyBuffers

--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.h	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptation.h	Wed Jun 09 11:20:54 2010 +0300
@@ -252,21 +252,6 @@
 
 	};
 
-
-/**
-@publishedAll
-@released
-*  A class representing client application information.
-*
-*  @lib MmfDevSoundAdaptation.lib
-*  @since
-*/
-class TMMFClientConfig
-	{
-	public:
-		TProcessId                  iProcessId; //<<< Application Process Id
-	};
-
 // CLASS DECLARATION
 
 /**
@@ -827,18 +812,12 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+    * @param aActualProcessId the effective devsound client (supplied with SetClientThreadInfo)
+    * @param aProcessId the client of DevSound
 	* @return KErrNone if successful, system wide error otherwise
 	*/
-	IMPORT_C TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
-
-	/**
-	* Returns client configuration
-	* @since
-	* @return void
-	*/
-	IMPORT_C const TMMFClientConfig& ClientConfig() const;
+    IMPORT_C TInt SetClientConfig(const TProcessId& aProcessId);
+    IMPORT_C TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 	/**
 	* Empties the buffers below DevSound without deleting the codec.

--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -1004,33 +1004,25 @@
 // -----------------------------------------------------------------------------
 //
 TInt CMMFDevSoundAdaptation::CBody::SetClientConfig(
-								const TMMFClientConfig& aClientConfig)
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
+                                const TProcessId& aActualProcessId,
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
 
-	TInt err = iDevAudio->SetClientConfig(aClientConfig);
-	if (err == KErrNone)
-		{
-		iClientConfig = aClientConfig;
-		}
-	DP0_RET(err, "%d");
-	}
+    TInt err = iDevAudio->SetClientConfig(aActualProcessId, aProcessId);
+    DP0_RET(err, "%d");
+    }
 
-// -----------------------------------------------------------------------------
-// TMMFClientConfig& CMMFDevSoundAdaptation::CBody::ClientConfig
-// Returns client capabilities of this instance of DevSound Adaptation.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const TMMFClientConfig& CMMFDevSoundAdaptation::CBody::ClientConfig() const
-	{
-	DP_CONTEXT(CMMFDevSoundAdaptation::CBody::ClientConfig *CD1*, CtxDevSound, DPLOCAL);
-	DP_IN();
-	DP_OUT();
-	return iClientConfig;
-	}
+TInt CMMFDevSoundAdaptation::CBody::SetClientConfig(
+                                const TProcessId& aProcessId)
+    {
+    DP_CONTEXT(CMMFDevSoundAdaptation::CBody::SetClientConfig *CD1*, CtxDevSound, DPLOCAL);
+    DP_IN();
 
+    TInt err = iDevAudio->SetClientConfig(aProcessId);
+    DP0_RET(err, "%d");
+    }
 
 TBool CMMFDevSoundAdaptation::CBody::CloseDevSound()
 	{

--- a/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.h	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/devsoundadaptor/mmfdevsoundadaptationbody.h	Wed Jun 09 11:20:54 2010 +0300
@@ -590,19 +590,12 @@
 	/**
 	* Sets client configuration
 	* @since
-	* @param TMMFClientConfig& aClientConfig A reference to client
-	*        configuration object.
+	* @param aActualProcessId the effective devsound client (supplied with SetClientThreadInfo)
+	* @param aProcessId the client of DevSound
 	* @return KErrNone if successful, system wide error otherwise
 	*/
-	TInt SetClientConfig(const TMMFClientConfig& aClientConfig);
-
-	/**
-	* Returns client configuration
-	* @since
-	* @return const TMMFClientConfig& A constant reference to client
-	*        configuration.
-	*/
-	const TMMFClientConfig& ClientConfig() const;
+    TInt SetClientConfig(const TProcessId& aProcessId);
+    TInt SetClientConfig(const TProcessId& aActualProcessId, const TProcessId& aProcessId);
 
 	/**
 	* Return to idle state, preparing for destruction.
@@ -709,11 +702,6 @@
 	TMMFCapabilities iMmfConfig;
 
 	/**
-	* holds client platsec related information (VID,SID,PID,caps)
-	*/
-	TMMFClientConfig iClientConfig;
-
-	/**
 	* holds client audio type information
 	*/
 	TMMFPrioritySettings iPrioritySettings;

--- a/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/devsound/a3fdevsound/src/mmfdevsoundserver/mmfdevsoundsession.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -2314,11 +2314,20 @@
 				static_cast<const CMMFDevSoundServer*>(Server()));
 			
 		ASSERT(server); // session should always have a server!
+		
+		TProcessId actualProcessId = server->ActualProcessId();
+		TProcessId processId = server->ProcessId();
+		
+		if (actualProcessId!=processId)
+		    {
+            // we have a differing actual process id, so pass that to the adaptor too
+            err = iAdapter->SetClientConfig(actualProcessId, processId);
+		    }
+		else
+		    {
+            err = iAdapter->SetClientConfig(processId);
+		    }
 
-		TMMFClientConfig clientConfig;
-		clientConfig.iProcessId = server->ActualProcessId();
-
-		err = iAdapter->SetClientConfig(clientConfig);
 		if (!err)
 			{
 			iSetClientConfigApplied = ETrue;

--- a/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def	Tue May 25 14:20:15 2010 +0300
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/bwins/imageprocessor.def	Wed Jun 09 11:20:54 2010 +0300
@@ -164,4 +164,6 @@
 	?ZoomL@TPreview@ImageProcessor@@QBEMXZ @ 163 NONAME ; float ImageProcessor::TPreview::ZoomL(void) const
 	??1CImgProcessor@ImageProcessor@@UAE@XZ @ 164 NONAME ; ImageProcessor::CImgProcessor::~CImgProcessor(void)
 	?SetInputL@CImgProcessor@ImageProcessor@@QAEXAAVCImagePanorama@@@Z @ 165 NONAME ; void ImageProcessor::CImgProcessor::SetInputL(class CImagePanorama &)
+	?Extension@TInputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 166 NONAME ; void * ImageProcessor::TInputInfo::Extension(class TUid) const
+	?Extension@TOutputInfo@ImageProcessor@@QBEPAXVTUid@@@Z @ 167 NONAME ; void * ImageProcessor::TOutputInfo::Extension(class TUid) const
 

--- a/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def	Tue May 25 14:20:15 2010 +0300
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/eabi/imageprocessor.def	Wed Jun 09 11:20:54 2010 +0300
@@ -168,4 +168,6 @@
 	_ZN14ImageProcessor13CImgProcessorD1Ev @ 167 NONAME
 	_ZN14ImageProcessor13CImgProcessorD2Ev @ 168 NONAME
 	_ZN14ImageProcessor13CImgProcessor9SetInputLER14CImagePanorama @ 169 NONAME
+	_ZNK14ImageProcessor10TInputInfo9ExtensionE4TUid @ 170 NONAME
+	_ZNK14ImageProcessor11TOutputInfo9ExtensionE4TUid @ 171 NONAME
 

--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessorinputinfo.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -135,6 +135,18 @@
 	return iInputInfoImpl.HasAlphaL();
 	}
 
-	}//namespace ImageProcessor
+
+/**
+Retrieves access to a custom extension.
+
+@param  aExtension
+        The UID of the extension to be retrieved
 
+@return Extension corresponding to the UID given as a parameter.
+*/
+EXPORT_C TAny* TInputInfo::Extension(TUid /*aExtension*/) const 
+    {
+    return NULL;    
+    }
+    }//namespace ImageProcessor
 //EOF

--- a/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/imagingandcamerafws/imagingfws/ImageProcessor/src/imageprocessoroutputinfo.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -53,6 +53,17 @@
 	iOutputInfoImpl.SetSamplingL(aSampling);
 	}
 
-	}//namespace ImageProcessor
+/**
+Retrieves access to a custom extension.
+
+@param  aExtension
+        The UID of the extension to be retrieved
 
+@return Extension corresponding to the UID given as a parameter.
+*/
+EXPORT_C TAny* TOutputInfo::Extension(TUid /*aExtension*/) const
+    {
+    return NULL;    
+    }
+    }//namespace ImageProcessor
 //EOF

--- a/mdfdevvideoextensions/nga_mdf_postprocessor/inc/NGAPostProcHwDevice.h	Tue May 25 14:20:15 2010 +0300
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/inc/NGAPostProcHwDevice.h	Wed Jun 09 11:20:54 2010 +0300
@@ -1092,6 +1092,8 @@
 	MMmfVideoPropertiesObserver*				iVPObserver;
 	RWsSession									iWsSession;
 	TSize										iPicSize;
+	TUint										iAspectRatioNum;
+	TUint										iAspectRatioDenom;
 	//-- members for Trickplay support --
 	TInt                                iStepFrameCount;
     TInt                                iPlayRate;       

--- a/mdfdevvideoextensions/nga_mdf_postprocessor/inc/surface_hints.h	Tue May 25 14:20:15 2010 +0300
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/inc/surface_hints.h	Wed Jun 09 11:20:54 2010 +0300
@@ -12,12 +12,17 @@
 * Contributors:
 *
 * Description:
-*
+* Surface Manager API
 */
 
 #ifndef __SURFACE_HINTS_LOCAL_H__
 #define __SURFACE_HINTS_LOCAL_H__
 
+//- Include Files  ----------------------------------------------------------
+
+#include <e32cmn.h>
+
+
 //- Namespace ---------------------------------------------------------------
 
 namespace surfaceHints
@@ -25,7 +30,7 @@
 
 //- Constants ---------------------------------------------------------------
 
-/** Hint of surface the content.
+/** Hint of the surface content.
     @see TSurfaceContent for possible values
 */
 const TInt KSurfaceContent = 0x1;
@@ -37,17 +42,37 @@
 */
 const TInt KSurfaceUpdate = 0x2;
 
-/** Hint of the surface content copy protected and can it be
+/** Hint whether the surface content is copy protected and can it be
     shown on external displays.
     @see TSurfaceProtection for possible values.
 */
 const TInt KSurfaceProtection = 0x3;
 
-/** Hint of the color space of the surface content.
-    Value is a pointer to TColorspace stucture.
-    @see TColorspace
-*/
-const TInt KSurfaceColorspace = 0x4;
+
+/** Values used for the KSurfaceContent key */
+enum TSurfaceContent
+    {
+    /** No specific use-case */
+    EGeneric,
+    /** Camera viewfinder frames */
+    EViewFinder,
+    /** Images captured by camera */
+    EStillImage,
+    /** Decoded video frames */
+    EVideoPlayback,
+    /** Video frames from video telephony */
+    EVideoTelephony,
+    /** EGL surface */
+    EGfx,
+    /** Main UI surface */
+    EUi,
+    /** Composition target surface */
+    ECompositionTarget,
+    /** Indicates that the surface has to accessible by ARM.
+        This can be orr'ed with other TSurfaceContent enumerations. */
+    EArmAccess = 0x80000000
+    };
+
 
 /** Values used for the KSurfaceProtection key. The values are bitmasks and can be combined
 * e.g. EAllowAnalogProtectionRequired | EAllowDigitalProtectionRequired.
@@ -95,6 +120,72 @@
     EAllowDigitalProtectionRequired     = 0x00000800,
     };
 
+
+class TSurfaceUpdate
+    {
+    /** Constructor.
+        @param aUpdateRate   How often the surface content is redrawn per second.
+        @param aTearingFree  When ETrue surface updates should be synchronized
+                             with display refresh rate, otherwise surface can
+                             be updated as fast as possible.
+    */
+    inline TSurfaceUpdate(TUint aUpdateRate, TBool aTearingFree);
+
+    /** Converts a value to TSurfaceUpdate */
+    inline TSurfaceUpdate(TInt aValue);
+
+    /** Converts TSurfaceUpdate to a signed integer, so it can be used as
+        a value for KSurfaceUpdate key. */
+    inline operator TInt() const;
+
+    /** Getter for surface update rate.
+        @return updates per second
+    */
+    inline TUint UpdateRate() const;
+
+    /** Getter for surface update synchronization.
+        @return ETrue - updates should be synchronized with display refresh rate,
+                EFalse - surface can be updated as fast as possible.
+    */
+    inline TBool TearingFree() const;
+
+    private:
+        TUint iValue;
+    };
+
+
+//- Forward Declarations ----------------------------------------------------
+
+
+//- Class Definitions -------------------------------------------------------
+
+
+//- Inline Functions --------------------------------------------------------
+
+TSurfaceUpdate::TSurfaceUpdate(TUint aUpdateRate, TBool aTearingFree)
+    : iValue( ( aUpdateRate & 0xFFFF ) | ( aTearingFree ? 0x80000000 : 0x0 ) )
+    {
+    }
+TSurfaceUpdate::TSurfaceUpdate(TInt aValue)
+    : iValue( static_cast<TUint>( aValue ) )
+    {
+    }
+
+TSurfaceUpdate::operator TInt() const
+    {
+    return static_cast<TInt>( iValue );
+    }
+
+TUint TSurfaceUpdate::UpdateRate() const
+    {
+    return ( iValue & 0xFFFF );
+    }
+
+TBool TSurfaceUpdate::TearingFree() const
+    {
+    return ( iValue & 0x80000000 ) ? ETrue : EFalse;
+    }
+
 }; //namespace surfaceHints
 
 #endif //__SURFACE_HINTS_LOCAL_H__

--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Tue May 25 14:20:15 2010 +0300
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -107,6 +107,8 @@
             iVideoSurfaceObserver(NULL),
             iVPObserver(NULL),
             iPicSize(0,0),
+			iAspectRatioNum(1),
+			iAspectRatioDenom(1),
             iStepFrameCount(0),
             iPlayRate(KDefPlayRate),
             iKeyFrameMode(EFalse),
@@ -180,7 +182,12 @@
     	if(!iSurfaceId.IsNull())
     	{
     		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::UnregisterSurface"), this);
-    		iWsSession.UnregisterSurface(0, iSurfaceId);
+			TInt numScreens = iWsSession.NumberOfScreens();
+    		for(TInt i=0;i < numScreens;i++)
+    		{
+    			iWsSession.UnregisterSurface(i, iSurfaceId);
+    		}
+    		iWsSession.Flush();
         	iSurfaceHandler->DestroySurface(iSurfaceId);
     	}
         delete iSurfaceHandler;
@@ -1414,10 +1421,12 @@
 		{
 			aCropRect.Intersection( iPicSize);
 		}
-	aPixelAspectRatio = TVideoAspectRatio(1,1);
-	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()--  \
-		cropRectWidth = %d cropRectHeight = %d --"), this, aCropRect.Width(), aCropRect.Height());
-
+	aPixelAspectRatio = TVideoAspectRatio(iAspectRatioNum,iAspectRatioDenom);
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()  \
+		cropRectWidth = %d cropRectHeight = %d"), this, aCropRect.Width(), aCropRect.Height());
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL()  \
+		PAR Num = %d PAR Denom = %d"), this, aPixelAspectRatio.iNumerator, aPixelAspectRatio.iDenominator);
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssGetSurfaceParametersL() --"), this);
 }
 
 void CNGAPostProcHwDevice::MmvssSurfaceRemovedL(const TSurfaceId& aSurfaceId)
@@ -1426,10 +1435,20 @@
 	if(!aSurfaceId.IsNull())
 	{
 		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssSurfaceRemovedL(): UnregisterSurface ID = 0x%x"), this, aSurfaceId );
-		iWsSession.UnregisterSurface(0, aSurfaceId);
+		TInt numScreens = iWsSession.NumberOfScreens();
+		for(TInt i=0;i < numScreens;i++)
+		{
+			iWsSession.UnregisterSurface(i, aSurfaceId);
+		}
+		iWsSession.Flush();
 		iSurfaceHandler->DestroySurface(aSurfaceId);
+		if(iSurfaceId == aSurfaceId)
+		{
+			iSurfaceCreatedEventPublished = EFalse;
+			iSurfaceId = TSurfaceId::CreateNullId();
+			iChunk.Close();
+		}
 	}
-		
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssSurfaceRemovedL() --"), this);
 }
 
@@ -1441,7 +1460,9 @@
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvpoUpdateVideoProperties PAR \
 		iAspectRatioNum = %d, iAspectRatioDenom = %d"), this,
 					 aYuvFormat.iAspectRatioNum,aYuvFormat.iAspectRatioDenom);
-					 iPicSize = aPictureSize;
+	iPicSize = aPictureSize;
+	iAspectRatioNum = aYuvFormat.iAspectRatioNum;
+	iAspectRatioDenom = aYuvFormat.iAspectRatioDenom;
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvpoUpdateVideoProperties Picture Size \
 		iWidth = %d, iHeight = %d, iSurfaceCreatedEventPublished = %d"), 
 		this, iPicSize.iWidth,iPicSize.iHeight, iSurfaceCreatedEventPublished?1:0);
@@ -1523,22 +1544,13 @@
 {
     PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface ++"), this);
 	
-	TSize 			surfaceSize; 
     TUint8*         lPtr;
     TInt 			offset;
-    if(iPicSize.iWidth > iPicSize.iHeight)
-    {
-    	surfaceSize.iWidth = iPicSize.iWidth;
-    	surfaceSize.iHeight = iPicSize.iWidth;
-    }
-    else
-    {
-    	surfaceSize.iWidth = iPicSize.iHeight;
-    	surfaceSize.iHeight = iPicSize.iHeight;
-    }
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface -- Creating %d x %d surface"), this, iPicSize.iWidth, iPicSize.iHeight);
 
    	TInt err = KErrNone;
-	SetSurfaceAttributes(surfaceSize, 1); 
+	SetSurfaceAttributes(iPicSize, 1); 
 	
   	err = iSurfaceHandler->CreateSurface(iAttributes, iSurfaceId);
   	if (err != KErrNone)
@@ -1548,6 +1560,36 @@
 		iProxy->MdvppFatalError(this, err);	   				
 	    return;
 	}
+
+	err = iSurfaceHandler->SurfaceInfo(iSurfaceId, iInfo);
+	if (err != KErrNone)
+	{
+	   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface -- failed to get Surface info %d"), 
+	   				this, err);
+	   	iSurfaceHandler->DestroySurface(iSurfaceId);
+	   	iSurfaceId = TSurfaceId::CreateNullId();
+		iProxy->MdvppFatalError(this, err);	   				
+	    return;
+	}
+
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface() \
+		surfaceWidth = %d surfaceHeight = %d surfaceStride = %d"), this, iInfo().iSize.iWidth, iInfo().iSize.iHeight, iInfo().iStride);
+
+	TInt redrawBufferSize = aRedrawBuffer.Size();
+	TInt surfaceSize = iInfo().iStride * iInfo().iSize.iHeight;
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface RedrawBuffer size= %d Surface size = %d"), this, redrawBufferSize, surfaceSize);
+
+	// Check whether redraw buffer will fit onto the surface.
+	// If this check fails then we won't raise a fatal error - We just won't create the redraw surface
+	if (redrawBufferSize > surfaceSize)
+	{
+    	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface Redraw buffer size larger than surface size"), this);
+    	iSurfaceHandler->DestroySurface(iSurfaceId);
+	   	iSurfaceId = TSurfaceId::CreateNullId();
+    	return;
+	}
+
 	err = iSurfaceHandler->MapSurface(iSurfaceId, iChunk);
 	if (err != KErrNone)
 	{
@@ -1558,19 +1600,6 @@
 		iProxy->MdvppFatalError(this, err);	   				
 	    return;
 	}
-	err = iSurfaceHandler->SurfaceInfo(iSurfaceId, iInfo);
-	if (err != KErrNone)
-	{
-	   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface -- failed to get Surface info %d"), 
-	   				this, err);
-	   	iSurfaceHandler->DestroySurface(iSurfaceId);
-	   	iSurfaceId = TSurfaceId::CreateNullId();
-		iChunk.Close();
-		iProxy->MdvppFatalError(this, err);	   				
-	    return;
-	}
-	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvshcRedrawBufferToSurface() \
-		surfaceWidth = %d surfaceHeight = %d --"), this, iInfo().iSize.iWidth, iInfo().iSize.iHeight);
 
     if((err = iSurfaceHandler->GetBufferOffset(iSurfaceId, 0, offset)) != KErrNone)
     {
@@ -1581,18 +1610,23 @@
     	iProxy->MdvppFatalError(this, err);
     	return;
     }
-    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface offset = %d aRedrawBuffer.Size()= %d  --"), this, offset, aRedrawBuffer.Size());
-    
+
+    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface offset = %d"), this, offset);
+
 	lPtr = reinterpret_cast<TUint8*>(iChunk.Base() + offset);
-	memcpy((TAny *)lPtr, (TAny *)aRedrawBuffer.Ptr(), aRedrawBuffer.Size());
+	memcpy((TAny *)lPtr, (TAny *)aRedrawBuffer.Ptr(), redrawBufferSize);
 
 	iRedrawSurfaceInUse = ETrue;
 
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface(): New surface = 0x%x"), this, iSurfaceId);
+
     PP_DEBUG(_L("CNGAPostProcHwDevice[%x]::MmvshcRedrawBufferToSurface error = %d --"), this, err);
 }
 
 TInt CNGAPostProcHwDevice::SetupExternalSurface(const TSurfaceId &aSurfaceID)
 {
+	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface(): aSurfaceID = 0x%x"), this, aSurfaceID );
+
     TInt err = KErrNone;
     
     if(!iSurfaceId.IsNull())
@@ -1607,7 +1641,12 @@
 		{
 			// We never told the client about the surface, so we must destroy it ourselves
 			PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:SetupExternalSurface - Destroying old surface"), this);
-   			iWsSession.UnregisterSurface(0, iSurfaceId);
+			TInt numScreens = iWsSession.NumberOfScreens();
+    		for(TInt i=0;i < numScreens;i++)
+    		{
+    			iWsSession.UnregisterSurface(i, iSurfaceId);
+    		}
+   			iWsSession.Flush();
 			iSurfaceHandler->DestroySurface(iSurfaceId);
 		}
 
@@ -2060,7 +2099,13 @@
 TInt CNGAPostProcHwDevice::RegisterSurface(const TSurfaceId& aSurfaceId)
 {
 	PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:RegisterSurface(): RegisterSurface ID = 0x%x"), this, aSurfaceId);
-	return(iWsSession.RegisterSurface(0, aSurfaceId));
+	TInt err = KErrNone;
+	TInt numScreens = iWsSession.NumberOfScreens();
+	for(TInt i=0; (i < numScreens && err == KErrNone); i++)
+	{
+		err = iWsSession.RegisterSurface(i, aSurfaceId);
+	}	
+	return(err);
 }
 
 TInt CNGAPostProcHwDevice::IsGceReady()
@@ -2291,6 +2336,16 @@
 		err = iSurfaceHandler->SetSurfaceHint(iSurfaceId,iHint);
    }
    PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:AddHints. err = %d --"), this,err);
+   iHint.iKey.iUid = surfaceHints::KSurfaceContent;
+   iHint.iValue = surfaceHints::EVideoPlayback;
+   iHint.iMutable = ETrue;
+   err = iSurfaceHandler->AddSurfaceHint(iSurfaceId,iHint);
+   if(err == KErrAlreadyExists)
+   {
+		err = KErrNone;
+		err = iSurfaceHandler->SetSurfaceHint(iSurfaceId,iHint);
+   }
+   PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:AddHints. err = %d --"), this,err);
    return err;
 }
 

--- a/mm_plat/audio_routing_api/inc/AudioOutput.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/audio_routing_api/inc/AudioOutput.h	Wed Jun 09 11:20:54 2010 +0300
@@ -25,7 +25,7 @@
 #include <mdaaudiotoneplayer.h>
 #include <mdaaudiooutputstream.h>
 #include <midiclientutility.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 // FORWARD DECLARATIONS
 class MAudioOutputObserver;

--- a/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioInputProxy.h	Wed Jun 09 11:20:54 2010 +0300
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include "AudioInput.h"
 #include <mmf/common/mmfcontrollerframework.h>
-#include <mcustomcommand.h>
+#include <MCustomCommand.h>
 // FORWARD DECLARATIONS
 class CCustomCommandUtility;
 class CCustomInterfaceUtility;

--- a/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/audio_routing_proxy_api/inc/AudioOutputProxy.h	Wed Jun 09 11:20:54 2010 +0300
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include "AudioOutput.h"
 #include <mmf/common/mmfcontrollerframework.h>
-#include <mcustomcommand.h>
+#include <MCustomCommand.h>
 
 // FORWARD DECLARATIONS
 class CCustomCommandUtility;

--- a/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/custom_interface_proxy_factory_api/inc/CustomInterfaceProxyFactory.h	Wed Jun 09 11:20:54 2010 +0300
@@ -19,7 +19,7 @@
 #define __CUSTOMINTERFACEPROXYFACTORY_H
 
 #include <e32std.h>
-#include <mcustomcommand.h>
+#include <MCustomCommand.h>
 #include <CustomInterfaceUtility.h>
 
 class CCustomInterfaceProxyFactory

--- a/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/custom_interface_utility_api/inc/CustomCommandUtility.h	Wed Jun 09 11:20:54 2010 +0300
@@ -20,7 +20,7 @@
 #define __CUSTOMCOMMANDUTILITY_H
 
 #include <e32base.h>
-#include <mcustomcommand.h>
+#include <MCustomCommand.h>
 //#include "CustomCommandTypes.h"
 
 

--- a/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_plat/custom_interface_utility_api/inc/CustomInterfaceUtility.h	Wed Jun 09 11:20:54 2010 +0300
@@ -19,7 +19,7 @@
 #define __CUSTOMINTERFACEUTILITY_H
 
 #include <e32base.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 //#include "CustomCommandTypes.h"
 #include <CustomCommandUtility.h>
 class CProxyCustomInterfaceUtility;

--- a/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/AudioEqualizerBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <AudioEqualizerData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 
 const TUid KUidAudioEqualizerEffect = {0x1020382A};

--- a/mm_pub/audio_effects_api/inc/BassBoostBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/BassBoostBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <BassBoostData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidBassBoostEffect = {0x10203827};
 

--- a/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/DistanceAttenuationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <DistanceAttenuationData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 
 const TUid KUidDistanceAttenuationEffect = {0x1020382C};

--- a/mm_pub/audio_effects_api/inc/DopplerBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/DopplerBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <DopplerData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 // CLASS DECLARATION
 

--- a/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/EnvironmentalReverbBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <EnvironmentalReverbData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidEnvironmentalReverbEffect = {0x10203837};
 

--- a/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/ListenerDopplerBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <DopplerBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidListenerDopplerEffect = {0x10207B16};
 

--- a/mm_pub/audio_effects_api/inc/ListenerLocationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/ListenerLocationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <LocationBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidListenerLocationEffect = {0x1020382D};
 

--- a/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/ListenerOrientationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <OrientationBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidListenerOrientationEffect = {0x1020382E};
 

--- a/mm_pub/audio_effects_api/inc/LoudnessBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/LoudnessBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <LoudnessData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidLoudnessEffect = {0x10207AA8};
 

--- a/mm_pub/audio_effects_api/inc/OrientationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/OrientationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <OrientationData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 // CLASS DECLARATION
 

--- a/mm_pub/audio_effects_api/inc/RoomLevelBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/RoomLevelBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <RoomLevelData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidRoomLevelEffect = {0x10207B3C};
 

--- a/mm_pub/audio_effects_api/inc/SourceDopplerBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/SourceDopplerBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <DopplerBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidSourceDopplerEffect = {0x10207B15};
 

--- a/mm_pub/audio_effects_api/inc/SourceLocationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/SourceLocationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <LocationBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidSourceLocationEffect = {0x10203835};
 

--- a/mm_pub/audio_effects_api/inc/SourceOrientationBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/SourceOrientationBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <OrientationBase.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidSourceOrientationEffect = {0x10203834};
 

--- a/mm_pub/audio_effects_api/inc/StereoWideningBase.h	Tue May 25 14:20:15 2010 +0300
+++ b/mm_pub/audio_effects_api/inc/StereoWideningBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <AudioEffectBase.h>
 #include <StereoWideningData.h>
-#include <mcustominterface.h>
+#include <MCustomInterface.h>
 
 const TUid KUidStereoWideningEffect = {0x10203836};
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmapitest/devsoundexthaitest/common/inc/DataWrapperBase.h	Wed Jun 09 11:20:54 2010 +0300
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2005-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+
+#ifndef DATA_WRAPPER_BASE_H
+#define DATA_WRAPPER_BASE_H
+
+//	EPOC includes
+#include <datawrapper.h>
+#define SECS_TO_MS(x)  (x*1000000)
+
+_LIT(KConsname,				"Test Console");
+
+class CDataWrapperBase : public CDataWrapper
+	{
+public:
+	class TEnumEntryTable
+		{
+	public:
+		const TDesC&	iString;
+		TInt			iValue;
+		};
+
+public:
+	TBool					GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
+	TBool					GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
+	TBool GetRealFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TReal& aResult);
+	TBool					GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
+	TBool					GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
+	TBool					GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult);
+	TBool					GetArrayRectFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult);
+	TBool 					KeyPress();
+	void 					Timedelay(TInt aTimeoutInSecs);
+	virtual void			InitialiseL();
+	inline RFs&				FileServer() { return iFs; }
+	inline CConsoleBase*	GetConsole() { return(Console::NewL(KConsname,TSize(KConsFullScreen,KConsFullScreen)));}
+	TBool					GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult);
+
+protected:
+	CDataWrapperBase();
+	virtual ~CDataWrapperBase();
+
+private:
+	TBool	GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
+	TBool 	KeyCheck();
+
+private:
+	// Included ini files
+	RPointerArray<CIniData>	iInclude;
+	RPointerArray<HBufC>	iBuffer;
+	RFs                     iFs;
+	RTimer					iTimer;
+	};
+
+#endif // DATA_WRAPPER_BASE_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmapitest/devsoundexthaitest/common/src/DataWrapperBase.cpp	Wed Jun 09 11:20:54 2010 +0300
@@ -0,0 +1,447 @@
+/*
+* Copyright (c) 2005-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#include "datawrapperbase.h"
+
+/*@{*/
+///	Constant Literals used.
+_LIT(KPrefixHex,			"0x");
+_LIT(KPrefixOctal,			"0");
+_LIT(KSuffixBinary,			"b");
+
+_LIT(KIncludeSection,		"include");
+_LIT(KFile,					"file%d");
+_LIT(KMatch,				"*{*,*}*");
+_LIT(KStart,				"{");
+_LIT(KSeparator,			",");
+_LIT(KEnd,					"}");
+_LIT(KDataRead,				"INI READ : %S %S %S");
+
+/*@}*/
+
+CDataWrapperBase::CDataWrapperBase()
+:	CDataWrapper()
+	{
+	}
+
+/**
+ * Public destructor
+ */
+CDataWrapperBase::~CDataWrapperBase()
+	{
+	iInclude.ResetAndDestroy();
+	iBuffer.ResetAndDestroy();
+	iFs.Close();
+	}
+
+void CDataWrapperBase::InitialiseL()
+	{
+	iTimer.CreateLocal();
+	CDataWrapper::InitialiseL();
+	TBuf<KMaxTestExecuteCommandLength>	tempStore;
+	TPtrC		fileName;
+	TBool		moreData=ETrue;
+	TBool		index=0;
+	while ( moreData )
+		{
+		tempStore.Format(KFile(), ++index);
+		moreData=GetStringFromConfig(KIncludeSection, tempStore, fileName);
+
+		if (moreData)
+			{
+			CIniData*	iniData=CIniData::NewL(fileName);
+			CleanupStack::PushL(iniData);
+			iInclude.Append(iniData);
+			CleanupStack::Pop(iniData);
+			}
+		}
+	User::LeaveIfError(iFs.Connect());
+	}
+
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TBool reference passed in possible values TRUE, FALSE
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - The value of the boolean
+ * @return TBool - ETrue for found, EFalse for not found 
+ */
+TBool CDataWrapperBase::GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult)
+	{
+	TBool	ret=EFalse;
+	TPtrC	result;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+	if ( ret )
+		{
+		_LIT(KTrue,"true");
+		aResult=(result.FindF(KTrue) != KErrNotFound);
+		}
+
+	return ret;
+	}
+
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TInt reference passed in
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - The value of the integer
+ * @return TBool - ETrue for found, EFalse for not found 
+ */
+TBool CDataWrapperBase::GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
+	{
+	TPtrC	result;
+	TBool	ret=EFalse;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+	if ( ret )
+		{
+		TLex	lex(result);
+		ret=(lex.Val(aResult)==KErrNone);
+		}
+
+	return ret;
+	}
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TReal reference passed in
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - The value of the real
+ * @return TBool - ETrue for found, EFalse for not found 
+ */
+TBool CDataWrapperBase::GetRealFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TReal& aResult)
+	{
+	TPtrC result;
+	TBool ret=EFalse;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
+	if ( err != KErrNone )
+		{
+		ret = EFalse;
+		}
+	if ( ret )
+		{
+		TLex lex(result);
+		ret = ( lex.Val(aResult)==KErrNone );
+		}
+	return ret;
+	}
+
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TPtrC reference passed in
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - Reference to the string on the heap
+ * @return TBool - ETrue for found, EFalse for not found 
+ */
+TBool CDataWrapperBase::GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
+	{
+	TBool	ret=EFalse;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, aResult));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+	return ret;
+	}
+
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TInt reference passed in. The value can optionally be prefixed with 0x
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - The integer value of the Hex input
+ * @return TBool - ETrue for found, EFalse for not found 
+ */	
+TBool CDataWrapperBase::GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
+	{
+	TPtrC	result;
+	TBool	ret=EFalse;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+	if ( ret )
+		{
+		TLex	lex;
+		if( result.FindC(KPrefixHex)==KErrNone )
+			{
+			lex=result.Mid(KPrefixHex().Length());
+			}
+		else
+			{
+			lex=result;
+			}
+		ret=(lex.Val((TUint &)aResult, EHex)==KErrNone);
+		}
+
+	return ret;
+	}
+
+/**
+ * Reads the value present from the test steps ini file within the mentioned section name and key name
+ * Copies the value to the TUint reference passed in.
+ * If the value is prefixed with 0x the value is read as a hexidecimal value
+ * If the value is suffixed with b the value is read as a binary value
+ * If the value is prefixed with a 0 the value is read as an octal value
+ * If it does not match the above it is read in as an integer
+ * @param aSectName - Section within the test steps ini file
+ * @param aKeyName - Name of a key within a section
+ * @return aResult - The integer value of the Hex input
+ * @return TBool - ETrue for found, EFalse for not found 
+ */	
+TBool CDataWrapperBase::GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult)
+	{
+	TPtrC	result;
+	TBool	ret=EFalse;
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+	if ( ret )
+		{
+		TLex	lex(result);
+		if( result.FindC(KPrefixHex)==KErrNone )
+			{
+			lex=result.Mid(KPrefixHex().Length());
+			ret=(lex.Val(aResult, EHex)==KErrNone);
+			}
+		else
+			{
+			TInt	binarySuffixPosition=result.Length()-KSuffixBinary().Length();
+			if ( result.FindC(KSuffixBinary)==binarySuffixPosition )
+				{
+				lex=result.Left(binarySuffixPosition);
+				ret=(lex.Val(aResult, EBinary)==KErrNone);
+				}
+			else
+				{
+				if( result.FindC(KPrefixOctal)==KErrNone )
+					{
+					ret=(lex.Val(aResult, EOctal)==KErrNone);
+					}
+				else
+					{
+					TInt	intResult;
+					ret=(lex.Val(intResult)==KErrNone);
+					if ( ret )
+						{
+						aResult=(TUint)intResult;
+						}
+					}
+				}
+			}
+		}
+
+	return ret;
+	}
+
+/**
+ *   Return array of string parameters i.e. key=a1,a2,a3 returns array which contains
+ *   String a1, a2 and a3.
+ *   @return ret - EFalse if can't get a String parameter from Config file.  ETrue if KErrNone
+ */
+TBool CDataWrapperBase::GetArrayRectFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult)
+	{
+	TBool	ret=EFalse;
+	TPtrC completeArray;
+	
+	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, completeArray));
+	if ( err != KErrNone )
+		{
+		ret=EFalse;
+		}
+
+    TLex16 lex(completeArray); // Here we have the array as a string i.e. "a1,a2,a3"
+    TBuf<256> buf;
+    TChar chr;
+    
+    while(!lex.Eos())
+        {
+        chr = lex.Get();
+        // Check if there was a list separator
+        if ((chr == ',') && (lex.Peek() == '('))
+            {
+            HBufC* param = buf.AllocLC();
+            buf.Zero();
+            aResult.Append(param);
+            CleanupStack::Pop(param); // pointer to buf is stored in RPointerArray
+            }
+        // If not separator character we can store the character into array
+        else
+            {
+            buf.Append(chr);
+            }
+        }
+    // Remember to put last token into array (,a3)
+    HBufC* param = buf.AllocLC();
+    aResult.Append(param);
+    CleanupStack::Pop(param);
+    
+    return ret;
+	}
+
+/**
+ * Reads the parameter	asociated to the specified command
+ * @param aSectName	Section on ini file
+ * @param aKeyName		Name of the parameter
+ * @param aResult			descriptor containing parameter
+ * @return TBool  ETrue for found, EFalse for not found 
+ */
+TBool CDataWrapperBase::GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
+	{
+	TBool	ret=EFalse;
+
+	if ( aSectName.Length()!=0 )
+		{
+		ret=CDataWrapper::GetStringFromConfig(aSectName, aKeyName, aResult);
+
+		for ( TInt index=iInclude.Count(); (index>0) && (!ret); )
+			{
+			ret=iInclude[--index]->FindVar(aSectName, aKeyName, aResult);
+			}
+		}
+
+	if ( ret )
+		{
+		if ( aResult.Match(KMatch)!=KErrNotFound )
+			{
+			//	We have an entry of the format
+			//	entry =*{section,entry}*
+			//	where * is one or more characters
+			//	We need to construct this from other data in the ini file replacing {*,*}
+			//	with the data from
+			//	[section]
+			//	entry =some_value
+			HBufC*	buffer=HBufC::NewLC(aResult.Length());
+			buffer->Des().Copy(aResult);
+
+			TInt	startLength=KStart().Length();
+			TInt	sparatorLength=KSeparator().Length();
+			TInt	endLength=KEnd().Length();
+			TInt	bufferLength;
+			TInt	start;
+			TInt	sparator;
+			TInt	end;
+			TPtrC	remaining;
+			TLex	lex;
+			do
+				{
+				bufferLength=buffer->Length();
+				start=buffer->Find(KStart);
+
+				remaining.Set(buffer->Des().Right(bufferLength-start-startLength));
+				sparator=remaining.Find(KSeparator);
+				remaining.Set(remaining.Right(remaining.Length()-sparator-sparatorLength));
+				sparator += (start + startLength);
+
+				end=remaining.Find(KEnd) + sparator + sparatorLength;
+
+				TPtrC	sectionName(buffer->Ptr()+start+startLength, sparator-start-startLength);
+				TPtrC	keyName(buffer->Ptr()+sparator+sparatorLength, end-sparator-sparatorLength);
+				sectionName.Set(TLex(sectionName).NextToken());
+				keyName.Set(TLex(keyName).NextToken());
+
+				TInt	entrySize=0;
+				TPtrC	entryData;
+				TBool	found=CDataWrapper::GetStringFromConfig(sectionName, keyName, entryData);
+				for ( TInt index=iInclude.Count(); (index>0) && (!found);  )
+					{
+					found=iInclude[--index]->FindVar(sectionName, keyName, entryData);
+					}
+				if ( found )
+					{
+					entrySize=entryData.Length();
+					}
+
+				TInt	newLength=start + bufferLength - end - endLength + entrySize;
+				HBufC*	bufferNew=HBufC::NewLC(newLength);
+				bufferNew->Des().Copy(buffer->Ptr(), start);
+				if ( entrySize>0 )
+					{
+					bufferNew->Des().Append(entryData);
+					}
+				bufferNew->Des().Append(buffer->Ptr() + end + endLength, bufferLength - end - endLength);
+				CleanupStack::Pop(bufferNew);
+				CleanupStack::PopAndDestroy(buffer);
+				buffer=bufferNew;
+				CleanupStack::PushL(buffer);
+				}
+			while ( buffer->Match(KMatch)!=KErrNotFound );
+			iBuffer.Append(buffer);
+			CleanupStack::Pop(buffer);
+			aResult.Set(*buffer);
+			INFO_PRINTF4(KDataRead, &aSectName, &aKeyName , &aResult);
+			}
+		}
+
+	return ret;
+	}
+
+/**
+ * Utility function to produce time delay
+ * @param aTimeoutInSecs Times in micro seconds
+ */
+void CDataWrapperBase::Timedelay(TInt aTimeoutInSecs)
+	{
+	TRequestStatus	status;
+	iTimer.After(status, aTimeoutInSecs);
+	User::WaitForRequest(status);
+	}
+
+TBool CDataWrapperBase::GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult)
+	{
+	TPtrC	str;
+	TBool	ret=GetStringFromConfig(aSectName, aKeyName, str);
+
+	if ( ret )
+		{
+		TBool	found=EFalse;
+		TInt	index=0;
+		while ( (aTable[index].iValue!=-1) && !found )
+			{
+			if ( aTable[index].iString==str )
+				{
+				found=ETrue;
+				aResult=aTable[index].iValue;
+				}
+			else
+				{
+				++index;
+				}
+			}
+
+		if ( !found )
+			{
+			ret=GetIntFromConfig(aSectName, aKeyName, aResult);
+			}
+		}
+
+	return ret;
+	}
+