# HG changeset patch
# User hgs
# Date 1288700039 0
# Node ID b220a93416368aae7dbc35c3d6d04d56610a55c5
# Parent  9d4397b300d17267019f9afc96e991c68fb82a14
2010wk46_01

diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/ciextnfactoryplugins/ciplatformmsghndlrplugin/src/ciplatformmsghndlrplugin.cpp
--- a/devsoundextensions/ciextnfactoryplugins/ciplatformmsghndlrplugin/src/ciplatformmsghndlrplugin.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/devsoundextensions/ciextnfactoryplugins/ciplatformmsghndlrplugin/src/ciplatformmsghndlrplugin.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -98,7 +98,8 @@
     // Get the destination info from the client into TMMFMessage.
     TMMFMessage message(aMessage);
     TRAPD(status, message.FetchDestinationL());
-
+    if(status != KErrNone)
+    DEB_TRACE1(_L("CI* CCIPlatformMsgHndlrPlugin::HandleMessage status:%d"),status);
     // Check if Custom Command Parser manager can handle the message...
     if (!handled)
         {
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/drmaudioplayer/doc/S60_DRM_Audio_Player_Design_C.doc
Binary file devsoundextensions/drmaudioplayer/doc/S60_DRM_Audio_Player_Design_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/effectspresets/Doc/S60_3_0_Environmental_Reverb_Utility_Design_C.doc
Binary file devsoundextensions/effectspresets/Doc/S60_3_0_Environmental_Reverb_Utility_Design_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/effectspresets/Doc/S60_3_0_Equalizer_Utility_Design_C.doc
Binary file devsoundextensions/effectspresets/Doc/S60_3_0_Equalizer_Utility_Design_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/effectspresets/Doc/S60_3_0_Stereo_Widening_Utility_Design_C.doc
Binary file devsoundextensions/effectspresets/Doc/S60_3_0_Stereo_Widening_Utility_Design_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/effectspresets/Doc/S60_Audio_Enhancements_Adaptation_Guide.doc
Binary file devsoundextensions/effectspresets/Doc/S60_Audio_Enhancements_Adaptation_Guide.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/mmextfw/customcommandutility/src/CustomCommandUtility.cpp
--- a/devsoundextensions/mmextfw/customcommandutility/src/CustomCommandUtility.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/devsoundextensions/mmextfw/customcommandutility/src/CustomCommandUtility.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -285,8 +285,8 @@
 	                               const TDesC8&                      aDataTo2,
 	                                     TDes8&                       aDataFrom)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);
-		return KErrNone;
+		return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);
+		
 		}
 
 	virtual TInt CustomCommandSync(const TMMFMessageDestinationPckg&  aDestination,
@@ -294,8 +294,8 @@
 	                               const TDesC8&                      aDataTo1,
 	                               const TDesC8&                      aDataTo2)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);
-		return KErrNone;
+	    return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);
+		
 		}
 
 	virtual void CustomCommandAsync(const TMMFMessageDestinationPckg& aDestination,
@@ -335,8 +335,8 @@
 	                               const TDesC8&                      aDataTo2,
 	                                     TDes8&                       aDataFrom)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);
-		return KErrNone;
+		return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);
+		
 		}
 
 	virtual TInt CustomCommandSync(const TMMFMessageDestinationPckg&  aDestination,
@@ -344,8 +344,8 @@
 	                               const TDesC8&                      aDataTo1,
 	                               const TDesC8&                      aDataTo2)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);
-		return KErrNone;
+		return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);
+		
 		}
 
 	virtual void CustomCommandAsync(const TMMFMessageDestinationPckg& aDestination,
@@ -385,8 +385,7 @@
 	                               const TDesC8&                      aDataTo2,
 	                                     TDes8&                       aDataFrom)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);
-		return KErrNone;
+		return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2, aDataFrom);		
 		}
 
 	virtual TInt CustomCommandSync(const TMMFMessageDestinationPckg&  aDestination,
@@ -394,8 +393,7 @@
 	                               const TDesC8&                      aDataTo1,
 	                               const TDesC8&                      aDataTo2)
 		{
-		iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);
-		return KErrNone;
+		return iUtility.CustomCommandSync(aDestination, aFunction, aDataTo1, aDataTo2);		
 		}
 
 	virtual void CustomCommandAsync(const TMMFMessageDestinationPckg& aDestination,
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/mmfcustominterfaces/Doc/S60_3_1_MMF_Custom_Interfaces_Design_C.doc
Binary file devsoundextensions/mmfcustominterfaces/Doc/S60_3_1_MMF_Custom_Interfaces_Design_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/EABI/WmaDecoderIntfcProxyu.def
--- a/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/EABI/WmaDecoderIntfcProxyu.def	Mon Oct 18 12:47:26 2010 +0100
+++ b/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/EABI/WmaDecoderIntfcProxyu.def	Tue Nov 02 12:13:59 2010 +0000
@@ -34,4 +34,5 @@
 	_ZN21CWmaDecoderIntfcProxyD2Ev @ 33 NONAME
 	_ZTI21CWmaDecoderIntfcProxy @ 34 NONAME ; #<TI>#
 	_ZTV21CWmaDecoderIntfcProxy @ 35 NONAME ; #<VT>#
+	_ZN21CWmaDecoderIntfcProxy25GetSupportedMaxSampleRateERj @ 36 NONAME
 
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/src/WmaDecoderIntfcProxy.cpp
--- a/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/src/WmaDecoderIntfcProxy.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/devsoundextensions/mmfcustominterfaces/WmaDecoderIntfc/WmaDecoderIntfcProxy/src/WmaDecoderIntfcProxy.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -511,7 +511,7 @@
 //------------------------------------------------------------------------------
 // Get Supported Max Sample Rate
 //------------------------------------------------------------------------------
-TInt CWmaDecoderIntfcProxy::GetSupportedMaxSampleRate(TUint& aSupportedMaxSampleRate)
+EXPORT_C TInt CWmaDecoderIntfcProxy::GetSupportedMaxSampleRate(TUint& aSupportedMaxSampleRate)
 	{
     TInt status = KErrNone;
     
diff -r 9d4397b300d1 -r b220a9341636 devsoundextensions/telephonyaudiorouting/Doc/S60_3_0_Telephony_Audio_Routing_Adaptation_Guide_C.doc
Binary file devsoundextensions/telephonyaudiorouting/Doc/S60_3_0_Telephony_Audio_Routing_Adaptation_Guide_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_policy_header_api/doc/S60_5_0_Audio_Policy_Mixing_Table_Users_Guide_D.doc
Binary file mmaudio_plat/audio_policy_header_api/doc/S60_5_0_Audio_Policy_Mixing_Table_Users_Guide_D.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_policy_header_api/doc/S60_5_1_Audio_Policy_Implementation_Guideline_D.doc
Binary file mmaudio_plat/audio_policy_header_api/doc/S60_5_1_Audio_Policy_Implementation_Guideline_D.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_policy_header_api/doc/S60_5_1_Audio_Policy_Mixing_Table_Specification_D.doc
Binary file mmaudio_plat/audio_policy_header_api/doc/S60_5_1_Audio_Policy_Mixing_Table_Specification_D.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/doc/S60_Audio_Routing_API_Specification_C.doc
Binary file mmaudio_plat/audio_routing_api/doc/S60_Audio_Routing_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/inc/AudioRoutingTestClass.h
--- a/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/inc/AudioRoutingTestClass.h	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/inc/AudioRoutingTestClass.h	Tue Nov 02 12:13:59 2010 +0000
@@ -96,6 +96,7 @@
 _LIT( KTagDrmPlayer, "DrmPlayer");
 _LIT( KTagVideoPlayer, "VideoPlayer");
 _LIT( KTagVideoRecord, "VideoRecord");
+_LIT(KTagAudioConvert,"AudioConvert");
 
 #ifdef __WINSCW__
 _LIT( KAudioMidiFile, "c:\\testing\\data\\aqualung.mid");
@@ -393,6 +394,7 @@
 		TInt CreateAudioInput( CStifItemParser& aItem );
 		void CreateInput();
 		void CreateOutput();
+		void   CreateOutput_AudioConvert();
 		TInt CreateVideoInput();
 
 		/*To create and destroy the window to start the CVideoPlayerUtility */
@@ -412,6 +414,11 @@
 		TInt SetAudioOutputL();
 		TInt SetSecureOutputL();
 		TInt UnregisterObserver();
+		TInt CustomCommandSyncAsync(); 
+		TInt CustomCommandRecord();   
+		TInt CustomCommandRouting();  
+		TInt CustomCommandVRecord(); 
+		
 
     public:     // Data
         // ?one_line_short_description_of_data
@@ -430,6 +437,7 @@
     	CMdaAudioRecorderUtility* 	iRecorder;
     	CVideoRecorderUtility* 		iVideoRecord;
     	CMdaAudioPlayerUtility* 	iUtil;
+    	CMdaAudioConvertUtility*    iUtilConvert;
     	TBool						isInput;
 		CMMFDevSound*				iDevSound;
 		CCustomInterfaceUtility*   	iCustomInterfaceUtility;
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocks.cpp
--- a/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocks.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocks.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -183,7 +183,11 @@
 		ENTRY( "SetAudioOutput", CAudioRoutingTestClass::SetAudioOutputL),
 		ENTRY( "SetSecureOutput", CAudioRoutingTestClass::SetSecureOutputL),
 		ENTRY( "UnregisterObserver", CAudioRoutingTestClass::UnregisterObserver),
-        };
+		ENTRY( "CustomCommandPlay",CAudioRoutingTestClass::CustomCommandSyncAsync),
+		ENTRY("CustomCommandRec",CAudioRoutingTestClass::CustomCommandRecord),
+		ENTRY("CustomCommandRoute",CAudioRoutingTestClass::CustomCommandRouting),
+		ENTRY("CustomCommandVRecord",CAudioRoutingTestClass::CustomCommandVRecord)
+		 };
 
     const TInt count = sizeof( KFunctions ) / sizeof( TStifFunctionInfo );
 
@@ -491,6 +495,14 @@
 			{
 			TRAP(error,iCustomCommandUtility = CCustomCommandUtility::NewL(*iUtil));
 			}
+		if (type == KTagAudioConvert)
+		    {
+		     TRAP(error,iCustomCommandUtility = CCustomCommandUtility::NewL(*iUtilConvert));
+		    }
+		if(type ==KTagCustomCommand)
+		    {
+               TRAP(error,iCustomCommandUtility = CCustomCommandUtility::NewL(*iUtil));
+		    }
 		else
 			{
 			TRAP(error,iCustomCommandUtility = CCustomCommandUtility::NewL(*iRecorder,ETrue));
@@ -512,6 +524,14 @@
 			{
 			TRAP(error,iCustomInterfaceUtility = CCustomInterfaceUtility::NewL(*iRecorder,ETrue));
 			}
+		else if(type == KTagAudioConvert)
+		    {
+            TRAP(error,iCustomInterfaceUtility = CCustomInterfaceUtility::NewL(*iUtilConvert));
+		    }
+		else if(type == KTagDevSound)
+	    {
+		  TRAP(error,iCustomInterfaceUtility = CCustomInterfaceUtility::NewL(*iDevSound));
+		 }
 		}
 	else if (object == KTagInputStream)
 		{
@@ -570,8 +590,8 @@
 		TRAP(error, CreateSessionAndScreen());
 		TRAP(error, CreateWindowGroup());
 		TRAP(error, CreateVideoWindow());
-		TRAP(error, CreateVideoObject());	    
-		}
+		TRAP(error, CreateVideoObject());
+    }
 	else if(object == KTagVideoRecord)
 	    {
         TRAP(error, CreateVideoRecorderObject());        
@@ -603,9 +623,10 @@
 		FTRACE(FPrint(_L("CAudioRoutingTest::CAudioInput")));
 		iLog->Log(_L("CAudioRoutingTest::CAudioInput"));		
 		TRAP(error, iAudioInput = CAudioInput::NewL(*iVideoRecord));
-		if (error == KErrNone)
+		if (error == KErrNotFound)
 			{
-			iLog->Log(_L("CAudioInput::NewL(*iVideoRecord) OK"));
+		    error = KErrNone;
+			iLog->Log(_L("CAudioInput::NewL(*iVideoRecord) OK with expected error"));
 			}
 		}
 
@@ -785,6 +806,11 @@
 	iUtil = CMdaAudioPlayerUtility::NewFilePlayerL(KMp3TestFile, *this);
    }
 
+void CAudioRoutingTestClass::CreateOutput_AudioConvert()
+    {
+    isInput = EFalse;
+    iUtilConvert = CMdaAudioConvertUtility::NewL(*this,NULL);
+    }
 TInt CAudioRoutingTestClass::CreateVideoInput()
    {
   // TInt error1 = KErrNone;
@@ -1041,4 +1067,92 @@
 	iLog->Log(_L("iAudioOutput - UnregisterObserver "));
 	return KErrNone;
 }
+TInt CAudioRoutingTestClass::CustomCommandSyncAsync()
+     {
+    iLog->Log(_L("CustomCommandPlay-CustomCommandSyncAsync"));
+     TMMFMessageDestination temp(TUid::Uid(0),NULL);
+     const TMMFMessageDestinationPckg destination(temp) ;
+     TInt function = 1;
+           _LIT8(KData1, "NULL");
+               
+           const TDesC8&   dataTo1 = KData1;
+           const TDesC8&   dataTo2 = KData1;
+           TRequestStatus status = NULL;
+           TBuf8 <50> test;
+          iCustomCommandUtility = CCustomCommandUtility::NewL(*iUtil);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,status);
+          iCustomCommandUtility->CustomCommandSync(destination,function,dataTo1,dataTo2);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,test,status);
+             
+             return KErrNone;
+             }
+
+TInt CAudioRoutingTestClass::CustomCommandRecord()
+     {
+    iLog->Log(_L("CustomCommandRecord"));
+     TMMFMessageDestination temp(TUid::Uid(0),NULL);
+     const TMMFMessageDestinationPckg destination(temp) ;
+     TInt function = 1;
+           _LIT8(KData1, "NULL");
+               
+           const TDesC8&   dataTo1 = KData1;
+           const TDesC8&   dataTo2 = KData1;
+           TBuf8 <50> test;
+        	 TBool recstream = 0;
+           TBool recstream1 = 1;
+           TRequestStatus status = NULL;
+                   
+           iCustomCommandUtility = CCustomCommandUtility::NewL(*iRecorder,recstream);
+           iCustomCommandUtility->CustomCommandSync(destination,function,dataTo1,dataTo2,test);
+           iCustomCommandUtility->CustomCommandSync(destination,function,dataTo1,dataTo2);
+           iCustomCommandUtility = CCustomCommandUtility::NewL(*iRecorder,recstream1);
+           iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,status);
+           iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,test,status);
+           
+            return KErrNone;
+     }
+
+
+TInt CAudioRoutingTestClass::CustomCommandRouting()
+     {
+     	 iLog->Log(_L("CustomCommandRouting"));
+    
+     TMMFMessageDestination temp(TUid::Uid(0),NULL);
+     const TMMFMessageDestinationPckg destination(temp) ;
+     TInt function = 1;
+           _LIT8(KData1, "NULL");
+               
+           const TDesC8&   dataTo1 = KData1;
+           const TDesC8&   dataTo2 = KData1;
+          TRequestStatus status = NULL;
+           TBuf8 <50> test;
+                   
+           iCustomCommandUtility = CCustomCommandUtility::NewL(*iUtilConvert);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,status);
+          iCustomCommandUtility->CustomCommandSync(destination,function,dataTo1,dataTo2);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,test,status);
+                
+                 return KErrNone;
+          }
+
+TInt CAudioRoutingTestClass::CustomCommandVRecord()
+     {
+     iLog->Log(_L("CustomCommandVideoRecord"));
+     TMMFMessageDestination temp(TUid::Uid(0),NULL);
+     const TMMFMessageDestinationPckg destination(temp) ;
+     TInt function = 1;
+           _LIT8(KData1, "NULL");
+               
+           const TDesC8&   dataTo1 = KData1;
+           const TDesC8&   dataTo2 = KData1;
+           TRequestStatus status = NULL;
+           TBuf8 <50> test;
+                   
+          iCustomCommandUtility = CCustomCommandUtility::NewL(*iVideoRecord);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,status);
+          iCustomCommandUtility->CustomCommandSync(destination,function,dataTo1,dataTo2);
+          iCustomCommandUtility->CustomCommandAsync(destination,function,dataTo1,dataTo2,test,status);
+                
+                 return KErrNone;
+          }
 //  End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocksCallbacks.cpp
--- a/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocksCallbacks.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/audio_routing_api/tsrc/AudioRoutingTestClass/src/AudioRoutingTestClassBlocksCallbacks.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -328,7 +328,7 @@
 
 void CAudioRoutingTestClass::MvpuoEvent(const TMMFEvent& aEvent)
 	{
-    iLog->Log(_L("MvpuoEvent, return code =%x!!!"),aEvent);
+    iLog->Log(_L("MvpuoEvent, return code =%x!!!"),aEvent.iEventType);
 	}
 
 void CAudioRoutingTestClass::MvruoOpenComplete(TInt aError)
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/tsrc/Conf/AudioRoutingTestClass.cfg
--- a/mmaudio_plat/audio_routing_api/tsrc/Conf/AudioRoutingTestClass.cfg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/audio_routing_api/tsrc/Conf/AudioRoutingTestClass.cfg	Tue Nov 02 12:13:59 2010 +0000
@@ -276,4 +276,74 @@
 AudioRoutingTest SetSecureOutput
 AudioRoutingTest UnregisterObserver
 delete AudioRoutingTest
-[Endtest]
\ No newline at end of file
+[Endtest]
+[Test]
+title 19. Create AudioRouting CAudioInput - AudioConvert
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject  AudioConvert
+AudioRoutingTest CreateObject CustomCommand AudioConvert
+AudioRoutingTest CreateObject CustomInterface AudioConvert
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 20. Create AudioRouting CAudioInput - AudioConvert
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject  AudioConvert
+AudioRoutingTest CreateObject CustomInterface AudioConvert
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 21. Create AudioRouting CAudioInput - DevSound
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject DevSound
+waittestclass AudioRoutingTest
+AudioRoutingTest CreateObject CustomInterface DevSound
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 22. Create AudioRouting CAudioInput - CustomCommand
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject CustomCommand CustomCommand
+waittestclass AudioRoutingTest
+AudioRoutingTest CreateObject CustomInterface CustomCommand
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 23. CAudioOutput - CMdaAudioPlayerUtility - CustomCommandSync/Async_play
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject AudioPlayer
+waittestclass AudioRoutingTest
+AudioRoutingTest CustomCommandPlay
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 24. CAudioOutput - CMdaAudioPlayerUtility - CustomCommandSync/Async_Record
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject OutputRecord
+waittestclass AudioRoutingTest
+AudioRoutingTest CustomCommandRec
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 25. CAudioOutput - CMdaAudioPlayerUtility - CustomCommandSync/Async_AudioConvert
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject  AudioConvert
+waittestclass AudioRoutingTest
+AudioRoutingTest CustomCommandRoute
+delete AudioRoutingTest
+[Endtest]
+
+[Test]
+title 26. CAudioOutput - CMdaAudioPlayerUtility - CustomCommandSync/Async_VideoRecord
+create AudioRoutingTestClass AudioRoutingTest
+AudioRoutingTest CreateObject  VideoRecord
+waittestclass AudioRoutingTest
+AudioRoutingTest CustomCommandVRecord
+delete AudioRoutingTest
+[Endtest]
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_routing_api/tsrc/Group/bld.inf
--- a/mmaudio_plat/audio_routing_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/audio_routing_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -44,4 +44,4 @@
 
 PRJ_TESTMMPFILES
 
-#include "../AudioRoutingTestClass/Group/bld.inf"
+#include "../AudioRoutingTestClass/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/audio_visualization_api/doc/S60_3_0_Audio_Visualization_API_Specification_C.doc
Binary file mmaudio_plat/audio_visualization_api/doc/S60_3_0_Audio_Visualization_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/display_posting_api/doc/S60_Display_Posting_API_Specification_C.doc
Binary file mmaudio_plat/display_posting_api/doc/S60_Display_Posting_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/fm_radio_adaptation_api/doc/S60_3_2_FM_Radio_Tuner_Control_Adaptation_API_Specification_C.doc
Binary file mmaudio_plat/fm_radio_adaptation_api/doc/S60_3_2_FM_Radio_Tuner_Control_Adaptation_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/global_audio_settings_api/tsrc/Group/bld.inf
--- a/mmaudio_plat/global_audio_settings_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/global_audio_settings_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -24,4 +24,4 @@
 PRJ_MMPFILES
 
 PRJ_TESTMMPFILES
-#include "../GlobalASTestClass/Group/bld.inf"
+#include "../GlobalASTestClass/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/rds_adaptation_api/doc/S60_3_2_RDS_Control_Adaptation_API_Specification_C.doc
Binary file mmaudio_plat/rds_adaptation_api/doc/S60_3_2_RDS_Control_Adaptation_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/Conf/RestrictedAOTestClass.cfg
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/Conf/RestrictedAOTestClass.cfg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/Conf/RestrictedAOTestClass.cfg	Tue Nov 02 12:13:59 2010 +0000
@@ -342,6 +342,20 @@
 [Endtest]
 
 
+[Test]
+title 25. Commit
+create RestrictedAOTestClass AO
+AO CreateFactory
+AO CreateRestrictedAO
+AO Reset
+AO AppendAllowedOutput FM
+AO AppendAllowedOutput StereoBT
+AO AppendAllowedOutput BTA2DP
+AO Commit
+delete AO
+[Endtest]
+
+
 // Adding Test cases 26 and 27 for
 // RIM CR 417-7642: HDMI with HDCP to Resctricted Audio Output API
 // Adding new ENUMs to CRestrictedAudioOutput::TAllowedOutputPreference for HDMI and HDCP
@@ -369,18 +383,17 @@
 [Endtest]
 
 
-//[Test]
-//title 25. Commit
-//create RestrictedAOTestClass AO
-//AO CreateFactory
-//AO CreateRestrictedAO
-//AO Reset
-//AO AppendAllowedOutput FM
-//AO AppendAllowedOutput StereoBT
-//AO AppendAllowedOutput BTA2DP
-//AO Commit
-//delete AO
-//[Endtest]
+// Added for Function coverage
+
+[Test]
+title 28. GetUid
+create RestrictedAOTestClass AO
+AO CreateFactory
+AO CreateRestrictedAO
+AO GetUid
+delete AO
+[Endtest]
+
 
 
 //[Test]
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/Group/bld.inf
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -44,4 +44,4 @@
 
 PRJ_TESTMMPFILES
 
-#include "../RestrictedAOTestClass/Group/bld.inf"
+#include "../RestrictedAOTestClass/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/group/RestrictedAOTestClass.mmp	Tue Nov 02 12:13:59 2010 +0000
@@ -61,10 +61,12 @@
 LIBRARY					CustomInterfaceUtility.lib
 LIBRARY					CustomCommandUtility.lib
 
-LIBRARY			  RestrictedAudioOutputProxy.lib
+LIBRARY    		ConfigurationComponentsFactory.lib
 LIBRARY				RestrictedAudioOutput.lib
 LIBRARY				MmfDevSound.lib
-
+LIBRARY 	RestrictedAudioOutputProxy.lib
+LIBRARY		RestrictedAudioOutputMessageHandler.lib
+EPOCALLOWDLLDATA 
 LANG            SC
 
 
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/inc/RestrictedAOTestClass.h	Tue Nov 02 12:13:59 2010 +0000
@@ -24,14 +24,15 @@
 #include <StifLogger.h>
 #include <TestScripterInternal.h>
 #include <StifTestModule.h>
-
+#include <RestrictedAudioOutputMessageHandler.h>
 #include <e32svr.h>
 #include <e32base.h>
 #include <e32cons.h>
 #include <customInterfaceUtility.h>
 #include <SoundDevice.h>
+#include <ConfigurationComponentsFactory.h>
 #include <RestrictedAudioOutput.h>
-
+#include <RestrictedAudioOutputProxy.h>
 
 
 #include "TimeoutController.h"
@@ -298,7 +299,7 @@
 		TInt GetAllowedOutput( CStifItemParser& aItem );
 		TInt Reset( CStifItemParser& aItem );
 		TInt Commit( CStifItemParser& aItem );
-
+		TInt GetUid(CStifItemParser& aItem);
 
 
     public:     // Data
@@ -314,10 +315,11 @@
     // reference to TestModuleIf
     CTestModuleIf& iTestModuleIf;
 
+    	CConfigurationComponentsFactory* iFactory;
 			CMMFDevSound*	iDevSound;
 			CRestrictedAudioOutput* iRestrictedAudioOutput;
-
-
+			CRestrictedAudioOutputMessageHandler* iRestrictedAudioOutputMessageHandler;
+			CRestrictedAudioOutputProxy* iRestrictedAudioOutputProxy;
 
 
     // Active object with a timer to timeout the test case
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocks.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -21,7 +21,6 @@
 #include <e32svr.h>
 #include <StifParser.h>
 #include <Stiftestinterface.h>
-#include <RestrictedAudioOutputProxy.h>
 #include "RestrictedAOTestClass.h"
 #include "debug.h"
 
@@ -104,6 +103,12 @@
         delete iDevSound;
         iDevSound = NULL;
         }
+
+    if (iFactory)
+   	{
+	delete iFactory;
+        iFactory = NULL;
+	}
 REComSession::FinalClose();
 
 }
@@ -123,15 +128,16 @@
         // First string is the function name used in TestScripter script file.
         // Second is the actual implementation member function.
 
-		ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
-		ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
+				ENTRY( "CreateFactory", CRestrictedAOTestClass::CreateFactory ),
+				ENTRY( "CreateRestrictedAO", CRestrictedAOTestClass::CreateRestrictedAO ),
         ENTRY( "AppendAllowedOutput", CRestrictedAOTestClass::AppendAllowedOutput ),
         ENTRY( "RemoveAllowedOutput", CRestrictedAOTestClass::RemoveAllowedOutput ),
         ENTRY( "GetAllowedOutputCount", CRestrictedAOTestClass::GetAllowedOutputCount ),
         ENTRY( "GetAllowedOutput", CRestrictedAOTestClass::GetAllowedOutput ),
         ENTRY( "Reset", CRestrictedAOTestClass::Reset ),
         ENTRY( "Commit", CRestrictedAOTestClass::Commit ),
-
+        ENTRY( "GetUid", CRestrictedAOTestClass::GetUid ),
+        
         ENTRY( "Example", CRestrictedAOTestClass::ExampleL ),
 
         };
@@ -365,6 +371,15 @@
 	return error;
 }
 
+TInt CRestrictedAOTestClass::GetUid( CStifItemParser& /*aItem*/ )
+    {
+     TUid AudioHandlerUid = iRestrictedAudioOutputMessageHandler->Uid();
+     TUid AudioProxyUid = iRestrictedAudioOutputProxy->Uid();
+    
+    FTRACE(FPrint(_L("CRestrictedAOTestClass::GetUid - AudioHandlerUid=%x, AudioProxyUid=%x "), iRestrictedAudioOutputMessageHandler->Uid(), iRestrictedAudioOutputProxy->Uid()));
+    iLog->Log(_L("CRestrictedAOTestClass::GetUid"));
+    return KErrNone;
+    }
 // -----------------------------------------------------------------------------
 // CRestrictedAOTestClass::SetExpectedEvents()
 // -----------------------------------------------------------------------------
@@ -764,7 +779,10 @@
 	iLog->Log(_L("CRestrictedAOTestClass::CreateFactory"));
 	TInt error = KErrNone;
 
-	TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
+	error = CConfigurationComponentsFactory::CreateFactoryL(iFactory);
+
+	if (error == KErrNone)
+		TRAP(error, iDevSound = CMMFDevSound::NewL()) ;
 //	AddExpectedEvent(EInitializeComplete, KMediumTimeout);
 
 	return error;
@@ -781,9 +799,9 @@
 	iLog->Log(_L("CRestrictedAOTestClass::CreateRestrictedAO"));
 	TInt error = KErrNone;
 
-	if (iDevSound != NULL)
+	if (iFactory != NULL && iDevSound != NULL)
 	{
-            TRAP(error, iRestrictedAudioOutput = CRestrictedAudioOutputProxy::NewL(*iDevSound));
+			error = iFactory->CreateRestrictedAudioOutput(*iDevSound, iRestrictedAudioOutput);
 	}
 	else
 	{
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocksCallbacks.cpp
--- a/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocksCallbacks.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_plat/restricted_audio_output_api/tsrc/RestrictedAOTestClass/src/RestrictedAOTestClassBlocksCallbacks.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -83,4 +83,5 @@
 //	 Panic(KErrNotSupported);
 	 }
 
-/*************************************************************************/
\ No newline at end of file
+/*************************************************************************/
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2002 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:  Console bld.inf
+*
+*/
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+
+PRJ_MMPFILES
+console.mmp
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/group/console.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/group/console.mmp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2002 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:  Console MMP
+*
+*/
+
+TARGET		  console.exe
+TARGETTYPE	  exe
+UID			 0 0xEAC80D7E
+
+USERINCLUDE	 ..\inc
+SYSTEMINCLUDE   \epoc32\include
+
+SOURCEPATH	  ..\src
+SOURCE		  console.cpp
+
+LIBRARY		 euser.lib
+
+#ifdef ENABLE_ABIV2_MODE
+  DEBUGGABLE_UDEBONLY
+#endif
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/inc/console.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/inc/console.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2002 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:  Console Header
+*
+*/
+
+#ifndef __CONSOLE_H__
+#define __CONSOLE_H__
+
+//  Include Files
+
+#include <e32base.h>
+
+//  Function Prototypes
+
+GLDEF_C TInt E32Main();
+
+#endif  // __CONSOLE_H__
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/inc/myplayer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/inc/myplayer.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2002 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:  Console Myplayer
+*
+*/
+
+#if 0
+#include <MdaAudioSamplePlayer.h> 
+
+_LIT(KWavFile, "c:\\sounds\\digital\\sample.wav");
+
+
+class CMyPlayer : public CBase, MMdaAudioPlayerCallback 
+    {
+public:
+    static CMyPlayer* NewL();
+    void ConstructL();
+    void Play();
+public:
+    virtual void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds &aDuration);
+    virtual void MapcPlayComplete(TInt aError);
+    
+private:
+    CMdaAudioPlayerUtility* iPlayer;
+    };
+
+
+CMyPlayer* CMyPlayer::NewL()
+    {
+    CMyPlayer* self = new(ELeave) CMyPlayer;
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    }
+void CMyPlayer::ConstructL()
+    {
+    iPlayer = CMdaAudioPlayerUtility::NewL(*this);
+    iPlayer->OpenFileL(KWavFile);
+    }
+void CMyPlayer::Play()
+    {
+    iPlayer->Play();
+    }
+void CMyPlayer::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds &aDuration)
+    {
+    console->Printf(_L("Init complete with err = %d\n"), aError);
+    }
+void CMyPlayer::MapcPlayComplete(TInt aError)
+    {
+    console->Printf(_L("play complete with err = %d\n"), aError);
+    }
+#endif
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/sis/console_eka2.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/sis/console_eka2.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,31 @@
+
+;
+; Copyright (c) 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: Console
+;
+
+;
+; UID is the exe's UID
+;
+#{"Console EXE"},(0xEAC80D7E),1,0,0
+
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\Console.exe"		  -"!:\sys\bin\Console.exe"
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/src/console.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/console/src/console.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,95 @@
+/*
+* Copyright (c) 2002 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:  Console
+*
+*/
+
+//  Include Files  
+
+#include "console.h"
+#include <e32base.h>
+#include <e32std.h>
+#include <e32cons.h>			// Console
+
+//  Constants
+
+_LIT(KTextConsoleTitle, "Console");
+_LIT(KTextFailed, " failed, leave code = %d");
+_LIT(KTextPressAnyKey, " [press any key]\n");
+
+//  Global Variables
+
+LOCAL_D CConsoleBase* console; // write all messages to this
+
+
+//  Local Functions
+
+LOCAL_C void MainL()
+    {
+    //
+    // add your program code here, example code below
+    //
+    console->Write(_L("Hello, world!\n"));
+    TKeyCode key;
+    
+    //CMyPlayer* myPlayer = CMyPlayer::NewL();
+    
+    while(1)
+        {
+        key  = console->Getch();
+        console->Printf(_L("\nkey -> %d"),key);
+        
+        }
+    }
+
+LOCAL_C void DoStartL()
+    {
+    // Create active scheduler (to run active objects)
+    CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();
+    CleanupStack::PushL(scheduler);
+    CActiveScheduler::Install(scheduler);
+
+    MainL();
+
+    // Delete active scheduler
+    CleanupStack::PopAndDestroy(scheduler);
+    }
+
+//  Global Functions
+
+GLDEF_C TInt E32Main()
+    {
+    // Create cleanup stack
+    __UHEAP_MARK;
+    CTrapCleanup* cleanup = CTrapCleanup::New();
+
+    // Create output console
+    TRAPD(createError, console = Console::NewL(KTextConsoleTitle, TSize(
+            KConsFullScreen, KConsFullScreen)));
+    if (createError)
+        return createError;
+
+    // Run application code inside TRAP harness, wait keypress when terminated
+    TRAPD(mainError, DoStartL());
+    if (mainError)
+        console->Printf(KTextFailed, mainError);
+    console->Printf(KTextPressAnyKey);
+    console->Getch();
+
+    delete console;
+    delete cleanup;
+    __UHEAP_MARKEND;
+    return KErrNone;
+    }
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer.rls
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer.rls	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+//  LOCALISATION STRINGS
+
+// Caption string for app.
+#define qtn_cmdcreatplayer "Create Player"
+#define qtn_cmdSetOutputL "SetOutputL"
+#define qtn_cmdOutputChanged  "OutputChange"
+#define qtn_cmdOutputChangeReq "OutputReqCom"
+#define qtn_cmdSetShowNote "SetShowNote"
+#define qtn_cmdGetShowNote "GetShowNote"
+#define qtn_caption_string "MyPlayer"
+
+
+// First item in "Options" menu pane
+//#define qtn_command1 "Message"
+
+// Second item in "Options" menu pane
+//#define qtn_command2 "Message from file"
+
+//#define qtn_help "Help"
+
+
+// Third item in "Options" menu pane
+#define qtn_exit "Exit"
+
+// When user requests ECommand1 event, text below is shown.
+#define qtn_audio_player_text "Audio Player"
+
+#define qtn_loc_resource_file_1 "\\resource\\apps\\myplayer_0xe0edbe14"
+
+
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer.rss	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,211 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+//  RESOURCE IDENTIFIER
+NAME MYPL	// 4 letter ID
+
+
+//  INCLUDES
+#include <eikon.rh>
+#include <avkon.rsg>
+#include <avkon.rh>
+#include <appinfo.rh>
+#include <CommonDialogs.hrh> 
+#include <CommonDialogs.rh> 
+#include <pathconfiguration.hrh>
+#include "myplayer.hrh"
+#include "myplayer.rls"
+
+//  RESOURCE DEFINITIONS
+// -----------------------------------------------------------------------------
+//
+//	Define the resource file signature
+//	This resource should be empty.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE RSS_SIGNATURE
+	{
+	}
+
+// -----------------------------------------------------------------------------
+//
+//	Default Document Name
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_default_document_name
+	{
+	buf="MYPL";
+	}
+
+// -----------------------------------------------------------------------------
+//
+//	Define default menu and CBA key.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE EIK_APP_INFO
+	{
+	menubar = r_menubar;
+	cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
+	}
+
+
+// -----------------------------------------------------------------------------
+//
+//   r_menubar
+//   Main menubar
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_BAR r_menubar
+	{
+	titles =
+		{
+		MENU_TITLE { menu_pane = r_menu; }
+		};
+	}
+
+
+// -----------------------------------------------------------------------------
+//
+//   r_menu
+//   Menu for "Options"
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_PANE r_menu
+	{
+	items =
+		{
+		// added the new Options menu command here
+		
+		MENU_ITEM
+	            {
+	            command = ECmdCreatePlayer;
+	            txt = qtn_cmdcreatplayer;
+		        },
+	    MENU_ITEM
+		        {
+		        command = ECmdSetOutputL;
+		        txt = qtn_cmdSetOutputL;
+		        },
+        MENU_ITEM
+                {
+                command = ECmdSetShowNote;
+                txt = qtn_cmdSetShowNote;
+                },		
+       MENU_ITEM
+                {
+                command = ECmdGetShowNote;
+                txt = qtn_cmdGetShowNote;
+                },
+       MENU_ITEM
+               {
+               command = ECmdOutputChanged;
+               txt = qtn_cmdOutputChanged;
+               },         
+      MENU_ITEM
+             {
+             command = ECmdOutputChangeReq;
+             txt = qtn_cmdOutputChangeReq;
+             },
+     	MENU_ITEM
+				{
+				command = EAknSoftkeyExit;
+				txt = qtn_exit;
+				}
+		};
+	}
+
+// -----------------------------------------------------------------------------
+//
+// About dialog resource.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE DIALOG r_about_query_dialog
+	{
+	flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+	buttons = R_AVKON_SOFTKEYS_OK_EMPTY;
+	items=
+		{
+		DLG_LINE 
+			{
+			type = EAknCtPopupHeadingPane;
+			id = EAknMessageQueryHeaderId;
+			itemflags = EEikDlgItemNonFocusing;
+			control = AVKON_HEADING
+				{
+				};
+			},
+		DLG_LINE
+			{
+			type = EAknCtMessageQuery;
+			id = EAknMessageQueryContentId;
+			control = AVKON_MESSAGE_QUERY
+				{
+				};
+			}
+		};
+	}
+
+
+// -----------------------------------------------------------------------------
+//
+// Resources for messages.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF32 r_caption_string { buf=qtn_caption_string; }
+RESOURCE TBUF32 r_about_dialog_title { buf=qtn_about_dialog_title; }
+RESOURCE TBUF r_about_dialog_text { buf=qtn_about_dialog_text; }
+RESOURCE TBUF r_audio_player_text { buf=qtn_audio_player_text; }
+RESOURCE TBUF r_dialog_kerrpermission_denied { buf=qtn_dialog_kerrpermission_denied; }
+
+
+
+
+// ---------------------------------------------------------------------------- 
+//
+// r_localisable_app_info
+//
+// ---------------------------------------------------------------------------- 
+//
+RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info
+	{
+	short_caption = qtn_caption_string;
+	caption_and_icon = 
+	CAPTION_AND_ICON_INFO
+		{
+		caption = qtn_caption_string;
+
+		number_of_icons = 1;
+		icon_file = "\\resource\\apps\\myplayer_0xe0edbe14.mif";
+		};
+	}
+RESOURCE MEMORYSELECTIONDIALOG r_memory_selection_dialog 
+    { 
+    title = "Select location"; 
+    softkey_1 = "Ok"; 
+    softkey_2 = "Back"; 
+    locations = 
+        { 
+        LOCATION { root_path = "C:\\"; } 
+        }; 
+    }
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer_reg.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/data/myplayer_reg.rss	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+#include "myplayer.hrh"
+#include "myplayer.rls"
+#include <appinfo.rh>
+#include <myplayer_0xe0edbe14.rsg>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 _UID3
+
+RESOURCE APP_REGISTRATION_INFO
+	{
+	app_file="myplayer_0xe0edbe14";
+	localisable_resource_file =  qtn_loc_resource_file_1;
+	localisable_resource_id = R_LOCALISABLE_APP_INFO;
+
+	embeddability=KAppNotEmbeddable;
+	newfile=KAppDoesNotSupportNewFile;
+	}
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/gfx/qgn_menu_myplayer.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/gfx/qgn_menu_myplayer.svg	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 88 87.999">
+<g>
+<g>
+<g>
+<g>
+<rect fill="none" width="88" height="87.999"/>
+</g>
+</g>
+<g>
+<linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="12.3042" y1="18.3799" x2="63.4113" y2="79.287">
+<stop offset="0" style="stop-color:#B3DDFF"/>
+<stop offset="0.8146" style="stop-color:#084296"/>
+<stop offset="1" style="stop-color:#084296"/>
+</linearGradient>
+<path fill="url(#XMLID_7_)" d="M32.135,7.415L14.363,17.432v23.167c0,0,8.926,15.351,10.468,18.001       c-2.386,1.704-15.44,11.03-15.44,11.03l21.613,12.652c0,0,12.907-9.85,14.71-11.226c1.979,1.109,16.231,9.101,16.231,9.101       l16.664-15.132c0,0-14.066-6.929-16.888-8.318c1.467-3.01,10.531-21.604,10.531-21.604l-22.298-9.59       c0,0-1.486,3.173-2.093,4.467c-2.046-0.88-6.573-2.826-6.573-2.826s-3.713,2.463-5.696,3.778       c-0.327-0.744-0.542-1.233-0.657-1.495c0.007-0.824,0.213-23.72,0.213-23.72L32.135,7.415z"/>
+<linearGradient id="XMLID_8_" gradientUnits="userSpaceOnUse" x1="40.8276" y1="52.1914" x2="16.1997" y2="21.1353">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_8_)" points="59.051,57.621 69.536,36.111 50.944,28.115 48.852,32.581 41.493,29.418 34.719,33.911        32.932,29.849 33.117,9.157 16.363,18.601 16.363,40.06 27.476,59.169 13.064,69.463 30.856,79.879 45.546,68.669        61.667,77.708 75.089,65.521 "/>
+<linearGradient id="XMLID_9_" gradientUnits="userSpaceOnUse" x1="60.585" y1="31.876" x2="53.8582" y2="45.1125">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_9_)" points="41.26,48.783 50.944,28.115 69.536,36.111 59.051,57.621 "/>
+<polygon fill="#0046B7" points="16.363,40.06 27.476,59.169 41.26,48.783 32.932,29.849 "/>
+<polygon fill="#3366CC" points="16.363,40.06 16.363,18.601 33.117,9.157 32.932,29.849 "/>
+<polygon fill="#CFECFF" points="26.696,39.23 41.493,29.418 59.523,37.168 45.546,47.954 "/>
+<path fill="#5AA7E0" d="M41.954,55.286"/>
+<polygon fill="#3366CC" points="26.696,39.23 27.476,59.169 45.546,68.669 45.546,47.954 "/>
+<polygon fill="#5AA7E0" points="13.064,69.463 27.476,59.169 45.546,68.669 30.856,79.879 "/>
+<linearGradient id="XMLID_10_" gradientUnits="userSpaceOnUse" x1="29.2085" y1="63.6836" x2="48.7102" y2="56.1976">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="0.0056" style="stop-color:#5AA7E0"/>
+<stop offset="0.85" style="stop-color:#3366CC"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_10_)" points="43.423,46.971 27.476,59.169 45.546,68.669 45.546,47.954 "/>
+<polygon fill="#0046B7" points="45.546,47.954 45.546,68.669 59.051,57.621 59.523,37.168 "/>
+<linearGradient id="XMLID_11_" gradientUnits="userSpaceOnUse" x1="45.3936" y1="59.5186" x2="59.0508" y2="59.5186">
+<stop offset="0" style="stop-color:#0046B7"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_11_)" points="45.394,50.368 45.546,68.669 59.051,57.621 "/>
+<linearGradient id="XMLID_12_" gradientUnits="userSpaceOnUse" x1="60.8945" y1="68.6807" x2="57.2953" y2="58.792">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="0.4101" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_12_)" points="61.667,77.708 45.546,68.669 59.051,57.621 75.089,65.521 "/>
+</g>
+</g>
+</g>
+</svg>
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+PRJ_PLATFORMS
+WINSCW ARMV5 GCCE
+
+PRJ_MMPFILES
+
+
+//gnumakefile ..\help\build_help.mk
+myplayer.mmp
+//gnumakefile icons_scalable_dc.mk
+..\console\group\console.mmp
+
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/icons_scalable_dc.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/icons_scalable_dc.mk	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2002 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:  Icons_scalable_dc.mk
+* This is file for creating .mif file (scalable icon)
+*/
+
+
+
+ifeq (WINS,$(findstring WINS, $(PLATFORM)))
+ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z
+else
+ZDIR=$(EPOCROOT)epoc32\data\z
+endif
+
+TARGETDIR=$(ZDIR)\resource\apps
+ICONTARGETFILENAME=$(TARGETDIR)\MyPlayer_0xE0EDBE14.mif
+
+ICONDIR=..\gfx
+
+do_nothing :
+	@rem do_nothing
+
+MAKMAKE : do_nothing
+
+BLD : do_nothing
+
+CLEAN : do_nothing
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+# ----------------------------------------------------------------------------
+# NOTE: if you have JUSTINTIME enabled for your S60 3rd FP1 or newer SDK
+# and this command crashes, consider adding "/X" to the command line.
+# See <http://forum.nokia.com/document/Forum_Nokia_Technical_Library_v1_35/contents/FNTL/Build_process_fails_at_mif_file_creation_in_S60_3rd_Ed_FP1_SDK.htm>
+# ----------------------------------------------------------------------------
+
+RESOURCE : $(ICONTARGETFILENAME)
+
+$(ICONTARGETFILENAME) : $(ICONDIR)\qgn_menu_MyPlayer.svg
+	mifconv $(ICONTARGETFILENAME) \
+		/c32 $(ICONDIR)\qgn_menu_MyPlayer.svg
+
+FREEZE : do_nothing
+
+SAVESPACE : do_nothing
+
+RELEASABLES :
+	@echo $(ICONTARGETFILENAME)
+
+FINAL : do_nothing
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/myplayer.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/myplayer.mmp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+TARGET			myplayer_0xe0edbe14.exe
+TARGETTYPE		exe
+UID		  0x100039CE 0xe0edbe14
+
+SOURCEPATH		..\src
+SOURCE			myplayer.cpp
+SOURCE			myplayerapplication.cpp
+SOURCE			myplayerappview.cpp
+SOURCE			myplayerappUi.cpp
+SOURCE			myplayerdocument.cpp
+SOURCE 			playercode.cpp
+SOURCEPATH		..\data
+
+START RESOURCE	myplayer.rss
+HEADER
+TARGET myplayer_0xE0EDBE14
+TARGETPATH resource\apps
+END //RESOURCE
+
+START RESOURCE	myplayer_reg.rss
+TARGET myplayer_0xE0EDBE14_reg
+TARGETPATH 	  \private\10003a3f\apps
+END //RESOURCE
+
+
+
+USERINCLUDE	   ..\inc
+USERINCLUDE    ..\help
+
+SYSTEMINCLUDE	 \epoc32\include
+SYSTEMINCLUDE	 \epoc32\include\mw
+SYSTEMINCLUDE	 \epoc32\include\platform
+SYSTEMINCLUDE	 \epoc32\include\platform\mw
+SYSTEMINCLUDE   \epoc32\include\mmf\common
+
+
+LIBRARY		   euser.lib
+LIBRARY		   apparc.lib
+LIBRARY		   cone.lib
+LIBRARY		   eikcore.lib
+LIBRARY		   avkon.lib
+LIBRARY		   CommonEngine.lib
+LIBRARY		   efsrv.lib 
+LIBRARY		   estor.lib
+LIBRARY        aknnotify.lib
+LIBRARY        hlplch.lib
+//LIBRARY		   mediaclientaudio.lib 
+LIBRARY        AudioOutputRouting.lib 
+LIBRARY        mmfcontrollerframework.lib	
+//LIBRARY       ConfigurationComponentsFactory.lib
+LIBRARY         CommonDialogs.lib 
+  
+LIBRARY         TelephonyAudioRoutingSession.lib 
+LIBRARY         TelephonyAudioRoutingManager.lib
+
+#if defined(WINSCW)
+LIBRARY         telephonyaudiorouting.lib  
+#else
+LIBRARY         TelephonyAudioRouting.lib 
+#endif
+
+
+LANG SC
+
+VENDORID	  	  0
+SECUREID		  0xe0edbe14
+CAPABILITY	  	  ReadUserData //DRM
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE_UDEBONLY
+#endif
+// End of File
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/myplayer.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/group/myplayer.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,38 @@
+;
+; Copyright (c) 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: TelephonyAudioRouting TestApplication
+;
+;Language - standard language definitions
+&EN
+
+; standard SIS file header
+#{"myplayer"},(0xe0edbe14),1,0,0
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+;Supports Series 60 v 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+;Files to install
+;You should change the source paths to match that of your environment
+;<source> <destination>
+"X:\Epoc32\release\ARMV5\urel\myplayer_0xe0edbe14.exe"		-"!:\sys\bin\myplayer_0xe0edbe14.exe"
+"X:\Epoc32\data\z\resource\apps\myplayer_0xe0edbe14.rsc"		-"!:\resource\apps\myplayer_0xe0edbe14.rsc"
+"X:\Epoc32\data\z\private\10003a3f\apps\myplayer_0xe0edbe14_reg.rsc"	-"!:\private\10003a3f\import\apps\myplayer_0xe0edbe14_reg.rsc"
+;"X:\Epoc32\data\z\resource\apps\myplayer_0xe0edbe14.mif" -"!:\resource\apps\myplayer_0xe0edbe14.mif"
+;"..\help\myplayer_0xe0edbe14.hlp"							 -"!:\resource\help\myplayer_0xe0edbe14.hlp"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/build_help.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/build_help.mk	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2002 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:  build_help.mk
+* This make file will build the application help file (.hlp)
+*/
+
+
+do_nothing :
+	@rem do_nothing
+
+# build the help from the MAKMAKE step so the header file generated
+# will be found by cpp.exe when calculating the dependency information
+# in the mmp makefiles.
+
+MAKMAKE : MyPlayer_0xE0EDBE14.hlp
+MyPlayer_0xE0EDBE14.hlp : MyPlayer.xml MyPlayer.cshlp Custom.xml
+	cshlpcmp MyPlayer.cshlp
+ifeq (WINS,$(findstring WINS, $(PLATFORM)))
+	copy MyPlayer_0xE0EDBE14.hlp $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help
+endif
+
+BLD : do_nothing
+
+CLEAN :
+	del MyPlayer_0xE0EDBE14.hlp
+	del MyPlayer_0xE0EDBE14.hlp.hrh
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+RESOURCE : do_nothing
+		
+FREEZE : do_nothing
+
+SAVESPACE : do_nothing
+
+RELEASABLES :
+	@echo MyPlayer_0xE0EDBE14.hlp
+
+FINAL : do_nothing
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/custom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/custom.xml	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE cshcust SYSTEM "/cshlpcmp/dtd/CSHcust.dtd">
+<?xml:stylesheet href="/cshlpcmp/xsl/cshcust.xsl" title="CS-Help customization" type="text/xsl"?>
+<cshcust>
+<parastyle name="body" font="sansserif" size="10"/>
+<parastyle name="tip" font="sansserif" size="10" left="20"></parastyle>
+<parastyle name="note" font="sansserif" size="10" left="20"></parastyle>
+<parastyle name="important" font="sansserif" size="10" left="20"></parastyle>
+<body style="body"/>
+<titlestyle fontstyle="sansserif" size="10"/>
+<listbullet1style bulletchar="8226"/>
+<listbullet2style bulletchar="8226"/>
+<lists leftindent="20"/>
+</cshcust>
+
+
+
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/myplayer.cshlp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/myplayer.cshlp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE cshproj SYSTEM "/epoc32/tools/cshlpcmp/dtd/cshproj.dtd">
+<?xml:stylesheet href="/epoc32/tools/cshlpcmp/xsl/CSHproj.xsl" title="CS-Help project" type="text/xsl"?>
+<cshproj>
+<helpfileUID>0xE0EDBE14</helpfileUID>
+<directories>
+	<input></input>
+	<output></output>
+	<graphics></graphics>
+	<working>temp\</working>
+</directories>
+<files>
+	<source>
+	<xmlfile>MyPlayer.xml</xmlfile>
+	</source>
+	<destination>MyPlayer_0xE0EDBE14.hlp</destination>
+	<customization>custom.xml</customization>
+	</files>
+</cshproj>
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/myplayer.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/myplayer.xml	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE asptml SYSTEM "/epoc32/tools/cshlpcmp/dtd/asptml.dtd">
+<?xml:stylesheet href="/epoc32/tools/cshlpcmp/xsl/asptml.xsl" title="asptml" type="text/xsl"?>
+<asptml>
+<uid value="0xE0EDBE14"/>
+<topic><category>MyPlayer</category><topictitle>General Information</topictitle>
+<synonyms>General Information</synonyms>
+<context contextUID="General_Information"/>
+<index>General Information</index>
+<p>Insert your help here.</p>
+<p></p>
+</topic>
+</asptml>
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/temp/MyPlayer_0xE0EDBE14.cshlp.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/help/temp/MyPlayer_0xE0EDBE14.cshlp.xml	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE cshlp SYSTEM "file:///U:/epoc32/tools/cshlpcmp/dtd/cshlp.dtd">
+<?xml:stylesheet href="file:///U:/epoc32/tools/cshlpcmp/xsl/cshlp.xsl" title="cshlp" type="text/xsl"?>
+<cshlp helpfileUID="3773677076">
+
+
+<topic topicID="1" categoryUID="3773677076"><category>MyPlayer</category><topictitle>General Information</topictitle>
+<synonyms>General Information</synonyms>
+
+
+<p font="sansserif" style="normal" size="10" color="foreground" justify="left" spacing="10" before="5" after="0" left="0" right="0">Insert your help here.</p>
+<p font="sansserif" style="normal" size="10" color="foreground" justify="left" spacing="10" before="5" after="0" left="0" right="0"/>
+</topic>
+<uid value="3773677076"/>
+<context contextUID="General_Information" topicID="1"/>
+<indexlink topicID="1" indexID="0" categoryUID="3773677076">General Information</indexlink>
+<index indexID="0">General Information</index>
+
+<customization><titlestyle fontstyle="sansserif" size="10"/>
+<listbullet1style bulletchar="8226"/>
+<listbullet2style bulletchar="8226"/>
+<lists leftindent="20"/>
+<body font="sansserif" style="normal" size="10" color="foreground" justify="left" spacing="10" before="5" after="0" left="0" right="0"></body>
+</customization>
+<mbmlist/></cshlp>
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+#ifndef __MY_PLAYER__
+#define __MY_PLAYER__
+
+#include <AudioOutput.h>
+#include "TelephonyAudioRouting.h"
+#include <MTelephonyAudioRoutingObserver.h>
+#include <MTelephonyAudioRoutingPolicyObserver.h>
+
+#include "TelephonyAudioRoutingManager.h"
+
+
+
+class CMyPlayer : public CBase,
+                  public MTelephonyAudioRoutingPolicyObserver ,
+                  public MTelephonyAudioRoutingObserver
+    {
+public:
+    static CMyPlayer* NewL();
+    void ConstructL();
+    ~CMyPlayer();
+    
+    
+public: 
+    //For CTelephonyAudioRouting
+    void SetOutputL();
+    TInt SetShowNote();
+    TInt GetShowNote();  
+    
+       
+    
+    //From MTelephonyAudioRoutingObserver
+    virtual void AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+    virtual void OutputChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+    virtual void SetOutputComplete( CTelephonyAudioRouting& aTelephonyAudioRouting, TInt aError);
+    
+    // For CTelephonyAudioRoutingManager 
+    void OutputChangedTARManager();
+    void OutputChangeRequestCompleted();
+    
+    //From MTelephonyAudioRoutingPolicyObserver
+    void OutputChangeRequested( CTelephonyAudioRoutingManager& aTelephonyAudioRoutingManager, CTelephonyAudioRouting::TAudioOutput aOutput) ;
+
+    
+private:
+    CTelephonyAudioRouting* iTelephonyAudioRouting;
+    CTelephonyAudioRoutingManager* iTelephonyAudioRoutingManager;
+    
+    };
+
+#endif
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.hrh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.hrh	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+#ifndef __MYPLAYER_HRH__
+#define __MYPLAYER_HRH__
+
+#define _UID3 0xE0EDBE14
+
+// MyPlayer enumerate command codes
+enum TMyPlayerIds
+    {
+    ECmdCreatePlayer = 0x6001, // start value must not be 0
+    ECmdOutputChanged,
+    ECmdSetOutputL,
+    ECmdSetShowNote,
+    ECmdGetShowNote,
+    ECmdOutputChangeReq
+    };
+
+#endif // __MYPLAYER_HRH__
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.pan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayer.pan	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+#ifndef __MYPLAYER_PAN__
+#define __MYPLAYER_PAN__
+
+/** MyPlayer application panic codes */
+enum TMyPlayerPanics
+    {
+    EMyPlayerUi = 1
+    // add further panics here
+    };
+
+inline void Panic(TMyPlayerPanics aReason)
+    {
+    _LIT(applicationName, "MyPlayer");
+    User::Panic(applicationName, aReason);
+    }
+
+#endif // __MYPLAYER_PAN__
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerapplication.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerapplication.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+#ifndef __MYPLAYERAPPLICATION_H__
+#define __MYPLAYERAPPLICATION_H__
+
+// INCLUDES
+#include <aknapp.h>
+#include "myplayer.hrh"
+
+// UID for the application;
+// this should correspond to the uid defined in the mmp file
+const TUid KUidMyPlayerApp =
+    {
+    _UID3
+    };
+
+// CLASS DECLARATION
+
+/**
+ * CMyPlayerApplication application class.
+ * Provides factory to create concrete document object.
+ * An instance of CMyPlayerApplication is the application part of the
+ * AVKON application framework for the MyPlayer example application.
+ */
+class CMyPlayerApplication : public CAknApplication
+    {
+public:
+    // Functions from base classes
+
+    /**
+     * From CApaApplication, AppDllUid.
+     * @return Application's UID (KUidMyPlayerApp).
+     */
+    TUid AppDllUid() const;
+
+protected:
+    // Functions from base classes
+
+    /**
+     * From CApaApplication, CreateDocumentL.
+     * Creates CMyPlayerDocument document object. The returned
+     * pointer in not owned by the CMyPlayerApplication object.
+     * @return A pointer to the created document object.
+     */
+    CApaDocument* CreateDocumentL();
+    };
+
+#endif // __MYPLAYERAPPLICATION_H__
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerappui.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerappui.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,95 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+#ifndef __MYPLAYERAPPUI_h__
+#define __MYPLAYERAPPUI_h__
+
+// INCLUDES
+#include <aknappui.h>
+#include "myplayer.h"
+// FORWARD DECLARATIONS
+class CMyPlayerAppView;
+
+// CLASS DECLARATION
+/**
+ * CMyPlayerAppUi application UI class.
+ * Interacts with the user through the UI and request message processing
+ * from the handler class
+ */
+class CMyPlayerAppUi : public CAknAppUi
+    {
+public:
+    // Constructors and destructor
+
+    /**
+     * ConstructL.
+     * 2nd phase constructor.
+     */
+    void ConstructL();
+
+    /**
+     * CMyPlayerAppUi.
+     * C++ default constructor. This needs to be public due to
+     * the way the framework constructs the AppUi
+     */
+    CMyPlayerAppUi();
+
+    /**
+     * ~CMyPlayerAppUi.
+     * Virtual Destructor.
+     */
+    virtual ~CMyPlayerAppUi();
+
+private:
+    // Functions from base classes
+
+    /**
+     * From CEikAppUi, HandleCommandL.
+     * Takes care of command handling.
+     * @param aCommand Command to be handled.
+     */
+    void HandleCommandL(TInt aCommand);
+
+    /**
+     *  HandleStatusPaneSizeChange.
+     *  Called by the framework when the application status pane
+     *  size is changed.
+     */
+    void HandleStatusPaneSizeChange();
+
+    /**
+     *  From CCoeAppUi, HelpContextL.
+     *  Provides help context for the application.
+     *  size is changed.
+     */
+    CArrayFix<TCoeHelpContext>* HelpContextL() const;
+
+private:
+    // Data
+
+    /**
+     * The application view
+     * Owned by CMyPlayerAppUi
+     */
+    CMyPlayerAppView* iAppView;
+    CMyPlayer* iPlayer;
+    TFileName iFileToOpen;
+
+    };
+
+#endif // __MYPLAYERAPPUI_h__
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerappview.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerappview.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,101 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+#ifndef __MYPLAYERAPPVIEW_h__
+#define __MYPLAYERAPPVIEW_h__
+
+// INCLUDES
+#include <coecntrl.h>
+
+// CLASS DECLARATION
+class CMyPlayerAppView : public CCoeControl
+    {
+public:
+    // New methods
+
+    /**
+     * NewL.
+     * Two-phased constructor.
+     * Create a CMyPlayerAppView object, which will draw itself to aRect.
+     * @param aRect The rectangle this view will be drawn to.
+     * @return a pointer to the created instance of CMyPlayerAppView.
+     */
+    static CMyPlayerAppView* NewL(const TRect& aRect);
+
+    /**
+     * NewLC.
+     * Two-phased constructor.
+     * Create a CMyPlayerAppView object, which will draw itself
+     * to aRect.
+     * @param aRect Rectangle this view will be drawn to.
+     * @return A pointer to the created instance of CMyPlayerAppView.
+     */
+    static CMyPlayerAppView* NewLC(const TRect& aRect);
+
+    /**
+     * ~CMyPlayerAppView
+     * Virtual Destructor.
+     */
+    virtual ~CMyPlayerAppView();
+
+public:
+    // Functions from base classes
+
+    /**
+     * From CCoeControl, Draw
+     * Draw this CMyPlayerAppView to the screen.
+     * @param aRect the rectangle of this view that needs updating
+     */
+    void Draw(const TRect& aRect) const;
+
+    /**
+     * From CoeControl, SizeChanged.
+     * Called by framework when the view size is changed.
+     */
+    virtual void SizeChanged();
+
+    /**
+     * From CoeControl, HandlePointerEventL.
+     * Called by framework when a pointer touch event occurs.
+     * Note: although this method is compatible with earlier SDKs, 
+     * it will not be called in SDKs without Touch support.
+     * @param aPointerEvent the information about this event
+     */
+    virtual void HandlePointerEventL(const TPointerEvent& aPointerEvent);
+
+private:
+    // Constructors
+
+    /**
+     * ConstructL
+     * 2nd phase constructor.
+     * Perform the second phase construction of a
+     * CMyPlayerAppView object.
+     * @param aRect The rectangle this view will be drawn to.
+     */
+    void ConstructL(const TRect& aRect);
+
+    /**
+     * CMyPlayerAppView.
+     * C++ default constructor.
+     */
+    CMyPlayerAppView();
+
+    };
+
+#endif // __MYPLAYERAPPVIEW_h__
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerdocument.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/inc/myplayerdocument.h	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+#ifndef __MYPLAYERDOCUMENT_h__
+#define __MYPLAYERDOCUMENT_h__
+
+// INCLUDES
+#include <AknDoc.h>
+
+// FORWARD DECLARATIONS
+class CMyPlayerAppUi;
+class CEikApplication;
+
+// CLASS DECLARATION
+
+/**
+ * CMyPlayerDocument application class.
+ * An instance of class CMyPlayerDocument is the Document part of the
+ * AVKON application framework for the MyPlayer example application.
+ */
+class CMyPlayerDocument : public CAknDocument
+    {
+public:
+    // Constructors and destructor
+
+    /**
+     * NewL.
+     * Two-phased constructor.
+     * Construct a CMyPlayerDocument for the AVKON application aApp
+     * using two phase construction, and return a pointer
+     * to the created object.
+     * @param aApp Application creating this document.
+     * @return A pointer to the created instance of CMyPlayerDocument.
+     */
+    static CMyPlayerDocument* NewL(CEikApplication& aApp);
+
+    /**
+     * NewLC.
+     * Two-phased constructor.
+     * Construct a CMyPlayerDocument for the AVKON application aApp
+     * using two phase construction, and return a pointer
+     * to the created object.
+     * @param aApp Application creating this document.
+     * @return A pointer to the created instance of CMyPlayerDocument.
+     */
+    static CMyPlayerDocument* NewLC(CEikApplication& aApp);
+
+    /**
+     * ~CMyPlayerDocument
+     * Virtual Destructor.
+     */
+    virtual ~CMyPlayerDocument();
+
+public:
+    // Functions from base classes
+
+    /**
+     * CreateAppUiL
+     * From CEikDocument, CreateAppUiL.
+     * Create a CMyPlayerAppUi object and return a pointer to it.
+     * The object returned is owned by the Uikon framework.
+     * @return Pointer to created instance of AppUi.
+     */
+    CEikAppUi* CreateAppUiL();
+
+private:
+    // Constructors
+
+    /**
+     * ConstructL
+     * 2nd phase constructor.
+     */
+    void ConstructL();
+
+    /**
+     * CMyPlayerDocument.
+     * C++ default constructor.
+     * @param aApp Application creating this document.
+     */
+    CMyPlayerDocument(CEikApplication& aApp);
+
+    };
+
+#endif // __MYPLAYERDOCUMENT_h__
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/sis/backup_registration.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/sis/backup_registration.xml	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="yes"?>
+<backup_registration>
+  <system_backup/>
+  <restore requires_reboot = "no"/>
+</backup_registration>
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/sis/myplayer_s60_3_x_v_1_0_0.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/sis/myplayer_s60_3_x_v_1_0_0.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,44 @@
+;
+; Copyright (c) 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: TelephonyAudioRouting TestApplication
+;
+;Language - standard language definitions
+&EN
+
+; standard SIS file header
+#{"myplayer"},(0xe0edbe14),1,0,0
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+;Supports Series 60 v 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+;Files to install
+;You should change the source paths to match that of your environment
+;<source> <destination>
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\myplayer_0xe0edbe14.exe"		-"!:\sys\bin\myplayer_0xe0edbe14.exe"
+"$(EPOCROOT)Epoc32\data\z\resource\apps\myplayer_0xe0edbe14.rsc"		-"!:\resource\apps\myplayer_0xe0edbe14.rsc"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\myplayer_0xe0edbe14_reg.rsc"	-"!:\private\10003a3f\import\apps\myplayer_0xe0edbe14_reg.rsc"
+"$(EPOCROOT)Epoc32\data\z\resource\apps\myplayer_0xe0edbe14.mif" -"!:\resource\apps\myplayer_0xe0edbe14.mif"
+"..\help\myplayer_0xe0edbe14.hlp"							 -"!:\resource\help\myplayer_0xe0edbe14.hlp"
+
+; Add any installation notes if applicable
+;"MyPlayer.txt"		-"!:\private\e0edbe14\MyPlayer.txt"
+
+;required for application to be covered by backup/restore facility 
+"..\sis\backup_registration.xml"		-"!:\private\e0edbe14\backup_registration.xml"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayer.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+// INCLUDE FILES
+#include <eikstart.h>
+#include "myplayerapplication.h"
+
+LOCAL_C CApaApplication* NewApplication()
+    {
+    return new CMyPlayerApplication;
+    }
+
+GLDEF_C TInt E32Main()
+    {
+    return EikStart::RunApplication(NewApplication);
+    }
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerapplication.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerapplication.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,47 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+// INCLUDE FILES
+#include "myplayer.hrh"
+#include "myplayerdocument.h"
+#include "myplayerapplication.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CMyPlayerApplication::CreateDocumentL()
+// Creates CApaDocument object
+// -----------------------------------------------------------------------------
+//
+CApaDocument* CMyPlayerApplication::CreateDocumentL()
+    {
+    // Create an MyPlayer document, and return a pointer to it
+    return CMyPlayerDocument::NewL(*this);
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerApplication::AppDllUid()
+// Returns application UID
+// -----------------------------------------------------------------------------
+//
+TUid CMyPlayerApplication::AppDllUid() const
+    {
+    // Return the UID for the MyPlayer application
+    return KUidMyPlayerApp;
+    }
+
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerappui.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerappui.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,226 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+// INCLUDE FILES
+#include <avkon.hrh>
+#include <aknmessagequerydialog.h>
+#include <CAknMemorySelectionDialog.h>
+#include <CAknFileSelectionDialog.h>
+#include <AknCommonDialogs.h>
+#include <aknnotewrappers.h>
+#include <StringLoader.h>
+#include <f32file.h>
+#include <s32file.h>
+#include <hlplch.h>
+
+#include <myplayer_0xe0edbe14.rsg>
+
+#include "myplayer.hrh"
+#include "myplayer.pan"
+#include "myplayerapplication.h"
+#include "myplayerappui.h"
+#include "myplayerappview.h"
+
+_LIT( KFileName, "C:\\private\\E0EDBE14\\MyPlayer.txt" );
+_LIT( KText, "My Player");
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppUi::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppUi::ConstructL()
+    {
+    // Initialise app UI with standard value.
+    BaseConstructL(CAknAppUi::EAknEnableSkin);
+
+    // Create view object
+    iAppView = CMyPlayerAppView::NewL(ClientRect());
+
+    // Create a file to write the text to
+    TInt err = CCoeEnv::Static()->FsSession().MkDirAll(KFileName);
+    if ((KErrNone != err) && (KErrAlreadyExists != err))
+        {
+        return;
+        }
+
+    RFile file;
+    err = file.Replace(CCoeEnv::Static()->FsSession(), KFileName, EFileWrite);
+    CleanupClosePushL(file);
+    if (KErrNone != err)
+        {
+        CleanupStack::PopAndDestroy(1); // file
+        return;
+        }
+
+    RFileWriteStream outputFileStream(file);
+    CleanupClosePushL(outputFileStream);
+    outputFileStream << KText;
+
+    CleanupStack::PopAndDestroy(2); // outputFileStream, file
+    
+
+    }
+// -----------------------------------------------------------------------------
+// CMyPlayerAppUi::CMyPlayerAppUi()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppUi::CMyPlayerAppUi()
+    {
+    // No implementation required
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppUi::~CMyPlayerAppUi()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppUi::~CMyPlayerAppUi()
+    {
+    if (iAppView)
+        {
+        delete iAppView;
+        iAppView = NULL;
+        }
+    if(iPlayer)
+        delete iPlayer;
+
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppUi::HandleCommandL()
+// Takes care of command handling.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppUi::HandleCommandL(TInt aCommand)
+    {
+    switch (aCommand)
+        {
+        case EEikCmdExit:
+        case EAknSoftkeyExit:
+            Exit();
+            break;
+        
+        case ECmdCreatePlayer:
+            {
+
+            // Load a string from the resource file and display it
+            
+            iPlayer = CMyPlayer::NewL();
+            
+            HBufC* textResource = StringLoader::LoadLC(R_AUDIO_PLAYER_TEXT);
+            CAknInformationNote* informationNote;
+
+            informationNote = new (ELeave) CAknInformationNote;
+
+            // Show the information Note with
+            // textResource loaded with StringLoader.
+            informationNote->ExecuteLD(*textResource);
+
+            // Pop HBuf from CleanUpStack and Destroy it.
+            CleanupStack::PopAndDestroy(textResource);
+            }
+            break;
+        case ECmdSetOutputL:
+            {
+            iPlayer->SetOutputL();
+            RFile rFile;
+
+            //Open file where the stream text is
+            User::LeaveIfError(rFile.Open(CCoeEnv::Static()->FsSession(),
+                    KFileName, EFileStreamText));//EFileShareReadersOnly));// EFileStreamText));
+            CleanupClosePushL(rFile);
+
+            // copy stream from file to RFileStream object
+            RFileReadStream inputFileStream(rFile);
+            CleanupClosePushL(inputFileStream);
+
+            // HBufC descriptor is created from the RFileStream object.
+            HBufC* fileData = HBufC::NewLC(inputFileStream, 32);
+
+            CAknInformationNote* informationNote;
+
+            informationNote = new (ELeave) CAknInformationNote;
+            // Show the information Note
+            informationNote->ExecuteLD(*fileData);
+
+            // Pop loaded resources from the cleanup stack
+            CleanupStack::PopAndDestroy(3); // filedata, inputFileStream, rFile
+            }
+            break;
+        case ECmdSetShowNote:
+            {
+            iPlayer->SetShowNote();
+            }
+            break;
+        case ECmdGetShowNote:
+            {
+            iPlayer->GetShowNote();
+            }
+            break;
+        case ECmdOutputChanged:
+            {
+            iPlayer->OutputChangedTARManager();
+            }
+            break;
+        case ECmdOutputChangeReq:
+           {
+           iPlayer->OutputChangeRequestCompleted();
+           }
+           break;
+        default:
+            Panic(EMyPlayerUi);
+            break;
+        }
+    }
+// -----------------------------------------------------------------------------
+//  Called by the framework when the application status pane
+//  size is changed.  Passes the new client rectangle to the
+//  AppView
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppUi::HandleStatusPaneSizeChange()
+    {
+    iAppView->SetRect(ClientRect());
+    }
+
+CArrayFix<TCoeHelpContext>* CMyPlayerAppUi::HelpContextL() const
+    {
+#warning "Please see comment about help and UID3..."
+    // Note: Help will not work if the application uid3 is not in the
+    // protected range.  The default uid3 range for projects created
+    // from this template (0xE0000000 - 0xEFFFFFFF) are not in the protected range so that they
+    // can be self signed and installed on the device during testing.
+    // Once you get your official uid3 from Symbian Ltd. and find/replace
+    // all occurrences of uid3 in your project, the context help will
+    // work. Alternatively, a patch now exists for the versions of 
+    // HTML help compiler in SDKs and can be found here along with an FAQ:
+    // http://www3.symbian.com/faq.nsf/AllByDate/E9DF3257FD565A658025733900805EA2?OpenDocument
+    CArrayFixFlat<TCoeHelpContext>* array = new (ELeave) CArrayFixFlat<
+            TCoeHelpContext> (1);
+    CleanupStack::PushL(array);
+    //array->AppendL(TCoeHelpContext(KUidMyPlayerApp, KGeneral_Information));
+    CleanupStack::Pop(array);
+    return array;
+    }
+
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerappview.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerappview.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+// INCLUDE FILES
+#include <coemain.h>
+#include "myplayerappview.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppView* CMyPlayerAppView::NewL(const TRect& aRect)
+    {
+    CMyPlayerAppView* self = CMyPlayerAppView::NewLC(aRect);
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppView* CMyPlayerAppView::NewLC(const TRect& aRect)
+    {
+    CMyPlayerAppView* self = new (ELeave) CMyPlayerAppView;
+    CleanupStack::PushL(self);
+    self->ConstructL(aRect);
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppView::ConstructL(const TRect& aRect)
+    {
+    // Create a window for this application view
+    CreateWindowL();
+
+    // Set the windows size
+    SetRect(aRect);
+
+    // Activate the window, which makes it ready to be drawn
+    ActivateL();
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::CMyPlayerAppView()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppView::CMyPlayerAppView()
+    {
+    // No implementation required
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::~CMyPlayerAppView()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerAppView::~CMyPlayerAppView()
+    {
+    // No implementation required
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::Draw()
+// Draws the display.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppView::Draw(const TRect& /*aRect*/) const
+    {
+    // Get the standard graphics context
+    CWindowGc& gc = SystemGc();
+
+    // Gets the control's extent
+    TRect drawRect(Rect());
+
+    // Clears the screen
+    gc.Clear(drawRect);
+
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::SizeChanged()
+// Called by framework when the view size is changed.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppView::SizeChanged()
+    {
+    DrawNow();
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerAppView::HandlePointerEventL()
+// Called by framework to handle pointer touch events.
+// Note: although this method is compatible with earlier SDKs, 
+// it will not be called in SDKs without Touch support.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerAppView::HandlePointerEventL(const TPointerEvent& aPointerEvent)
+    {
+
+    // Call base class HandlePointerEventL()
+    CCoeControl::HandlePointerEventL(aPointerEvent);
+    }
+
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerdocument.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/myplayerdocument.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+// INCLUDE FILES
+#include "myplayerappui.h"
+#include "myplayerdocument.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CMyPlayerDocument::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerDocument* CMyPlayerDocument::NewL(CEikApplication& aApp)
+    {
+    CMyPlayerDocument* self = NewLC(aApp);
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerDocument::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerDocument* CMyPlayerDocument::NewLC(CEikApplication& aApp)
+    {
+    CMyPlayerDocument* self = new (ELeave) CMyPlayerDocument(aApp);
+
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerDocument::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CMyPlayerDocument::ConstructL()
+    {
+    // No implementation required
+    }
+
+// -----------------------------------------------------------------------------
+// CMyPlayerDocument::CMyPlayerDocument()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CMyPlayerDocument::CMyPlayerDocument(CEikApplication& aApp) :
+    CAknDocument(aApp)
+    {
+    // No implementation required
+    }
+
+// ---------------------------------------------------------------------------
+// CMyPlayerDocument::~CMyPlayerDocument()
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+CMyPlayerDocument::~CMyPlayerDocument()
+    {
+    // No implementation required
+    }
+
+// ---------------------------------------------------------------------------
+// CMyPlayerDocument::CreateAppUiL()
+// Constructs CreateAppUi.
+// ---------------------------------------------------------------------------
+//
+CEikAppUi* CMyPlayerDocument::CreateAppUiL()
+    {
+    // Create the application user interface, and return a pointer to it;
+    // the framework takes ownership of this object
+    return new (ELeave) CMyPlayerAppUi;
+    }
+
+// End of File
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/playercode.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmaudio_plat/telephony_audio_routing_client_api/TelephonyAudioRouting_TestApp/src/playercode.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,134 @@
+/*
+* Copyright (c) 2002 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:  TelephonyAudioRouting Test Application
+*
+*/
+
+
+#include "myplayer.h"
+#include "StreamControlCustomCommandsParser.h"
+
+CMyPlayer* CMyPlayer::NewL()
+    {
+    CMyPlayer* self = new(ELeave) CMyPlayer;
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+void CMyPlayer::ConstructL()
+    {
+    iTelephonyAudioRouting = CTelephonyAudioRouting::NewL(*this);
+    
+    RArray<CTelephonyAudioRouting::TAudioOutput> availableoutputs;
+    availableoutputs.Append(CTelephonyAudioRouting::ENone);
+    availableoutputs.Append(CTelephonyAudioRouting::ELoudspeaker);
+    iTelephonyAudioRoutingManager = CTelephonyAudioRoutingManager::NewL(*this,availableoutputs.Array());
+        
+    }
+
+CMyPlayer::~CMyPlayer()
+    {
+    RDebug::Printf("CMdaAudioPlayerUtility:CMyPlayer::~CMyPlayer");
+    if (iTelephonyAudioRoutingManager)
+      {
+      delete iTelephonyAudioRoutingManager;
+      iTelephonyAudioRoutingManager = NULL;
+      }
+    
+    if (iTelephonyAudioRouting)
+        {
+        delete iTelephonyAudioRouting;
+        iTelephonyAudioRouting = NULL;
+        }
+    }
+
+void CMyPlayer::SetOutputL()
+    {
+    TInt error = KErrNone;
+    CTelephonyAudioRouting::TAudioOutput output(CTelephonyAudioRouting::ENotActive);
+          
+    TRAP(error,iTelephonyAudioRouting->SetOutputL(output)); 
+    if (error == KErrNone)
+        {
+        RDebug::Printf("iTelephonyAudioRoutingProxy/SetOutputL - err=%d",error);
+        }
+    else
+        {
+        RDebug::Printf("iTelephonyAudioRoutingProxy/SetOutputL - err-else=%d",error);
+        }
+         
+    }
+
+void CMyPlayer::AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting)
+{
+    RDebug::Printf("AvailableOutputsChanged");
+}
+void CMyPlayer::OutputChanged( CTelephonyAudioRouting& aTelephonyAudioRouting)
+{
+    RDebug::Printf("OutputChanged");
+}
+void CMyPlayer::SetOutputComplete( CTelephonyAudioRouting& aTelephonyAudioRouting, TInt aError)
+{
+    RDebug::Printf("SetOutputComplete");
+}
+
+TInt CMyPlayer::SetShowNote()
+{
+    TBool aMode= ETrue;
+    TRAPD(error,iTelephonyAudioRouting->SetShowNote(aMode));
+    if (error == KErrNone)
+            {
+            RDebug::Printf("SetShowNote - err=%d",error);
+            }
+        else
+            {
+            RDebug::Printf("SetShowNote - err-else=%d",error);
+            }
+    
+}
+TInt CMyPlayer::GetShowNote()
+    {
+       TBool aMode= ETrue;
+       TRAPD(error,iTelephonyAudioRouting->GetShowNote(aMode));
+       if (error == KErrNone)
+               {
+               RDebug::Printf("GetShowNote - err=%d",error);
+               }
+           else
+               {
+               RDebug::Printf("GetShowNote - err-else=%d",error);
+               }
+    }
+
+
+void CMyPlayer::OutputChangedTARManager()
+    {
+    RDebug::Printf("Enter OutputChangedTARManager");
+    CTelephonyAudioRouting::TAudioOutput output(CTelephonyAudioRouting::EHandset);
+    iTelephonyAudioRoutingManager->OutputChanged(output);
+    RDebug::Printf("Exit OutputChangedTARManager");
+    }
+void CMyPlayer::OutputChangeRequestCompleted()
+    {
+    RDebug::Printf("Enter OutputChangeRequestCompleted");
+    TInt error=KErrNone;
+    CTelephonyAudioRouting::TAudioOutput output(CTelephonyAudioRouting::ELoudspeaker);
+    iTelephonyAudioRoutingManager->OutputChangeRequestCompleted(output,error);
+    RDebug::Printf("Exit OutputChangeRequestCompleted");
+    }
+void CMyPlayer::OutputChangeRequested( CTelephonyAudioRoutingManager& aTelephonyAudioRoutingManager, CTelephonyAudioRouting::TAudioOutput aOutput) 
+    {
+    RDebug::Printf("OutputChangeRequested");
+    }
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/audio_effects_api/doc/S60_3_0_Effects_API_Specification_C.doc
Binary file mmaudio_pub/audio_effects_api/doc/S60_3_0_Effects_API_Specification_C.doc has changed
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/audio_effects_api/tsrc/Group/bld.inf
--- a/mmaudio_pub/audio_effects_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/audio_effects_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -44,4 +44,4 @@
 
 PRJ_TESTMMPFILES
 
-#include "../AudioEffectTestModule/Group/bld.inf"
+#include "../AudioEffectTestModule/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestBase.cpp
--- a/mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestBase.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestBase.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -502,6 +502,6 @@
 
 void CEffectPresetsTest::MvpuoEvent(const TMMFEvent& aEvent)
 	{
-	iLogger->Log(_L("MvpuoPrepareComplete: %x"), aEvent);
-	RDebug::Print(_L("CEffectPresetsTest::MvpuoPrepareComplete :-> Error[%x]"), aEvent);
+ 	iLogger->Log(_L("MvpuoPrepareComplete: %d"), aEvent.iErrorCode); 
+	RDebug::Print(_L("CEffectPresetsTest::MvpuoPrepareComplete :-> Error[%d]"), aEvent.iErrorCode);
 	}
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp
--- a/mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -396,9 +396,8 @@
 {
 	TInt err=KErrNone;
 
-	CBassBoost* bassBoost = NULL;
 	//iBassBoost = &iAudioEqualizerUtility->BassBoost();
-	TRAP(err, bassBoost = &iAudioEqualizerUtility->BassBoost());
+	TRAP(err, CBassBoost* bassBoost = &iAudioEqualizerUtility->BassBoost());
 
 	aResult.iResult = err;
 	if (err)
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/audio_effects_presets_api/tsrc/Group/bld.inf
--- a/mmaudio_pub/audio_effects_presets_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/audio_effects_presets_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -44,4 +44,4 @@
 
 PRJ_TESTMMPFILES
 
-#include "../EffectPresetsTest/Group/bld.inf"
+#include "../EffectPresetsTest/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/Conf/DRMAudioPlaybackTestModule.cfg
--- a/mmaudio_pub/drm_audio_player_api/tsrc/Conf/DRMAudioPlaybackTestModule.cfg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/Conf/DRMAudioPlaybackTestModule.cfg	Tue Nov 02 12:13:59 2010 +0000
@@ -5,6 +5,22 @@
 // Testing Playback to EOF
 
 [TestCase]
+id 1047
+Title DRMAudioPlayback.132- custom command
+SoundFile e:\testing\data\mp3\30s_batendo_a_porta.mp3
+Delay 1000000
+[End_TestCase]
+
+
+[TestCase]
+id 1033
+Title DRMAudioPlayback.133 - Register for audio loading notification 30s_batendo_a_porta.mp3
+SoundFile e:\testing\data\mp3\30s_batendo_a_porta.mp3
+Delay 1000000
+[End_TestCase]
+
+
+[TestCase]
 id 1002
 Title DRMAudioPlayback.1 - Play AMR_WB_6.6kbps.awb
 SoundFile e:\testing\data\awb\AMR_WB_6.6kbps.awb
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/DRMAudioPlay.h
--- a/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/DRMAudioPlay.h	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/DRMAudioPlay.h	Tue Nov 02 12:13:59 2010 +0000
@@ -338,6 +338,7 @@
         TInt TestCasePlayRepeatDRMFileWithPlayWindow(CStifSectionParser *section , TTestResult &aResult) ;
         TInt TestCasePlayPauseRepeatDRMFileWithPlayWindow(CStifSectionParser *section , TTestResult &aResult) ;
         TInt TestCasePlayRepeatForeverDRMFileWithPlayWindow(CStifSectionParser *section , TTestResult &aResult) ;
+        TInt TestCaseCustomCommand(CStifSectionParser *section , TTestResult &aResult) ;
     protected:  // Functions from base classes
 
         /**
@@ -427,6 +428,8 @@
 		static const TInt KCasePlayRepeatDRMFileWithPlayWindow;
         static const TInt KCasePlayPauseRepeatDRMFileWithPlayWindow;
 		static const TInt KCasePlayRepeatForeverDRMFileWithPlayWindow;
+		static const TInt KCaseRegisterForAudioLoadingNotification;
+		static const TInt KCaseCustomCommand ;
 
     protected:  // Data
 
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/SimpleSoundPlayer.h
--- a/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/SimpleSoundPlayer.h	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/inc/SimpleSoundPlayer.h	Tue Nov 02 12:13:59 2010 +0000
@@ -35,7 +35,7 @@
 
 const TUid KUidInterfaceMMFController = {KMmfUidPluginInterfaceController};
 
-class CSimpleSoundPlayer: public CBase , public MEventTarget , public MDrmAudioPlayerCallback
+class CSimpleSoundPlayer: public CBase , public MEventTarget , public MDrmAudioPlayerCallback,public MAudioLoadingObserver
 	{
 public:
 	static CSimpleSoundPlayer* NewUrlL(const TDesC &aDescriptor, TInt aIapId, const TDesC8 &aMime, CTestModuleIf &aConsole, CStifLogger &aLogger, TBool aImmediate=ETrue);
@@ -91,7 +91,10 @@
 	TInt GetNumberOfMetaDataEntries(TInt &aNumEntries);
 	CMMFMetaDataEntry *GetMetaDataEntryL(TInt aMetaDataIndex);
 	TInt OpenL(const TFileName &aFileName , const TBool &aImmediate);
-
+	void CustomCommand();
+	//MAudioLoadingObserver
+	    virtual void MaloLoadingStarted();
+	    virtual void MaloLoadingComplete();
 private:
 	TInt OpenUrlL(const TDesC &aUrl, TInt aIapId, const TDesC8 &aMime) ;
 	TInt Pause();
@@ -146,6 +149,7 @@
 	static const TInt KplayerActionGetAudioLoadingProgress;
 	static const TInt KplayerActionRegisterForAudioLoadingNotification;
 	static const TInt KplayerActionControllerImplementationInformation;
+	static const TInt KPlayerActionCustomCommand;
 
 	TInt ExecuteL(CParameters *aParams) ;
 
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp
--- a/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -21,12 +21,12 @@
 #include <caf.h>
 #include <caf/supplier.h>
 #include <caf/importfile.h>
-#include <BAUTILS.H>
+#include <bautils.h>
 
 using namespace ContentAccess;
 
 	// Constants
-	const TInt CDRMAudioPlay::MAX_TESTCASE_ID = 1046;
+	const TInt CDRMAudioPlay::MAX_TESTCASE_ID = 1047;
 	const TInt CDRMAudioPlay::KDefaultRepeats = 5;
 	const TInt CDRMAudioPlay::KDefaultRepeatForever = -2;
 	const TInt CDRMAudioPlay::KDefaultPauseDelay = 1000000;
@@ -84,6 +84,8 @@
     const TInt CDRMAudioPlay::KCasePlayRepeatDRMFileWithPlayWindow                  = 1044;
     const TInt CDRMAudioPlay::KCasePlayPauseRepeatDRMFileWithPlayWindow             = 1045;
     const TInt CDRMAudioPlay::KCasePlayRepeatForeverDRMFileWithPlayWindow           = 1046;
+    const TInt CDRMAudioPlay::KCaseCustomCommand                                    = 1047;
+    
 
 // ** FilePlay *******************************************************
 TInt CDRMAudioPlay::TestCasePlayFileWithPauseL(CStifSectionParser *section , TTestResult &aResult)
@@ -339,7 +341,7 @@
         	parseError = item->GetInt(KTagFileType, FileType);
         	CleanupStack::PopAndDestroy(item);
         	}
-
+        iLogger->Log(_L("Parse error:%d"),parseError);
         CSimpleSoundPlayer *sndPlayer = CSimpleSoundPlayer::NewL( FileName, TestModuleIf() , *iLogger, Immediate, FileType);
 
 		CleanupStack::PushL(sndPlayer);
@@ -935,7 +937,7 @@
 			iLogger->Log(_L("Setting Balance to: %d"), Balance);
 			sndPlayer->iBalance = Balance;
 			}
-
+    iLogger->Log(_L("Parse error:%d"),ParseError);
 		sndPlayer->iSetBalance = true;
 
 //		iLogger->Log(_L("Setting Balance to: %d"), Balance);
@@ -1005,7 +1007,7 @@
         	parseError = item->GetInt(KTagDesReadOnly, DesReadOnly);
         	CleanupStack::PopAndDestroy(item);
         	}
-
+    iLogger->Log(_L("Parse error:%d"),parseError);
 		iLogger->Log(_L("Creating simple player with descriptor from [%S]"), &FileNamePtr);
 		CSimpleSoundPlayer *sndPlayer = CSimpleSoundPlayer::NewL( *SoundFile, TestModuleIf() , *iLogger, Immediate, DesReadOnly);
 
@@ -3455,6 +3457,8 @@
             return TestCasePlayPauseRepeatDRMFileWithPlayWindow(section, aResult);
         case KCasePlayRepeatForeverDRMFileWithPlayWindow:
             return TestCasePlayRepeatForeverDRMFileWithPlayWindow(section, aResult);
+       case KCaseCustomCommand:
+           return TestCaseCustomCommand(section, aResult);
 		}
 	aResult.iResultDes.Copy(KConfigInvalid());
 	aResult.iResult = KErrNotExecuted;
@@ -4042,3 +4046,53 @@
         return KErrConfigInvalid;
         }
     }
+TInt CDRMAudioPlay:: TestCaseCustomCommand(CStifSectionParser *section , TTestResult &aResult)
+    {
+    TPtrC FileNamePtr;
+        TTimeIntervalMicroSeconds32 ReportDelay=KDefaultReportDelay;
+
+        if ( !section->GetLine(KTagSoundFile, FileNamePtr, ENoTag) )
+            {
+            TBool UsingDefaultReportDelay;;
+            TFileName FileName = FileNamePtr;
+            iLogger->Log(_L("Creating simple player with file [%S]"), &FileNamePtr);
+            CSimpleSoundPlayer *sndPlayer = CSimpleSoundPlayer::NewL( FileName, TestModuleIf() , *iLogger);
+            CleanupStack::PushL(sndPlayer);
+
+            //###############################################
+            ReportDelay = GetTimeIntervalL(section, KTagDelay, UsingDefaultReportDelay, (TTimeIntervalMicroSeconds32)KDefaultReportDelay);
+            iLogger->Log(_L("Setting delays to report position to [%d]"), ReportDelay.Int());
+            //###############################################
+
+            CParameters *reportParams = new(ELeave)CParameters(CSimpleSoundPlayer::KPlayerActionCustomCommand);
+            CleanupStack::PushL(reportParams);
+            CMediaEvent *mEventGetAudioLoadingProgress = CMediaEvent::NewLC(TestModuleIf() , *iLogger, ReportDelay, ReportDelay, sndPlayer, reportParams);
+
+            iLogger->Log(_L("Starting scheduler"));
+            CActiveScheduler::Start();
+
+            iLogger->Log(_L("Returned from player, errorcode: %d"), sndPlayer->iFinalError );
+
+            aResult.iResult = sndPlayer->iFinalError;
+
+          
+            if(aResult.iResult == KErrNotSupported)
+                {
+                  aResult.iResult = KErrNone;
+                }
+            CleanupStack::PopAndDestroy(mEventGetAudioLoadingProgress);
+            CleanupStack::Pop(reportParams);
+
+            CleanupStack::PopAndDestroy(sndPlayer);
+            return KErrNone;    //aResult.iResult;
+
+            }
+        else
+            {
+            //The file name of the clip to play is missing
+            aResult.iResultDes.Copy(KConfigInvalid());
+            aResult.iResult = KErrNotExecuted;
+            return KErrConfigInvalid;
+            }
+    }
+
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_work.cpp
--- a/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_work.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_work.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -83,7 +83,7 @@
 
 	//=/TInt KErrRecFormats = -1130;
 	//[*]TPtrC FileNamePtr;
-	TInt Error=KErrNone;
+
 	//[*]if ( !section->GetLine(KTagSoundFile, FileNamePtr, ENoTag) )
 	//[*]	{
 	//[*]	TFileName FileName = FileNamePtr;
@@ -134,7 +134,7 @@
 				if (err3 != KErrNone)
 					{
 					iLogger->Log(_L("Error %d openning controller"),err3);
-					aResult.iResult = Error = err3;
+					aResult.iResult  = err3;
 					break;
 					//continue;
 					}
@@ -150,7 +150,7 @@
 					for (TInt l = 0; l < (info->SupportedFileExtensions()).Count(); l++)
 						{
 						iLogger->Log(_L("Calling CMMFFormatImplementationInformation::SupportedFileExtensions()"));
-						iLogger->Log(_L("Format supported: %S"),(info->SupportedFileExtensions())[l]);
+						//iLogger->Log(_L("Format supported: %S"),(info->SupportedFileExtensions())[l]);
 						}
 					CleanupStack::PopAndDestroy();
 					}
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp
--- a/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -40,6 +40,7 @@
 const TInt CSimpleSoundPlayer::KplayerActionSetRepeats = 21;
 const TInt CSimpleSoundPlayer::KPlayerActionGetMetaDataEntry = 22;
 const TInt CSimpleSoundPlayer::KPlayerActionGetNumberOfMetaDataEntries = 23;
+const TInt CSimpleSoundPlayer::KPlayerActionCustomCommand = 24;
 
 
 CSimpleSoundPlayer::CSimpleSoundPlayer(CTestModuleIf &aConsole, CStifLogger &aLogger, TBool aImmediate, TBool aFileType)
@@ -766,8 +767,8 @@
             return ETrue;
             //break;
         case KplayerActionRegisterForAudioLoadingNotification:
- //       	MAudioLoadingObserver &aLoadingObserver=0;
- //       	RegisterForAudioLoadingNotification(aLoadingObserver);
+       	
+        	RegisterForAudioLoadingNotification(*this);
             return ETrue;
             //break;
         case KplayerActionControllerImplementationInformation:
@@ -799,9 +800,42 @@
 		case KPlayerActionOpenFileHandler:
 			OpenFileHandlerL((static_cast<CFileNameParameters*>(aParams) )->GetFileName() , ETrue);
 			break;
+		case KPlayerActionCustomCommand:
+		    CustomCommand();
 		}
 	if (iIsLoopPlayEnabled)
 	    return ETrue;
 	else
 	    return EFalse;
 	}
+
+
+void CSimpleSoundPlayer::MaloLoadingStarted()
+    {
+     iLogger.Log(_L("CSimpleSoundPlayer::MaloLoadingStarted"));
+    }
+void CSimpleSoundPlayer::MaloLoadingComplete()
+    {
+    iLogger.Log(_L("CSimpleSoundPlayer::MaloLoadingComplete"));
+    }
+
+void CSimpleSoundPlayer::CustomCommand()
+    {
+          TBuf8<25> dataFrom;
+
+            TRequestStatus status;
+            TMMFMessageDestinationPckg dummyPckg;
+            TInt dummyFunc = 100;
+            TBuf8<8> dummyBuff;
+            iMdaPlayer->CustomCommandSync(dummyPckg,dummyFunc,dummyBuff,dummyBuff);
+            iMdaPlayer->CustomCommandSync(dummyPckg,dummyFunc,dummyBuff,dummyBuff,dataFrom);
+
+            iMdaPlayer->CustomCommandAsync(dummyPckg,dummyFunc,dummyBuff,dummyBuff,status);
+            User::WaitForRequest(status);
+
+            iMdaPlayer->CustomCommandAsync(dummyPckg,dummyFunc,dummyBuff,dummyBuff,dataFrom,status);
+           
+            User::WaitForRequest(status);
+
+            
+    }
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/Group/bld.inf
--- a/mmaudio_pub/drm_audio_player_api/tsrc/Group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmaudio_pub/drm_audio_player_api/tsrc/Group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -44,4 +44,4 @@
 
 PRJ_TESTMMPFILES
 
-#include "../DRMAudioPlay/Group/bld.inf"
+#include "../DRMAudioPlay/group/bld.inf"
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
diff -r 9d4397b300d1 -r b220a9341636 mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/src/server/BaseClasses/mmfdatapath.cpp
--- a/mmlibs/mmfw/src/server/BaseClasses/mmfdatapath.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/src/server/BaseClasses/mmfdatapath.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -217,11 +217,20 @@
 	//CreateSourceBufferL and CreateSinkBufferL we will need to obtain them by 
 	//asynchronous buffer creation when playing starts.
 
+	TInt err = KErrNone;
 	if (iBuffersToUse & ENeedSourceBuffer)
 		{
 		if (!iSourceBuffer) //we may already have a buffer from a previous initialization
 			{
-			TRAPD(err, iSourceBuffer = iDataSource->CreateSourceBufferL(iMediaId,*iSinkBuffer, iSrcBufRef));
+	        if(iSinkBuffer)
+	            {
+	            TRAP(err, iSourceBuffer = iDataSource->CreateSourceBufferL(iMediaId,*iSinkBuffer, iSrcBufRef));
+	            }
+	        else
+	            {
+	            TRAP(err, iSourceBuffer = iDataSource->CreateSourceBufferL(iMediaId,iSrcBufRef));
+	            }
+	      
 			if(err != KErrNone && err != KErrNotSupported)
 				{
 #ifdef _DP_DEBUG
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/group/char_mmf_audioplay_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,16 +15,26 @@
 
 "\epoc32\release\armv5\urel\char_mmf_audioplay.dll"-"c:\sys\bin\char_mmf_audioplay.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 // ini
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay.ini" - "c:\char\mmf\char_mmf_audioplay.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay.ini" - "c:\char\mmf\char_mmf_audioplay.ini"
 
 // scripts
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_none.script" - "c:\char_mmf_audioplay_none.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_wav.script" - "c:\char_mmf_audioplay_wav.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_none.script" - "c:\char_mmf_audioplay_none.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\play\scripts\char_mmf_audioplay_wav.script" - "c:\char_mmf_audioplay_wav.script"
 
 //Data
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wav"-"c:\char\mmf\data\maintst.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\Corrupt.wav"-"c:\char\mmf\data\Corrupt.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\OneSample.wav"-"c:\char\mmf\data\OneSample.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wma"-"c:\char\mmf\data\maintst.wma"
\ No newline at end of file
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wav"-"c:\char\mmf\data\maintst.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\Corrupt.wav"-"c:\char\mmf\data\Corrupt.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\OneSample.wav"-"c:\char\mmf\data\OneSample.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst.wma"-"c:\char\mmf\data\maintst.wma"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_aac.script
 // 
-//
+//This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_aac_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_aac_notification.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_amr.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_amr_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_amr_notification.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_mp3.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_mp3_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audioplay_mp3_notification.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_none.script	Tue Nov 02 12:13:59 2010 +0000
@@ -20,7 +20,7 @@
 # wait for ring.wav to finish playing
 delay 1000
 
-//!@SYMTestCaseID             MM-MMF-APLCLNT-CHRTZ-NONE-I-0003
+//!@SYMTestCaseID             MM-MMF-APLCLNT-CHRTZ-NONE-I-0003  //This test is not running as the functionality is not supported.
 //!@SYMTestCaseDesc           Open an audio file with no controller to support the audio file format.
 //!@SYMTestPriority           4
 //!@SYMTestActions            1. Create audio player utility 2. Open an audio file with no controller to support the audio file format.
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_ogg_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_panic_debug.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_panic_debug.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_panic_debug.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_wav_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_wav_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/play/scripts/char_mmf_audioplay_wav_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 PRINT 
 LOAD_SUITE char_mmf_audioplay.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/group/char_mmf_audiorec_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,28 +15,38 @@
 
 "\epoc32\release\armv5\urel\char_mmf_audiorec.dll"-"c:\sys\bin\char_mmf_audiorec.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 // ini
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec.ini" - "c:\char\mmf\char_mmf_audiorec.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec.ini" - "c:\char\mmf\char_mmf_audiorec.ini"
 
 // scripts
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav.script" - "c:\char_mmf_audiorec_wav.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_1.script" - "c:\char_mmf_audiorec_wav_1.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_2.script" - "c:\char_mmf_audiorec_wav_2.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg.script" - "c:\char_mmf_audiorec_ogg.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_overflow.script" - "c:\char_mmf_audiorec_ogg_overflow.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_panic_emu_debug.script" - "c:\char_mmf_audiorec_panic_emu_debug.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_notification.script" - "c:\char_mmf_audiorec_wav_notification.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav.script" - "c:\char_mmf_audiorec_wav.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_1.script" - "c:\char_mmf_audiorec_wav_1.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_2.script" - "c:\char_mmf_audiorec_wav_2.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg.script" - "c:\char_mmf_audiorec_ogg.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_overflow.script" - "c:\char_mmf_audiorec_ogg_overflow.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_panic_emu_debug.script" - "c:\char_mmf_audiorec_panic_emu_debug.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_wav_notification.script" - "c:\char_mmf_audiorec_wav_notification.script"
 
 //#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_notification.script" - "c:\char_mmf_audiorec_ogg_notification.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_amr.script" - "c:\char_mmf_audiorec_amr.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_aac.script" - "c:\char_mmf_audiorec_aac.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_amr_notification.script" - "c:\char_mmf_audiorec_amr_notification.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_aac_notification.script" - "c:\char_mmf_audiorec_aac_notification.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_ogg_notification.script" - "c:\char_mmf_audiorec_ogg_notification.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_amr.script" - "c:\char_mmf_audiorec_amr.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_aac.script" - "c:\char_mmf_audiorec_aac.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_amr_notification.script" - "c:\char_mmf_audiorec_amr_notification.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\record\scripts\char_mmf_audiorec_aac_notification.script" - "c:\char_mmf_audiorec_aac_notification.script"
 
 //Data
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\data\maintst2.wav"-"c:\char\mmf\data\maintst2.wav"
 
 //PV Resource files
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x1027290aamrencopt.rsc"-"c:\resource\a3f\hwdev0x1027290a.rsc"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfcharacterisationvalidation\clientutils\audio\data\hwdev0x1027290aamrencopt.rsc"-"c:\resource\a3f\hwdev0x1027290a.rsc"
 //#endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audiorec_aac.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_aac_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audiorec_aac_notification.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audiorec_amr.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_amr_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // @file char_mmf_audiorec_amr_notification.script
 // 
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_overflow.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_overflow.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_ogg_overflow.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_panic_emu_debug.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_panic_emu_debug.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_panic_emu_debug.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_notification.script
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_notification.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/scripts/char_mmf_audiorec_wav_notification.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 ///////////////////////////////////////////////////////////////////
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/src/audiorec_teststep.h
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/src/audiorec_teststep.h	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/audio/record/src/audiorec_teststep.h	Tue Nov 02 12:13:59 2010 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 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"
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+// 
 
 
 #ifndef AUDIORECTEST_H
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfcharacterisationvalidation/clientutils/video/play/group/char_mmf_videoplay_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 // ini
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/Data/NokiaTune.nrt
Binary file mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/Data/NokiaTune.nrt has changed
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/Data/ringing_tone.rng
Binary file mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/Data/ringing_tone.rng has changed
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/TestRecorder.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -1413,11 +1413,20 @@
 			else
 				{
 				INFO_PRINTF3(_L("Expected length %d, actual length %d"), expectedLength, actualLength);
+				if (iError == KErrOverflow )
+				            {
+                            ret = EPass;
+				            }
 				}
 
 			}
 		}
-
+	
+	if (iError == KErrOverflow)
+		{
+		INFO_PRINTF2(_L("Overflow happened and ignored = %d"), ret);
+		ret = EPass;
+		}
 
 	if (ret != EPass)
 		{
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -108,8 +108,8 @@
 ../Data/100khzSRate1KhzTone.wav	c:/aclntitestdata/100khzsrate1khztone.wav
 ../Data/7.33khzSRate1KhzTone.wav	c:/aclntitestdata/7.33khzsrate1khztone.wav
 ../Data/OneSample.wav		c:/aclntitestdata/onesample.wav
-../Data/sequence1.sqn		c:/aclntitestdata/sequence1.sqn
-../Data/sequence2.sqn		c:/aclntitestdata/sequence2.sqn
+../Data/ringing_tone.rng	c:/aclntitestdata/ringing_tone.rng
+../Data/NokiaTune.nrt		c:/aclntitestdata/NokiaTune.nrt
 ../Data/16bitmPcm.xxx		c:/aclntitestdata/16bitmpcm.xxx
 ../Data/explo.wav			c:/aclntitestdata/explo.wav
 ../Data/drmwavfile.drm		c:/aclntitestdata/drmwavfile.drm
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/group/inttest_aclnt_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,6 +15,16 @@
 
 "\epoc32\release\armv5\udeb\tsi_mmfaclnt.dll"-"c:\sys\bin\tsi_mmfaclnt.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\tsi_mmfuseoldcodecaudiocontroller.dll"-"c:\sys\bin\tsi_mmfuseoldcodecaudiocontroller.dll"
 "\epoc32\localisation\101F7D39\rsc\101F7D39.rpp"-"c:\localisation\101F7D39\rsc\101F7D39.rpp"
 "\epoc32\localisation\group\101F7D39.info"-"c:\localisation\group\101F7D39.info"
@@ -24,114 +34,117 @@
 //"\epoc32\release\armv5\urel\MmfDummyPolicyProxy.dll"-"c:\sys\bin\MmfDummyPolicyProxy.dll"
 
 // script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00.script"-"c:\TSI_MMF_ACLNT_00.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_nona3f.script"-"c:\tsi_mmf_aclnt_00_nona3f.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne.script"-"c:\tsi_mmf_aclnt_00_not_ne.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_1.script"-"c:\tsi_mmf_aclnt_00_not_ne_1.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_2.script"-"c:\tsi_mmf_aclnt_00_not_ne_2.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_3.script"-"c:\tsi_mmf_aclnt_00_not_ne_3.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_00_PREEMPTION.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_truepause.script"-"c:\tsi_mmf_aclnt_00_truepause.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01.script"-"c:\TSI_MMF_ACLNT_01.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_1.script"-"c:\TSI_MMF_ACLNT_01_POS_1.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_2.script"-"c:\TSI_MMF_ACLNT_01_POS_2.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_NEG.script"-"c:\TSI_MMF_ACLNT_01_NEG.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_01_PREEMPTION.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_02.script"-"c:\TSI_MMF_ACLNT_02.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03.script"-"c:\TSI_MMF_ACLNT_03.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_nona3f.script"-"c:\tsi_mmf_aclnt_03_nona3f.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_03_PREEMPTION.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_truepause.script"-"c:\tsi_mmf_aclnt_03_truepause.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_04.script"-"c:\TSI_MMF_ACLNT_04.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN.script"-"c:\TSI_MMF_ACLNT_ARN.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"-"c:\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_DRM.script"-"c:\TSI_MMF_ACLNT_DRM.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_FS.script"-"c:\TSI_MMF_ACLNT_FS.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_OF.script"-"c:\TSI_MMF_ACLNT_OF.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_OF_ALLOC.script"-"c:\TSI_MMF_ACLNT_OF_ALLOC.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_Panic.script"-"c:\TSI_MMF_ACLNT_Panic.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD.script"-"c:\TSI_MMF_ACLNT_SD.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_MMDDCAP.script"-"c:\TSI_MMF_ACLNT_SD_MMDDCAP.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_NOCAP.script"-"c:\TSI_MMF_ACLNT_SD_NOCAP.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_SD_PREEMPTION.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_UECAP.script"-"c:\TSI_MMF_ACLNT_SD_UECAP.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00.script"-"c:\TSI_MMF_ACLNT_00.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_nona3f.script"-"c:\tsi_mmf_aclnt_00_nona3f.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne.script"-"c:\tsi_mmf_aclnt_00_not_ne.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_1.script"-"c:\tsi_mmf_aclnt_00_not_ne_1.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_2.script"-"c:\tsi_mmf_aclnt_00_not_ne_2.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_not_ne_3.script"-"c:\tsi_mmf_aclnt_00_not_ne_3.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_00_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_00_PREEMPTION.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_00_truepause.script"-"c:\tsi_mmf_aclnt_00_truepause.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01.script"-"c:\TSI_MMF_ACLNT_01.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_1.script"-"c:\TSI_MMF_ACLNT_01_POS_1.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_POS_2.script"-"c:\TSI_MMF_ACLNT_01_POS_2.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_NEG.script"-"c:\TSI_MMF_ACLNT_01_NEG.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_01_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_01_PREEMPTION.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_02.script"-"c:\TSI_MMF_ACLNT_02.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03.script"-"c:\TSI_MMF_ACLNT_03.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_nona3f.script"-"c:\tsi_mmf_aclnt_03_nona3f.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_03_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_03_PREEMPTION.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\tsi_mmf_aclnt_03_truepause.script"-"c:\tsi_mmf_aclnt_03_truepause.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_04.script"-"c:\TSI_MMF_ACLNT_04.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN.script"-"c:\TSI_MMF_ACLNT_ARN.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"-"c:\TSI_MMF_ACLNT_ARN_AudioMultiClient.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_FS.script"-"c:\TSI_MMF_ACLNT_FS.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_OF.script"-"c:\TSI_MMF_ACLNT_OF.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_OF_ALLOC.script"-"c:\TSI_MMF_ACLNT_OF_ALLOC.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_Panic.script"-"c:\TSI_MMF_ACLNT_Panic.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD.script"-"c:\TSI_MMF_ACLNT_SD.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_MMDDCAP.script"-"c:\TSI_MMF_ACLNT_SD_MMDDCAP.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_NOCAP.script"-"c:\TSI_MMF_ACLNT_SD_NOCAP.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_PREEMPTION.script"-"c:\TSI_MMF_ACLNT_SD_PREEMPTION.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_SD_UECAP.script"-"c:\TSI_MMF_ACLNT_SD_UECAP.script"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\rta.script"-"c:\rta.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\TSI_MMF_ACLNT_DRM.script"-"c:\TSI_MMF_ACLNT_DRM.script"
 
 
 //ini file
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\audio.ini"-"c:\audio.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\scripts\audio.ini"-"c:\audio.ini"
 
 // Data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\16bitmPcm.wav"-"c:\aclntitestdata\16bitmPcm.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmAlaw.wav"-"c:\aclntitestdata\8bitmAlaw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmPcm.wav"-"c:\aclntitestdata\8bitmPcm.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmPcm-6144bytes.wav"-"c:\aclntitestdata\8bitmPcm-6144bytes.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmuLaw.wav"-"c:\aclntitestdata\8bitmuLaw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmUPCM.raw"-"c:\aclntitestdata\8bitmUPCM.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Gsm610.wav"-"c:\aclntitestdata\Gsm610.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\IMAD.wav"-"c:\aclntitestdata\IMAD.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\IMAS.wav"-"c:\aclntitestdata\IMAS.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16BE.wav"-"c:\aclntitestdata\PCMU16BE.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16.wav"-"c:\aclntitestdata\PCMU16.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.wav"-"c:\aclntitestdata\mainTst.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.ogg"-"c:\aclntitestdata\mainTst.ogg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.wav"-"c:\aclntitestdata\small.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.au"-"c:\aclntitestdata\small.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test.wav"-"c:\aclntitestdata\test.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test16m2.au"-"c:\aclntitestdata\test16m2.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test16m2.wav"-"c:\aclntitestdata\test16m2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test2.wav"-"c:\aclntitestdata\test2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\unsupported.wav"-"c:\aclntitestdata\unsupported.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\alf-noproblem.wav"-"c:\aclntitestdata\alf-noproblem.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\100khzSRate1KhzTone.wav"-"c:\aclntitestdata\100khzSRate1KhzTone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\7.33khzSRate1KhzTone.wav"-"c:\aclntitestdata\7.33khzSRate1KhzTone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\OneSample.wav"-"c:\aclntitestdata\OneSample.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\sequence1.sqn"-"c:\aclntitestdata\sequence1.sqn"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\sequence2.sqn"-"c:\aclntitestdata\sequence2.sqn"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\16bitmPcm.xxx"-"c:\aclntitestdata\16bitmPcm.xxx"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\explo.wav"-"c:\aclntitestdata\explo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\drmwavfile.drm"-"c:\aclntitestdata\drmwavfile.drm"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\16bitmPcm.wav"-"c:\aclntitestdata\16bitmPcm.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmAlaw.wav"-"c:\aclntitestdata\8bitmAlaw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmPcm.wav"-"c:\aclntitestdata\8bitmPcm.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmPcm-6144bytes.wav"-"c:\aclntitestdata\8bitmPcm-6144bytes.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmuLaw.wav"-"c:\aclntitestdata\8bitmuLaw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmUPCM.raw"-"c:\aclntitestdata\8bitmUPCM.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Gsm610.wav"-"c:\aclntitestdata\Gsm610.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\IMAD.wav"-"c:\aclntitestdata\IMAD.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\IMAS.wav"-"c:\aclntitestdata\IMAS.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16BE.wav"-"c:\aclntitestdata\PCMU16BE.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCMU16.wav"-"c:\aclntitestdata\PCMU16.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.wav"-"c:\aclntitestdata\mainTst.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst.ogg"-"c:\aclntitestdata\mainTst.ogg"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.wav"-"c:\aclntitestdata\small.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\small.au"-"c:\aclntitestdata\small.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test.wav"-"c:\aclntitestdata\test.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test16m2.au"-"c:\aclntitestdata\test16m2.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test16m2.wav"-"c:\aclntitestdata\test16m2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test2.wav"-"c:\aclntitestdata\test2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\unsupported.wav"-"c:\aclntitestdata\unsupported.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\alf-noproblem.wav"-"c:\aclntitestdata\alf-noproblem.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\100khzSRate1KhzTone.wav"-"c:\aclntitestdata\100khzSRate1KhzTone.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\7.33khzSRate1KhzTone.wav"-"c:\aclntitestdata\7.33khzSRate1KhzTone.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\OneSample.wav"-"c:\aclntitestdata\OneSample.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\ringing_tone.rng"-"c:\aclntitestdata\ringing_tone.rng"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\NokiaTune.nrt"-"c:\aclntitestdata\NokiaTune.nrt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\16bitmPcm.xxx"-"c:\aclntitestdata\16bitmPcm.xxx"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\explo.wav"-"c:\aclntitestdata\explo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\drmwavfile.drm"-"c:\aclntitestdata\drmwavfile.drm"
 
 //TruePause
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\imad2.wav"-"c:\aclntitestdata\imad2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\imad2.wav"-"c:\aclntitestdata\imad2.wav"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Pcm16bitMono.wav"-"c:\aclntitestdata\Pcm16bitMono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitStereo.wav"-"c:\aclntitestdata\PCM16bitStereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitMono.au"-"c:\aclntitestdata\PCM16bitMono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitStereo.au"-"c:\aclntitestdata\PCM16bitStereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8BitMono.wav"-"c:\aclntitestdata\PCM8BitMono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8BitStereo.wav"-"c:\aclntitestdata\PCM8BitStereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8bitMono.au"-"c:\aclntitestdata\PCM8bitMono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8bitStereo.au"-"c:\aclntitestdata\PCM8bitStereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmuPcm.wav"-"c:\aclntitestdata\8bitmuPcm.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst2.wav"-"c:\aclntitestdata\mainTst2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\main.wav"-"c:\aclntitestdata\main.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test.raw"-"c:\aclntitestdata\test.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm8mono44khz.wav"-"c:\aclntitestdata\pcm8mono44khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono44khz.wav"-"c:\aclntitestdata\pcm16mono44khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono48khz.wav"-"c:\aclntitestdata\pcm16mono48khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono12khz.wav"-"c:\aclntitestdata\pcm16mono12khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono24khz.wav"-"c:\aclntitestdata\pcm16mono24khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\A.txt"-"c:\aclntitestdata\A.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\B.txt"-"c:\aclntitestdata\B.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\G.txt"-"c:\aclntitestdata\G.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Gif.txt"-"c:\aclntitestdata\Gif.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\I.txt"-"c:\aclntitestdata\I.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\M.txt"-"c:\aclntitestdata\M.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\R.txt"-"c:\aclntitestdata\R.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav.wav"-"c:\aclntitestdata\recog_wav.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav.au"-"c:\aclntitestdata\recog_wav.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav"-"c:\aclntitestdata\recog_wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_au.au"-"c:\aclntitestdata\recog_au.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_au.wav"-"c:\aclntitestdata\recog_au.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_raw.wav"-"c:\aclntitestdata\recog_raw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Pcm16bitMono.wav"-"c:\aclntitestdata\Pcm16bitMono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitStereo.wav"-"c:\aclntitestdata\PCM16bitStereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitMono.au"-"c:\aclntitestdata\PCM16bitMono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM16bitStereo.au"-"c:\aclntitestdata\PCM16bitStereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8BitMono.wav"-"c:\aclntitestdata\PCM8BitMono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8BitStereo.wav"-"c:\aclntitestdata\PCM8BitStereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8bitMono.au"-"c:\aclntitestdata\PCM8bitMono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\PCM8bitStereo.au"-"c:\aclntitestdata\PCM8bitStereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\8bitmuPcm.wav"-"c:\aclntitestdata\8bitmuPcm.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst2.wav"-"c:\aclntitestdata\mainTst2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\main.wav"-"c:\aclntitestdata\main.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test.raw"-"c:\aclntitestdata\test.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm8mono44khz.wav"-"c:\aclntitestdata\pcm8mono44khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono44khz.wav"-"c:\aclntitestdata\pcm16mono44khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono48khz.wav"-"c:\aclntitestdata\pcm16mono48khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono12khz.wav"-"c:\aclntitestdata\pcm16mono12khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\pcm16mono24khz.wav"-"c:\aclntitestdata\pcm16mono24khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\A.txt"-"c:\aclntitestdata\A.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\B.txt"-"c:\aclntitestdata\B.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\G.txt"-"c:\aclntitestdata\G.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Gif.txt"-"c:\aclntitestdata\Gif.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\I.txt"-"c:\aclntitestdata\I.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\M.txt"-"c:\aclntitestdata\M.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\R.txt"-"c:\aclntitestdata\R.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav.wav"-"c:\aclntitestdata\recog_wav.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav.au"-"c:\aclntitestdata\recog_wav.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_wav"-"c:\aclntitestdata\recog_wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_au.au"-"c:\aclntitestdata\recog_au.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_au.wav"-"c:\aclntitestdata\recog_au.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\recog_raw.wav"-"c:\aclntitestdata\recog_raw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.abc"-"c:\tsimmfctlfrmdata\Test.abc"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.xyz"-"c:\tsimmfctlfrmdata\Test.xyz"
 
 // SYMBIAN_CAF_V2
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Audio.content"-"c:\aclntitestdata\Audio.content"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Audio.contentrights"-"c:\aclntitestdata\Audio.contentrights"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Audio.content"-"c:\aclntitestdata\Audio.content"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\Audio.contentrights"-"c:\aclntitestdata\Audio.contentrights"
 
 // Used by  SYMBIAN_CAF_V2 and SYMBIAN_MMF_AUTOPAUSE_RESUME
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst3.wav"-"c:\aclntitestdata\mainTst3.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\mainTst3.wav"-"c:\aclntitestdata\mainTst3.wav"
 
 // Audio Resource Notification test data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test2.raw"-"c:\aclntitestdata\test2.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test3.raw"-"c:\aclntitestdata\test3.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test2.raw"-"c:\aclntitestdata\test2.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\ACLNT\data\test3.raw"-"c:\aclntitestdata\test3.raw"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_04.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_04.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_04.script	Tue Nov 02 12:13:59 2010 +0000
@@ -96,41 +96,41 @@
 # DRM tests
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9000-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9000-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9000-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9001-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9001-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9001-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9002-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9002-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9002-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9003-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9003-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9003-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9004-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9004-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9004-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9005-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9005-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9005-LP  \audio.ini
+//TEST_COMPLETE
 
 
 // It fails because of the incorrect implementation of the Multimedia test CAF agent 
 // i.e. the agent doesn't properly support GetAttribute(EIsProtected, value);
 //! @SYMTestCaseID MM-MMF-ACLNT-I-9006-LP
 
-RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9006-LP  \audio.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 60000, ACLNT, MM-MMF-ACLNT-I-9006-LP  \audio.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-I-1001-LP
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 # Audio Client Utilities Audio Resource Notification Tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN_AudioMultiClient.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN_AudioMultiClient.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/TSI_MMF_ACLNT_ARN_AudioMultiClient.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 # Audio Client Utilities Audio Resource Notification Tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/audio.ini
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/audio.ini	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/audio.ini	Tue Nov 02 12:13:59 2010 +0000
@@ -2,7 +2,7 @@
 sectionNum= 1
 playerAudioFile = \AclntITestData\mainTst.wav
 playerAudioFile2 = \AclntITestData\mainTst2.wav
-sequenceFile= \AclntITestData\test.sqn
+sequenceFile= \AclntITestData\NokiaTune.nrt
 PCM8 = \AclntITestData\8bitmPcm.wav
 PCM8-6144bytes = \AclntITestData\8bitmPcm-6144bytes.wav
 PCM8output = \AclntITestData\8bitmPcmOutput.wav
@@ -22,8 +22,8 @@
 Pcm16Mono48khz = \AclntITestData\pcm16mono48khz.wav
 100khzSRate1KhzTone = \AclntITestData\100khzSRate1KhzTone.wav
 7.33khzSRate1KhzTone = \AclntITestData\7.33khzSRate1KhzTone.wav
-Sequence1 = \AclntITestData\sequence1.sqn
-Sequence2 = \AclntITestData\sequence2.sqn
+Sequence1 = \AclntITestData\ringing_tone.rng
+Sequence2 = \AclntITestData\NokiaTune.nrt
 PCM16WrongExtension1 = \AclntITestData\16bitmPcm.xxx
 PCM16WrongExtension2 = \AclntITestData\explo.$$$
 Pcm16Mono12khz = \AclntITestData\pcm16mono12khz.wav  
@@ -74,7 +74,7 @@
 outputAudioFile = c:\AclntITestData\output6.wav
 
 [SectionSeven]
-toneSequence = \AclntITestData\test.sqn
+toneSequence = \AclntITestData\NokiaTune.nrt
 
 [SectionEight]
 playerAudioFile = \AclntITestData\small.wav
@@ -144,7 +144,7 @@
 [SectionSilence]
 silence = 0
 [SectionTruePause]
-Sequence = \AclntITestData\sequence2.sqn
+Sequence = \AclntITestData\ringing_tone.rng
 Volume = 77
 Balance = 77
 Duration = 17000000
@@ -159,7 +159,7 @@
 
 [SectionPlayTrue]
 FilenameWAV = \aclntitestdata\main.wav
-FilenameSQN = \aclntitestdata\sequence1.sqn
+FilenameSQN = \aclntitestdata\ringing_tone.rng
 FilenamePCM8 = \AclntITestData\8bitmPcm.wav
 FilenamePCM16 = \AclntITestData\16bitmPcm.wav
 FilenamePCMU8 = \AclntITestData\8bitmUPCM.wav
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_nona3f.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_nona3f.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_nona3f.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFACLNT.DLL
 #PAUSE_AT_END
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_truepause.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_truepause.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_00_truepause.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFACLNT.DLL
 #PAUSE_AT_END
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_nona3f.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_nona3f.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_nona3f.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFACLNT.DLL
 #PAUSE_AT_END
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_truepause.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_truepause.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/ACLNT/scripts/tsi_mmf_aclnt_03_truepause.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFACLNT.DLL
 #PAUSE_AT_END
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/group/inttest_ctlfrm_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -17,6 +17,16 @@
 
 "\epoc32\release\armv5\udeb\tsi_mmfcustomcommands.dll"-"c:\sys\bin\tsi_mmfcustomcommands.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\tsi_mmfcontroller.dll"-"c:\sys\bin\tsi_mmfcontroller.dll"
 "\epoc32\localisation\101f7bf9\rsc\101f7bf9.rpp"-"c:\localisation\101f7bf9\rsc\101f7bf9.rpp"
 "\epoc32\localisation\group\101f7bf9.info"-"c:\localisation\group\101f7bf9.info"
@@ -50,17 +60,17 @@
 //"\epoc32\release\armv5\urel\tsi_mmfrecog.dll"-"c:\sys\bin\tsi_mmfrecog.dll"
 
 // script files
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM.script"-"c:\TSI_MMF_CTLFRM.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_NEG.script"-"c:\TSI_MMF_CTLFRM_NEG.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_NEG_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_NEG_PREEMPTION.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_POS.script"-"c:\TSI_MMF_CTLFRM_POS.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_POS_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_POS_PREEMPTION.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_PREEMPTION.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_RECOG.script"-"c:\TSI_MMF_RECOG.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_RECOG_ALLOC.script"-"c:\TSI_MMF_RECOG_ALLOC.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM.script"-"c:\TSI_MMF_CTLFRM.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_NEG.script"-"c:\TSI_MMF_CTLFRM_NEG.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_NEG_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_NEG_PREEMPTION.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_POS.script"-"c:\TSI_MMF_CTLFRM_POS.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_POS_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_POS_PREEMPTION.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_CTLFRM_PREEMPTION.script"-"c:\TSI_MMF_CTLFRM_PREEMPTION.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_RECOG.script"-"c:\TSI_MMF_RECOG.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\scripts\TSI_MMF_RECOG_ALLOC.script"-"c:\TSI_MMF_RECOG_ALLOC.script"
 
 // Data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test.wav"-"c:\tsimmfctlfrmdata\test.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test2.wav"-"c:\tsimmfctlfrmdata\test2.wav"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.abc"-"c:\tsimmfctlfrmdata\Test.abc"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.xyz"-"c:\tsimmfctlfrmdata\Test.xyz"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test.wav"-"c:\tsimmfctlfrmdata\test.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\test2.wav"-"c:\tsimmfctlfrmdata\test2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.abc"-"c:\tsimmfctlfrmdata\Test.abc"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\Ctlfrm\data\Test.xyz"-"c:\tsimmfctlfrmdata\Test.xyz"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // Run Multimedia Framework Controller Recognizer Integration tests
 // 
-//
+//////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFRECOG.dll
 // positive test
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG_ALLOC.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG_ALLOC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/Ctlfrm/scripts/TSI_MMF_RECOG_ALLOC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // Run Multimedia Framework Controller Recognizer Integration Alloc test
 // 
-//
+//////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFRECOG.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/group/IntTest_SDevsound_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,6 +1,4 @@
-"\epoc32\release\$(platform)\urel\tsi_mmf_sdevsound.dll"-"c:\sys\bin\tsi_mmf_sdevsound.dll"
-"\epoc32\release\$(platform)\urel\sdsmmddtestserver.exe"-"c:\sys\bin\sdsmmddtestserver.exe"
-"\epoc32\release\$(platform)\urel\sdscaptestserver.exe"-"c:\sys\bin\sdscaptestserver.exe"
+"\epoc32\release\armv5\urel\tsi_mmf_sdevsound.dll"-"c:\sys\bin\tsi_mmf_sdevsound.dll"
 
 // script files
 "\epoc32\data\c\TSI_MMF_SDEVSOUND_01.script"-"c:\TSI_MMF_SDEVSOUND_01.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/src/TSI_MMF_SDEVSOUND_STEP.cpp
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/src/TSI_MMF_SDEVSOUND_STEP.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SDevSound/src/TSI_MMF_SDEVSOUND_STEP.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -21,7 +21,7 @@
 #include <simulprocclient.h>
 
 #include <e32msgqueue.h>
-const TInt KMaxMessageQueueItems = 16;
+
 
 TAny GetDriveName(TDes& aFileName)
 	{
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -16,7 +16,7 @@
 
 //PRJ_TESTMMPFILES
 
-//../mmpfiles/TSI_MMFACLNT.mmp
+../mmpfiles/TSI_MMFACLNT.mmp
 
 PRJ_TESTEXPORTS
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/SecureDRM/group/inttest_securedrm_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -13,33 +13,21 @@
 // Description:
 //*Files (scripts, data, etc.) To Copy...<src> <destination>
 
-"\epoc32\release\armv5\urel\tsi_mmfaclnt.dll"-"c:\sys\bin\tsi_mmfaclnt.dll"
-"\epoc32\release\armv5\urel\RTAUtils.exe"-"c:\sys\bin\RTAUtils.exe"
-"\epoc32\release\armv5\urel\rtaserver.exe"-"c:\sys\bin\rtaserver.exe"
-"\epoc32\release\armv5\urel\rtaarchive.dll"-"c:\sys\bin\rtaarchive.dll"
-"\epoc32\release\armv5\urel\rtaclient.dll"-"c:\sys\bin\rtaclient.dll"
-"\epoc32\release\armv5\urel\rtaparser.dll"-"c:\sys\bin\rtaparser.dll"
-"\epoc32\release\armv5\urel\rtavirtualfile.dll"-"c:\sys\bin\rtavirtualfile.dll"
-"\epoc32\release\armv5\urel\caf.dll"-"c:\sys\bin\caf.dll"
-"\epoc32\release\armv5\urel\cafutils.dll"-"c:\sys\bin\cafutils.dll"
-"\epoc32\release\armv5\urel\apgrfx.dll"-"c:\sys\bin\apgrfx.dll"
-"\epoc32\release\armv5\urel\apmime.dll"-"c:\sys\bin\apmime.dll"
+//ini
+"\epoc32\data\c\audio.ini" - "c:\audio.ini"
 
-
-// script files
+// Scripts for SecureDRM
+"\epoc32\data\c\rta\rta.ini" - "c:\rta\rta.ini"
+"\epoc32\data\c\rta\rta.script" - "c:\rta.script",testexecute.exe
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\securedrm_audio.ini"-"c:\securedrm_audio.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\securedrm_testdata.ini"-"c:\securedrm_testdata.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\te_tsi_mmf_securedrm_testdata.script"-"c:\testdata\scripts\te_tsi_mmf_securedrm_testdata.script",testexecute.exe
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO.script"-"c:\TSI_MMF_SECUREDRM_AUDIO.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"-"c:\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"
-
-
-//ini file
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\securedrm_audio.ini"-"c:\securedrm_audio.ini"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\securedrm_testdata.ini"-"c:\securedrm_testdata.ini"
+// scripts
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO.script"-"c:\TSI_MMF_SECUREDRM_AUDIO.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"-"c:\TSI_MMF_SECUREDRM_AUDIO_MMDDCAP.script"
 
 // Data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiocontent2.xml"-"c:\securedrm\audiocontent2.xml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiorights2.xml"-"c:\securedrm\audiorights2.xml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\small.wav"-"c:\securedrm\small.wav"
-
-//script file for secure drm test data
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\scripts\te_tsi_mmf_securedrm_testdata.script"-"c:\testdata\scripts\te_tsi_mmf_securedrm_testdata.script"
\ No newline at end of file
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiocontent2.xml"-"c:\securedrm\audiocontent2.xml"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\audiorights2.xml"-"c:\securedrm\audiorights2.xml"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfintegrationtest\SecureDRM\data\small.wav"-"c:\securedrm\small.wav"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/devvideo/group/tsi_mmf_devvideo_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 // DevVideo script files
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/IntTest_Mmf.iby	Tue Nov 02 12:13:59 2010 +0000
@@ -97,7 +97,7 @@
 data=EPOCROOT##epoc32\data\c\AclntITestData\mainTst.wav         \AclntITestData\mainTst.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\mainTst2.wav	\AclntITestData\mainTst2.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\mainTst3.wav	\AclntITestData\mainTst3.wav
-data=EPOCROOT##epoc32\data\c\AclntITestData\test.sqn		\AclntITestData\test.sqn
+data=EPOCROOT##epoc32\data\c\AclntITestData\NokiaTune.nrt	\AclntITestData\NokiaTune.nrt
 data=EPOCROOT##epoc32\data\c\AclntITestData\8bitmPcm.wav	\AclntITestData\8bitmPcm.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\8bitmAlaw.wav	\AclntITestData\8bitmAlaw.wav
 data=EPOCROOT##epoc32\data\c\AclntITestData\16bitmPcm.wav	\AclntITestData\16bitmPcm.wav
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -19,7 +19,7 @@
 // WINS ARMI THUMB
 // MINT
 
-#include "videoGroup/bld.inf"
+#include "videogroup/bld.inf"
 
 #ifdef SYMBIAN_MULTIMEDIA_CODEC_API
 #include "../devsound/group/bld.inf"
@@ -29,9 +29,9 @@
 #define SYMBIAN_MMF_MODEL_CONTROLLERS
 #endif
 
-#include "../SDevsound/group/bld.inf"
+#include "../SDevSound/group/bld.inf"
 #include "../ACLNT/group/bld.inf"
-#include "../CTLFRM/group/bld.inf"
+#include "../Ctlfrm/group/bld.inf"
 #include "../SecureDRM/group/bld.inf"
 
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/group/inttest_mmf_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/group/inttest_mmf_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/group/inttest_mmf_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 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"
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 //ini
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_AC.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_AC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_AC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 //
 // Description:
 // TSI_MMF_A2DP_02.script
-//
+//This script is not running as the functionality is not supported.
 
 
 LOAD_SUITE TSI_MMF_A2DP.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_DS.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_DS.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_DS.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 //
 // Description:
 // TSI_MMF_A2DP_01.script
-//
+//This script is not running as the functionality is not supported.
 
 
 LOAD_SUITE TSI_MMF_A2DP.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_Neg.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_Neg.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_A2DPBLUETOOTH_Neg.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 //
 // Description:
 // TSI_MMF_A2DP_02.script
-//
+//This script is not running as the functionality is not supported.
 
 
 LOAD_SUITE TSI_MMF_A2DP.dll
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_ALLOC.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_ALLOC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_ALLOC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Alloc tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_APR.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_APR.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_APR.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Auto Pause & Resume tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_DRM.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_DRM.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_DRM.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Player DRM tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Player tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY_PREEMPTION.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY_PREEMPTION.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_PLAY_PREEMPTION.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Player tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Recorder tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC_PREEMPTION.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC_PREEMPTION.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_ACLNTOGG_REC_PREEMPTION.script	Tue Nov 02 12:13:59 2010 +0000
@@ -12,7 +12,7 @@
 // Contributors:
 //
 // Description:
-//
+//This script is not running as the functionality is not supported.
 
 # Audio Client Utilities for Ogg-Vorbis Recorder tests
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // Run Multimedia Framework Controller Recognizer Integration tests
 // 
-//
+//This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFRECOG.dll
 // positive test
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG_ALLOC.script
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG_ALLOC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/scriptFiles/TSI_MMF_RECOG_ALLOC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // Run Multimedia Framework Controller Recognizer Integration Alloc test
 // 
-//
+//This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSI_MMFRECOG.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/group/tsi_mmf_vclntavi_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 //ini
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/ACOD/TSU_MMF_ACOD.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/ACOD/TSU_MMF_ACOD.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ACOD/TSU_MMF_ACOD.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -36,8 +36,8 @@
 If this is not the case, the KSourceFilesDir and KComparisonFilesDir strings 
 need to be changed accordingly.
 */
-_LIT(KSourceFilesDir, "e:\\");
-_LIT(KComparisonFilesDir, "e:\\");
+_LIT(KSourceFilesDir, "c:\\");
+_LIT(KComparisonFilesDir, "c:\\");
 #endif
 
 //8KHz source files
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/ACOD/TestCodecs/101F76AA.rss
--- a/mmlibs/mmfw/tsrc/mmfunittest/ACOD/TestCodecs/101F76AA.rss	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ACOD/TestCodecs/101F76AA.rss	Tue Nov 02 12:13:59 2010 +0000
@@ -1,4 +1,5 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+//
+// Copyright (c) 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"
@@ -10,7 +11,8 @@
 //
 // Contributors:
 //
-// Description:
+// Description: 
+//
 //
 
 #include <mmfplugininterfaceuids.hrh>
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/ACOD/group/acod_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/ACOD/group/acod_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ACOD/group/acod_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -20,47 +20,57 @@
 "\epoc32\localisation\group\101f76aa.info"-"c:\localisation\group\101f76aa.info"
 "\epoc32\data\z\resource\plugins\tsu_mmf_acod_testcodecs.rsc"-"c:\resource\plugins\tsu_mmf_acod_testcodecs.rsc"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\TSU_MMF_ACOD.script"-"c:\TSU_MMF_ACOD.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\TSU_MMF_ACOD_Alloc.script"-"c:\TSU_MMF_ACOD_Alloc.script"
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
+
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\TSU_MMF_ACOD.script"-"c:\TSU_MMF_ACOD.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\TSU_MMF_ACOD_Alloc.script"-"c:\TSU_MMF_ACOD_Alloc.script"
 
 
 //MMF_ACOD codec unit test source files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16Source.raw"-"e:\pcm16source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16BSource.raw"-"e:\pcm16bsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16Source.raw"-"e:\pcmu16source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BSource.raw"-"e:\pcmu16bsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoPCM16Source.raw"-"e:\stereopcm16source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM8Source.raw"-"e:\pcm8source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU8Source.raw"-"e:\pcmu8source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AlawSource.raw"-"e:\alawsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\MulawSource.raw"-"e:\mulawsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AdpcmSource.raw"-"e:\adpcmsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoAdpcmSource.raw"-"e:\stereoadpcmsource.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\GSM610Source.raw"-"e:\gsm610source.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AAAASource.raw"-"e:\aaaasource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16Source.raw"-"c:\pcm16source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16BSource.raw"-"c:\pcm16bsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16Source.raw"-"c:\pcmu16source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BSource.raw"-"c:\pcmu16bsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoPCM16Source.raw"-"c:\stereopcm16source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM8Source.raw"-"c:\pcm8source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU8Source.raw"-"c:\pcmu8source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AlawSource.raw"-"c:\alawsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\MulawSource.raw"-"c:\mulawsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AdpcmSource.raw"-"c:\adpcmsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoAdpcmSource.raw"-"c:\stereoadpcmsource.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\GSM610Source.raw"-"c:\gsm610source.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AAAASource.raw"-"c:\aaaasource.raw"
 
 //ACOD codec unit test comparison files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AlawToPCM16Comparison.raw"-"e:\alawtopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToAlawComparison.raw"-"e:\pcm16toalawcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM8ToPCM16Comparison.raw"-"e:\pcm8topcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCM8Comparison.raw"-"e:\pcm16topcm8comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCM16BComparison.raw"-"e:\pcm16topcm16bcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16BToPCM16Comparison.raw"-"e:\pcm16btopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16ToPCMU16BComparison.raw"-"e:\pcmu16topcmu16bcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BToPCMU16Comparison.raw"-"e:\pcmu16btopcmu16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU16BComparison.raw"-"e:\pcm16topcmu16bcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BToPCM16Comparison.raw"-"e:\pcmu16btopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU16Comparison.raw"-"e:\pcm16topcmu16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16ToPCM16Comparison.raw"-"e:\pcmu16topcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU8Comparison.raw"-"e:\pcm16topcmu8comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU8ToPCM16Comparison.raw"-"e:\pcmu8topcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AdpcmToPCM16Comparison.raw"-"e:\adpcmtopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToAdpcmComparison.raw"-"e:\pcm16toadpcmcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\MulawToPCM16Comparison.raw"-"e:\mulawtopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToMulawComparison.raw"-"e:\pcm16tomulawcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoAdpcmToPCM16Comparison.raw"-"e:\stereoadpcmtopcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToStereoAdpcmComparison.raw"-"e:\pcm16tostereoadpcmcomparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\GSM610ToPCM16Comparison.raw"-"e:\gsm610topcm16comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToGSM610Comparison.raw"-"e:\pcm16togsm610comparison.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AAAABBBBPrefSuppComparison.raw"-"e:\aaaabbbbprefsuppcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AlawToPCM16Comparison.raw"-"c:\alawtopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToAlawComparison.raw"-"c:\pcm16toalawcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM8ToPCM16Comparison.raw"-"c:\pcm8topcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCM8Comparison.raw"-"c:\pcm16topcm8comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCM16BComparison.raw"-"c:\pcm16topcm16bcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16BToPCM16Comparison.raw"-"c:\pcm16btopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16ToPCMU16BComparison.raw"-"c:\pcmu16topcmu16bcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BToPCMU16Comparison.raw"-"c:\pcmu16btopcmu16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU16BComparison.raw"-"c:\pcm16topcmu16bcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16BToPCM16Comparison.raw"-"c:\pcmu16btopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU16Comparison.raw"-"c:\pcm16topcmu16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU16ToPCM16Comparison.raw"-"c:\pcmu16topcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToPCMU8Comparison.raw"-"c:\pcm16topcmu8comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCMU8ToPCM16Comparison.raw"-"c:\pcmu8topcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AdpcmToPCM16Comparison.raw"-"c:\adpcmtopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToAdpcmComparison.raw"-"c:\pcm16toadpcmcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\MulawToPCM16Comparison.raw"-"c:\mulawtopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToMulawComparison.raw"-"c:\pcm16tomulawcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\StereoAdpcmToPCM16Comparison.raw"-"c:\stereoadpcmtopcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToStereoAdpcmComparison.raw"-"c:\pcm16tostereoadpcmcomparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\GSM610ToPCM16Comparison.raw"-"c:\gsm610topcm16comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\PCM16ToGSM610Comparison.raw"-"c:\pcm16togsm610comparison.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ACOD\Data\AAAABBBBPrefSuppComparison.raw"-"c:\aaaabbbbprefsuppcomparison.raw"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/AFMT/group/unittest_afmt_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/AFMT/group/unittest_afmt_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/AFMT/group/unittest_afmt_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,6 +15,16 @@
 
 "\epoc32\release\armv5\udeb\TSU_MMF_AFMT.DLL"-"c:\sys\bin\TSU_MMF_AFMT.DLL"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\ts_mmftestdatasource.dll"-"c:\sys\bin\ts_mmftestdatasource.dll"
 "\epoc32\localisation\101f7791\rsc\101f7791.rpp"-"c:\localisation\101f7791\rsc\101f7791.rpp"
 "\epoc32\localisation\group\101f7791.info"-"c:\localisation\group\101f7791.info"
@@ -35,38 +45,38 @@
 "\epoc32\localisation\101f7d2f\rsc\101f7d2f.rpp"-"c:\localisation\101f7d2f\rsc\101f7d2f.rpp"
 "\epoc32\localisation\group\101f7d2f.info"-"c:\localisation\group\101f7d2f.info"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\TSU_MMF_AFMT.script"-"c:\TSU_MMF_AFMT.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\TSU_MMF_AFMT_Alloc.script"-"c:\TSU_MMF_AFMT_Alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\TSU_MMF_AFMT.script"-"c:\TSU_MMF_AFMT.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\TSU_MMF_AFMT_Alloc.script"-"c:\TSU_MMF_AFMT_Alloc.script"
 
 //MMF_AFMT codec unit test source files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khz.Raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khz.Raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khzcompare.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khzcompare.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khz.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khz.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khzCompare.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khzCompare.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khz.raw"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khzCompare.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khzCompare.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\mulaw8mono44khz.au"-"c:\mm\mmf\testfiles\AFMT\mulaw8mono44khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.au"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm4mono11khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm4mono11khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khz.Raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khz.Raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16mono8khzcompare.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16mono8khzcompare.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khz.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khz.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khzCompare.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\adpcm16stereo8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\adpcm16stereo8khzCompare.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khz.raw"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khzCompare.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\gsmMono8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\gsmMono8khzCompare.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\mulaw8mono44khz.au"-"c:\mm\mmf\testfiles\AFMT\mulaw8mono44khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono22khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16mono22khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16mono8khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16mono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.au"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.raw"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm16stereo8khzCompare.wav"-"c:\mm\mmf\testfiles\AFMT\pcm16stereo8khzCompare.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono11khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm8mono11khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.au"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.raw"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm8mono44khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm8mono44khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\AFMT\Data\pcm4mono11khz.wav"-"c:\mm\mmf\testfiles\AFMT\pcm4mono11khz.wav"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Actrl/group/unittest_actrl_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -13,54 +13,113 @@
 // Description:
 //*Files (scripts, data, etc.) To Copy...<src> <destination>
 
+
 "\epoc32\release\armv5\udeb\TSU_MMF_ACTRL_01.DLL"-"c:\sys\bin\TSU_MMF_ACTRL_01.DLL"
 
+"\epoc32\release\armv5\udeb\testexecute.exe"-"c:\sys\bin\testexecute.exe"
+"\epoc32\release\armv5\udeb\testexecuteutils.dll"-"c:\sys\bin\testexecuteutils.dll"
+"\epoc32\data\z\system\data\testexecute.ini"-"c:\system\data\testexecute.ini"
+"\epoc32\release\armv5\udeb\testexecutelogclient.dll"-"c:\sys\bin\testexecutelogclient.dll"
+"\epoc32\release\armv5\udeb\testexecutelogengine.exe"-"c:\sys\bin\testexecutelogengine.exe"
+"\epoc32\release\armv5\udeb\rfileloggerclient.dll"-"c:\sys\bin\rfileloggerclient.dll"
+"\epoc32\release\armv5\udeb\rfileloggerserver.exe"-"c:\sys\bin\rfileloggerserver.exe"
+
+
+"\epoc32\release\armv5\urel\RTAUtils.exe"-"c:\sys\bin\RTAUtils.exe"
+"\epoc32\release\armv5\urel\rtaserver.exe"-"c:\sys\bin\rtaserver.exe"
+"\epoc32\release\armv5\urel\rtaarchive.dll"-"c:\sys\bin\rtaarchive.dll"
+"\epoc32\release\armv5\urel\rtaclient.dll"-"c:\sys\bin\rtaclient.dll"
+"\epoc32\release\armv5\urel\rtaparser.dll"-"c:\sys\bin\rtaparser.dll"
+"\epoc32\release\armv5\urel\rtavirtualfile.dll"-"c:\sys\bin\rtavirtualfile.dll"
+"\epoc32\release\armv5\urel\caf.dll"-"c:\sys\bin\caf.dll"
+"\epoc32\release\armv5\urel\cafutils.dll"-"c:\sys\bin\cafutils.dll"
+"\epoc32\release\armv5\urel\reftestagent.dll"-"c:\sys\bin\reftestagent.dll"
+
+"\epoc32\release\armv5\urel\localsdpcodec.dll"-"c:\sys\bin\localsdpcodec.dll"
+"\epoc32\release\armv5\urel\srautils.dll"-"c:\sys\bin\srautils.dll"
+"\epoc32\release\armv5\urel\sraclient.dll"-"c:\sys\bin\sraclient.dll"
+"\epoc32\release\armv5\urel\rtavirtualfile.dll"-"c:\sys\bin\rtavirtualfile.dll"
+
+"\epoc32\release\armv5\urel\apgrfx.dll"-"c:\sys\bin\apgrfx.dll"
+"\epoc32\release\armv5\urel\apmime.dll"-"c:\sys\bin\apmime.dll"
+
+"\epoc32\release\armv5\urel\sraplugin.dll"-"c:\sys\bin\sraplugin.dll" @Reeju
+"\epoc32\localisation\10285A34\rsc\10285A34.rpp"-"c:\localisation\10285A34\rsc\10285A34.rpp"
+"\epoc32\localisation\group\10285A34.info"-"c:\localisation\group\10285A34.info"
+"\epoc32\data\z\resource\plugins\sraplugin.rsc"-"c:\resource\plugins\sraplugin.rsc"
+
+
+
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\rta.ini"-"c:\rta\rta.ini"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\AudioContent.xml"-"c:\rta\AudioContent.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\AudioContentNoRights.xml"-"c:\rta\AudioContentNoRights.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\AudioRights.xml"-"c:\rta\AudioRights.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\rights.db"-"c:\rta\rights.db"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\MidiContent.xml"-"c:\rta\MidiContent.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\MidiRights.xml"-"c:\rta\MidiRights.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\SingleToneContent.xml"-"c:\rta\SingleToneContent.xml"
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\SingleToneRights.xml"-"c:\rta\SingleToneRights.xml"
+
+
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\custommmfaudiocontroller.dll"-"c:\sys\bin\custommmfaudiocontroller.dll"
 "\epoc32\localisation\101f7d29\rsc\101f7d29.rpp"-"c:\localisation\101f7d29\rsc\101f7d29.rpp"
 "\epoc32\localisation\group\101f7d29.info"-"c:\localisation\group\101f7d29.info"
 "\epoc32\data\z\resource\plugins\custommmfaudiocontroller.rsc"-"c:\resource\plugins\custommmfaudiocontroller.rsc"
 
 //scripts
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\TSU_MMF_ACTRL_01.script"-"c:\tsu_mmf_actrl_01.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\TSU_MMF_ACTRL_01_Alloc.script"-"c:\tsu_mmf_actrl_01_alloc.script"
+
+"\sf\os\mmaudio\mmtestenv\mmtesttools\RTA\rta.script"-"c:\rta.script",testexecute.exe
+
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\TSU_MMF_ACTRL_01.script"-"c:\tsu_mmf_actrl_01.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\TSU_MMF_ACTRL_01_Alloc.script"-"c:\tsu_mmf_actrl_01_alloc.script"
 
 //ACTRL ----> audio controller unit test audio files <---------
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\newmail.wav"-"c:\mm\mmf\testfiles\actrl\newmail.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\newmail.au"-"c:\mm\mmf\testfiles\actrl\newmail.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five11khz.au"-"c:\mm\mmf\testfiles\actrl\five11khz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five.wav"-"c:\mm\mmf\testfiles\actrl\five.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\16bitmPcm.wav"-"c:\mm\mmf\testfiles\actrl\16bitmpcm.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzADPCMMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmono1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16mono1khztone.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereo1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALawMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmono1khztone.wav"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALAWStereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereo1khztone.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\22khzpcm16mono1khztone.au"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16stereo1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM8Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8mono1khztone.wav"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.au"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16mono1khztone.au"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereo1khztone.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\mainTst.wav"-"c:\mm\mmf\testfiles\actrl\maintst.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzADPCMMonoWAVTo8KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmonowavto8khzpcm16mono.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16MonoRAWTo8KHzGSM610Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16monorawto8khzgsm610mono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo8KHzMuLAWMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto8khzmulawmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzALAWMonoWAVTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmonowavto8khzpcm16mono.wav"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzALAWStereoRAWTo11KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereorawto11khzpcm16mono.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzPCM16MonoAUTo8KhzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16monoauto8khzpcm16mono.wav"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzPCM8MonoWAVTo11KHzPCM16Stereo.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8monowavto11khzpcm16stereo.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoAUTo22KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereoauto22khzpcm16mono.raw"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoRAWTo8KHzPCM16Stereo.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereorawto8khzpcm16stereo.au"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoWAVTo8KHzPCM16Mono.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereowavto8khzpcm16mono.au"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzGSM610MonoRAWTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610monorawto8khzpcm16mono.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzPCM16MonoAUTo8KHzPCM16Mono.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16monoauto8khzpcm16mono.au"		
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzPCM16StereoWAVTo8KHzGSM610Mono.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereowavto8khzgsm610mono.wav"	
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCMU8MonoAUTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcmu8monoauto8khzpcm16mono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\NoReferenceFile"-"c:\mm\mmf\testfiles\actrl\NoReferenceFile"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\newmail.wav"-"c:\mm\mmf\testfiles\actrl\newmail.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\newmail.au"-"c:\mm\mmf\testfiles\actrl\newmail.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five11khz.au"-"c:\mm\mmf\testfiles\actrl\five11khz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Five.wav"-"c:\mm\mmf\testfiles\actrl\five.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\16bitmPcm.wav"-"c:\mm\mmf\testfiles\actrl\16bitmpcm.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzADPCMMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmono1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16mono1khztone.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\11KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereo1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALawMono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmono1khztone.wav"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzALAWStereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereo1khztone.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\22khzpcm16mono1khztone.au"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16stereo1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\22KHzPCM8Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8mono1khztone.wav"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.au"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\44KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereo1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.raw"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzGSM610Mono1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610mono1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Mono1KHzTone.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16mono1khztone.au"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\8KHzPCM16Stereo1KHzTone.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereo1khztone.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\mainTst.wav"-"c:\mm\mmf\testfiles\actrl\maintst.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzADPCMMonoWAVTo8KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\11khzadpcmmonowavto8khzpcm16mono.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16MonoRAWTo8KHzGSM610Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16monorawto8khzgsm610mono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo8KHzMuLAWMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto8khzmulawmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzALAWMonoWAVTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\22khzalawmonowavto8khzpcm16mono.wav"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzALAWStereoRAWTo11KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\22khzalawstereorawto11khzpcm16mono.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzPCM16MonoAUTo8KhzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm16monoauto8khzpcm16mono.wav"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\22KHzPCM8MonoWAVTo11KHzPCM16Stereo.wav"-"c:\mm\mmf\testfiles\actrl\22khzpcm8monowavto11khzpcm16stereo.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoAUTo22KHzPCM16Mono.raw"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereoauto22khzpcm16mono.raw"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoRAWTo8KHzPCM16Stereo.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereorawto8khzpcm16stereo.au"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\44KHzPCM16StereoWAVTo8KHzPCM16Mono.au"-"c:\mm\mmf\testfiles\actrl\44khzpcm16stereowavto8khzpcm16mono.au"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzGSM610MonoRAWTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\8khzgsm610monorawto8khzpcm16mono.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzPCM16MonoAUTo8KHzPCM16Mono.au"-"c:\mm\mmf\testfiles\actrl\8khzpcm16monoauto8khzpcm16mono.au"		
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\8KHzPCM16StereoWAVTo8KHzGSM610Mono.wav"-"c:\mm\mmf\testfiles\actrl\8khzpcm16stereowavto8khzgsm610mono.wav"	
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCMU8MonoAUTo8KHzPCM16Mono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcmu8monoauto8khzpcm16mono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.wav"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\11KHzPCM16StereoWAVTo11KHzADPCMMono.raw"-"c:\mm\mmf\testfiles\actrl\11khzpcm16stereowavto11khzadpcmmono.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\Actrl\data\Reference\NoReferenceFile"-"c:\mm\mmf\testfiles\actrl\NoReferenceFile"
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_01_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_01_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_01_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\TSU_MMF_DEVVIDEO_01.script" - "c:\TSU_MMF_DEVVIDEO_01.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/DevVideo/group/tsu_mmf_devvideo_ciu_01_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\tsu_mmf_devvideo_ciu_01.script" - "c:\tsu_mmf_devvideo_ciu_01.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/GEF/group/unittest_gef_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/GEF/group/unittest_gef_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/GEF/group/unittest_gef_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -22,4 +22,4 @@
 
 
 // script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\GEF\scripts\TSU_MMF_GEF_01.script"-"c:\TSU_MMF_GEF_01.script"
\ No newline at end of file
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\GEF\scripts\TSU_MMF_GEF_01.script"-"c:\TSU_MMF_GEF_01.script"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/GEF/scripts/TSU_MMF_GEF_01.script	Tue Nov 02 12:13:59 2010 +0000
@@ -19,7 +19,7 @@
 
 DELAY 10000
 
-//! @SYMTestCaseID MM-MMF-GEF-U-001
+//! @SYMTestCaseID MM-MMF-GEF-U-001    //This test is not running as the functionality is not supported.
 
 //RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-001
 //TEST_COMPLETE
@@ -29,12 +29,12 @@
 RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-002
 TEST_COMPLETE
 
-//! @SYMTestCaseID MM-MMF-GEF-U-003
+//! @SYMTestCaseID MM-MMF-GEF-U-003   //This test is not running as the functionality is not supported.
 
 //RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-003
 //TEST_COMPLETE
 
-//! @SYMTestCaseID MM-MMF-GEF-U-004
+//! @SYMTestCaseID MM-MMF-GEF-U-004   //This test is not running as the functionality is not supported.
 
 //RUN_TEST_STEP 30000, TSU_MMF_GEF, MM-MMF-GEF-U-004
 //TEST_COMPLETE
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/group/unittest_midi_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/group/unittest_midi_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/group/unittest_midi_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -22,18 +22,18 @@
 
 
 //MIDI script files
-"\sf\os\\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_00.script"-"c:\tsu_mmf_midiclnt_00.script"
-"\sf\os\\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_00_Alloc.script"-"c:\tsu_mmf_midiclnt_00_alloc.script"
-"\sf\os\\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_RF.script"-"c:\tsu_mmf_midiclnt_rf.script"
-"\sf\os\\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_RF_Alloc.script"-"c:\tsu_mmf_midiclnt_rf_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_00.script"-"c:\tsu_mmf_midiclnt_00.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_00_Alloc.script"-"c:\tsu_mmf_midiclnt_00_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_RF.script"-"c:\tsu_mmf_midiclnt_rf.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\TSU_MMF_MIDICLNT_RF_Alloc.script"-"c:\tsu_mmf_midiclnt_rf_alloc.script"
 
 //ini file
-"\sf\os\\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\midi.ini"-"c:\mm\midi.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\scripts\midi.ini"-"c:\mm\midi.ini"
 
 // MIDI test files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\midi.mid"-"c:\midiclntitestdata\midi.mid"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\textmidi.mid"-"c:\midiclntitestdata\textmidi.mid"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\midi.mid"-"c:\midiclntitestdata\midi.mid"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\textmidi.mid"-"c:\midiclntitestdata\textmidi.mid"
 
 // SYMBIAN_CAF_V2
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\Midi.contentrights"-"c:\midiclntitestdata\midi.contentrights"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\Midi.content"-"c:\midiclntitestdata\midi.content"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\Midi.contentrights"-"c:\midiclntitestdata\midi.contentrights"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\MidiClnt\data\Midi.content"-"c:\midiclntitestdata\midi.content"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/scripts/TSU_MMF_MIDICLNT_00.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/scripts/TSU_MMF_MIDICLNT_00.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/MidiClnt/scripts/TSU_MMF_MIDICLNT_00.script	Tue Nov 02 12:13:59 2010 +0000
@@ -1423,18 +1423,18 @@
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-0321-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0321-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0321-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-0322-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0322-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0322-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-0323-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0323-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-0323-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-0324-HP
 
@@ -1445,33 +1445,33 @@
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1011-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1011-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1011-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1012-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1012-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1012-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1013-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1013-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1013-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1014-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1014-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1014-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1015-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1015-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1015-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1016-HP
 
-RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1016-HP c:\mm\midi.ini
-TEST_COMPLETE
+//RUN_TEST_STEP 360000 TSU_MMFMIDICLNT MM-MMF-MIDICLNT-U-1016-HP c:\mm\midi.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-MIDICLNT-U-1020-HP
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/group/unittest_recogniser_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -13,168 +13,168 @@
 // Description:
 //*Files (scripts, data, etc.) To Copy...<src> <destination>
 
-"\epoc32\release\armv5\urel\tsu_mmf_mmruf.DLL"-"c:\sys\bin\tsu_mmf_mmruf.DLL"
+//"\epoc32\release\armv5\urel\tsu_mmf_mmruf.DLL"-"c:\sys\bin\tsu_mmf_mmruf.DLL"
 
 // script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf.script"-"c:\tsu_mmf_mmruf.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf_badext.script"-"c:\tsu_mmf_mmruf_badext.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf_corrupt.script"-"c:\tsu_mmf_mmruf_corrupt.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\TSU_MMF_MMRUF_ALLOC.script"-"c:\tsu_mmf_mmruf_alloc.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf.script"-"c:\tsu_mmf_mmruf.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf_badext.script"-"c:\tsu_mmf_mmruf_badext.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\tsu_mmf_mmruf_corrupt.script"-"c:\tsu_mmf_mmruf_corrupt.script"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\scripts\TSU_MMF_MMRUF_ALLOC.script"-"c:\tsu_mmf_mmruf_alloc.script"
 
 // Unsupported formats recogniser
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Budweiser_Streaker.divx"-"c:\recog\valid_budweiser_streaker.divx"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MPEG2.mpg"-"c:\recog\valid_mpeg2.mpg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MPEG2WidWrngExt.wxt"-"c:\recog\mpeg2widwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_angry_bone.3gp"-"c:\recog\valid_angry_bone.3gp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_casadual.ra"-"c:\recog\valid_casadual.ra"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rmf"-"c:\recog\corrupt.rmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_eyck1.snd"-"c:\recog\valid_eyck1.snd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_greenday.amr"-"c:\recog\valid_greenday.amr"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_realaudio.ram"-"c:\recog\valid_realaudio.ram"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMFWidWrngExt.wxt"-"c:\recog\rmfwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rondobasi.mld"-"c:\recog\valid_rondobasi.mld"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rondobasi.mmf"-"c:\recog\valid_rondobasi.mmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ModernPiano.rmf"-"c:\recog\valid_modernpiano.rmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ModernPiano.MID"-"c:\recog\valid_modernpiano.mid"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_mewmew.mkv"-"c:\recog\valid_mewmew.mkv"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\3gpWidWrngExt.wxt"-"c:\recog\3gpwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_vid.3gp"-"c:\recog\corrupt_vid.3gp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.aiff"-"c:\recog\valid_chand_sifarish.aiff"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AIFFWidWrngExt.wxt"-"c:\recog\aiffwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.aiff"-"c:\recog\corrupt.aiff"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AMRWidWrngExt.wxt"-"c:\recog\amrwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.amr"-"c:\recog\corrupt.amr"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_flinstones.awb"-"c:\recog\valid_flinstones.awb"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AWBWidWrngExt.wxt"-"c:\recog\awbwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.awb"-"c:\recog\corrupt.awb"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.au"-"c:\recog\valid_chand_sifarish.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUWAVWidWrngExt.wxt"-"c:\recog\auwavwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.au"-"c:\recog\corrupt.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\DivxWidWrngExt.wxt"-"c:\recog\divxwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.divx"-"c:\recog\corrupt.divx"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ESSSWT1M.DLS"-"c:\recog\valid_essswt1m.dls"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\DLSWidWrngExt.wxt"-"c:\recog\dlswidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.DLS"-"c:\recog\corrupt.dls"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.flac"-"c:\recog\valid_chand_sifarish.flac"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\FLACWidWrngExt.wxt"-"c:\recog\flacwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.flac"-"c:\recog\corrupt.flac"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\GSMWidWrngExt.wxt"-"c:\recog\gsmwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.gsm"-"c:\recog\corrupt.gsm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_baby.m3u"-"c:\recog\valid_baby.m3u"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\M3UWidWrngExt.wxt"-"c:\recog\m3uwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.m3u"-"c:\recog\corrupt.m3u"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_audio_only.m4a"-"c:\recog\valid_audio_only.m4a"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\M4aWidWrngExt.wxt"-"c:\recog\m4awidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.m4a"-"c:\recog\corrupt_aud.m4a"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MIDIWidWrngExt.wxt"-"c:\recog\midiwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mid"-"c:\recog\corrupt.mid"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MldWidWrngExt.wxt"-"c:\recog\mldwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mld"-"c:\recog\corrupt.mld"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MMFWidWrngExt.wxt"-"c:\recog\mmfwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mmf"-"c:\recog\corrupt.mmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_muse_aud_mp4.mp4"-"c:\recog\valid_muse_aud_mp4.mp4"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUDMP4WidWrngExt.wxt"-"c:\recog\audmp4widwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_AUD_MP4.mp4"-"c:\recog\corrupt_aud_mp4.mp4"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Streetwise.mxmf"-"c:\recog\valid_streetwise.mxmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MXMFWidWrngExt.wxt"-"c:\recog\mxmfwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mxmf"-"c:\recog\corrupt.mxmf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_small.ogg"-"c:\recog\valid_small.ogg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\OGGWidWrngExt.wxt"-"c:\recog\oggwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ogg"-"c:\recog\corrupt.ogg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAMWidWrngExt.wxt"-"c:\recog\ramwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.ram"-"c:\recog\corrupt.ram"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_SMF_pb.smf"-"c:\recog\valid_smf_pb.smf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\SMFWidWrngExt.wxt"-"c:\recog\smfwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_SMF.smf"-"c:\recog\corrupt_smf.smf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\SNDWidWrngExt.wxt"-"c:\recog\sndwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.snd"-"c:\recog\corrupt.snd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.wav"-"c:\recog\valid_chand_sifarish.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUDWAVWidWrngExt.wxt"-"c:\recog\audwavwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wav"-"c:\recog\corrupt.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Be_With_You.wma"-"c:\recog\valid_be_with_you.wma"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMAWidWrngExt.wxt"-"c:\recog\wmawidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wma"-"c:\recog\corrupt.wma"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Apertura.mp4"-"c:\recog\valid_apertura.mp4"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\VIDMP4WidWrngExt.wxt"-"c:\recog\vidmp4widwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_vid.mp4"-"c:\recog\corrupt_vid.mp4"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_Mpeg2.mpg"-"c:\recog\corrupt_mpeg2.mpg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Goodneighbour.wmv"-"c:\recog\valid_goodneighbour.wmv"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMVWidWrngExt.wxt"-"c:\recog\wmvwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wmv"-"c:\recog\corrupt.wmv"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Aud_sample.3gp"-"c:\recog\valid_aud_sample.3gp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\A3gpWidWrngExt.wxt"-"c:\recog\a3gpwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.3gp"-"c:\recog\corrupt_aud.3gp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sample.aac"-"c:\recog\valid_sample.aac"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AACWidWrngExt.wxt"-"c:\recog\aacwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.aac"-"c:\recog\corrupt.aac"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_test.mp3"-"c:\recog\valid_test.mp3"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MP3WidWrngExt.wxt"-"c:\recog\mp3widwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mp3"-"c:\recog\corrupt.mp3"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MKVWidWrngExt.wxt"-"c:\recog\mkvwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mkv"-"c:\recog\corrupt.mkv"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\ASFWidWrngExt.wxt"-"c:\recog\asfwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.asf"-"c:\recog\corrupt.asf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.wxt"-"c:\recog\corrupt.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_3gpWidOutExt"-"c:\recog\valid_3gpwidoutext"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MP3WidOutExt"-"c:\recog\valid_mp3widoutext"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_CrptOGGWidOutExt"-"c:\recog\valid_crptoggwidoutext"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.rm"-"c:\recog\valid_chand_sifarish.rm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMWidWrngExt.wxt"-"c:\recog\rmwidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rm"-"c:\recog\corrupt.rm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAWidWrngExt.wxt"-"c:\recog\rawidwrngext.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ra"-"c:\recog\corrupt.ra"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_niceday.asf"-"c:\recog\valid_niceday.asf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_aacid3.aac"-"c:\recog\valid_aacid3.aac"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rmvideo.rm"-"c:\recog\valid_rmvideo.rm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_80X140.RM"-"c:\recog\valid_80x140.rm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp1.sdp"-"c:\recog\valid_sdp1.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp2.sdp"-"c:\recog\valid_sdp2.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp3.SDP"-"c:\recog\valid_sdp3.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp4.sdp"-"c:\recog\valid_sdp4.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp5.sdp"-"c:\recog\valid_sdp5.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp6.sdp"-"c:\recog\valid_sdp6.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp7.sdp"-"c:\recog\valid_sdp7.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp8.sdp"-"c:\recog\valid_sdp8.sdp"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.3g2"-"c:\recog\valid_3gpp2.3g2"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.wxt"-"c:\recog\valid_3gpp2.wxt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_3GPP2.3g2"-"c:\recog\corrupt_3gpp2.3g2"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2_BadBrand.3g2"-"c:\recog\valid_3gpp2_badbrand.3g2"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_unicode.txt"-"c:\recog\valid_unicode.txt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Budweiser_Streaker.divx"-"c:\recog\valid_budweiser_streaker.divx"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MPEG2.mpg"-"c:\recog\valid_mpeg2.mpg"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MPEG2WidWrngExt.wxt"-"c:\recog\mpeg2widwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_angry_bone.3gp"-"c:\recog\valid_angry_bone.3gp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_casadual.ra"-"c:\recog\valid_casadual.ra"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rmf"-"c:\recog\corrupt.rmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_eyck1.snd"-"c:\recog\valid_eyck1.snd"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_greenday.amr"-"c:\recog\valid_greenday.amr"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_realaudio.ram"-"c:\recog\valid_realaudio.ram"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMFWidWrngExt.wxt"-"c:\recog\rmfwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rondobasi.mld"-"c:\recog\valid_rondobasi.mld"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rondobasi.mmf"-"c:\recog\valid_rondobasi.mmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ModernPiano.rmf"-"c:\recog\valid_modernpiano.rmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ModernPiano.MID"-"c:\recog\valid_modernpiano.mid"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_mewmew.mkv"-"c:\recog\valid_mewmew.mkv"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\3gpWidWrngExt.wxt"-"c:\recog\3gpwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_vid.3gp"-"c:\recog\corrupt_vid.3gp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.aiff"-"c:\recog\valid_chand_sifarish.aiff"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AIFFWidWrngExt.wxt"-"c:\recog\aiffwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.aiff"-"c:\recog\corrupt.aiff"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AMRWidWrngExt.wxt"-"c:\recog\amrwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.amr"-"c:\recog\corrupt.amr"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_flinstones.awb"-"c:\recog\valid_flinstones.awb"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AWBWidWrngExt.wxt"-"c:\recog\awbwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.awb"-"c:\recog\corrupt.awb"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.au"-"c:\recog\valid_chand_sifarish.au"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUWAVWidWrngExt.wxt"-"c:\recog\auwavwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.au"-"c:\recog\corrupt.au"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\DivxWidWrngExt.wxt"-"c:\recog\divxwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.divx"-"c:\recog\corrupt.divx"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_ESSSWT1M.DLS"-"c:\recog\valid_essswt1m.dls"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\DLSWidWrngExt.wxt"-"c:\recog\dlswidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.DLS"-"c:\recog\corrupt.dls"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.flac"-"c:\recog\valid_chand_sifarish.flac"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\FLACWidWrngExt.wxt"-"c:\recog\flacwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.flac"-"c:\recog\corrupt.flac"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\GSMWidWrngExt.wxt"-"c:\recog\gsmwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.gsm"-"c:\recog\corrupt.gsm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_baby.m3u"-"c:\recog\valid_baby.m3u"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\M3UWidWrngExt.wxt"-"c:\recog\m3uwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.m3u"-"c:\recog\corrupt.m3u"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_audio_only.m4a"-"c:\recog\valid_audio_only.m4a"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\M4aWidWrngExt.wxt"-"c:\recog\m4awidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.m4a"-"c:\recog\corrupt_aud.m4a"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MIDIWidWrngExt.wxt"-"c:\recog\midiwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mid"-"c:\recog\corrupt.mid"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MldWidWrngExt.wxt"-"c:\recog\mldwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mld"-"c:\recog\corrupt.mld"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MMFWidWrngExt.wxt"-"c:\recog\mmfwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mmf"-"c:\recog\corrupt.mmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_muse_aud_mp4.mp4"-"c:\recog\valid_muse_aud_mp4.mp4"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUDMP4WidWrngExt.wxt"-"c:\recog\audmp4widwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_AUD_MP4.mp4"-"c:\recog\corrupt_aud_mp4.mp4"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Streetwise.mxmf"-"c:\recog\valid_streetwise.mxmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MXMFWidWrngExt.wxt"-"c:\recog\mxmfwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mxmf"-"c:\recog\corrupt.mxmf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_small.ogg"-"c:\recog\valid_small.ogg"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\OGGWidWrngExt.wxt"-"c:\recog\oggwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ogg"-"c:\recog\corrupt.ogg"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAMWidWrngExt.wxt"-"c:\recog\ramwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.ram"-"c:\recog\corrupt.ram"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_SMF_pb.smf"-"c:\recog\valid_smf_pb.smf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\SMFWidWrngExt.wxt"-"c:\recog\smfwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_SMF.smf"-"c:\recog\corrupt_smf.smf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\SNDWidWrngExt.wxt"-"c:\recog\sndwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.snd"-"c:\recog\corrupt.snd"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.wav"-"c:\recog\valid_chand_sifarish.wav"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AUDWAVWidWrngExt.wxt"-"c:\recog\audwavwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wav"-"c:\recog\corrupt.wav"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Be_With_You.wma"-"c:\recog\valid_be_with_you.wma"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMAWidWrngExt.wxt"-"c:\recog\wmawidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wma"-"c:\recog\corrupt.wma"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Apertura.mp4"-"c:\recog\valid_apertura.mp4"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\VIDMP4WidWrngExt.wxt"-"c:\recog\vidmp4widwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_vid.mp4"-"c:\recog\corrupt_vid.mp4"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_Mpeg2.mpg"-"c:\recog\corrupt_mpeg2.mpg"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Goodneighbour.wmv"-"c:\recog\valid_goodneighbour.wmv"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\WMVWidWrngExt.wxt"-"c:\recog\wmvwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.wmv"-"c:\recog\corrupt.wmv"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_Aud_sample.3gp"-"c:\recog\valid_aud_sample.3gp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\A3gpWidWrngExt.wxt"-"c:\recog\a3gpwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt_aud.3gp"-"c:\recog\corrupt_aud.3gp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sample.aac"-"c:\recog\valid_sample.aac"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\AACWidWrngExt.wxt"-"c:\recog\aacwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.aac"-"c:\recog\corrupt.aac"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_test.mp3"-"c:\recog\valid_test.mp3"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MP3WidWrngExt.wxt"-"c:\recog\mp3widwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.mp3"-"c:\recog\corrupt.mp3"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\MKVWidWrngExt.wxt"-"c:\recog\mkvwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.mkv"-"c:\recog\corrupt.mkv"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\ASFWidWrngExt.wxt"-"c:\recog\asfwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.asf"-"c:\recog\corrupt.asf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.wxt"-"c:\recog\corrupt.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_3gpWidOutExt"-"c:\recog\valid_3gpwidoutext"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_MP3WidOutExt"-"c:\recog\valid_mp3widoutext"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_CrptOGGWidOutExt"-"c:\recog\valid_crptoggwidoutext"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_chand_sifarish.rm"-"c:\recog\valid_chand_sifarish.rm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RMWidWrngExt.wxt"-"c:\recog\rmwidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt.rm"-"c:\recog\corrupt.rm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\RAWidWrngExt.wxt"-"c:\recog\rawidwrngext.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\corrupt.ra"-"c:\recog\corrupt.ra"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_niceday.asf"-"c:\recog\valid_niceday.asf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_aacid3.aac"-"c:\recog\valid_aacid3.aac"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_rmvideo.rm"-"c:\recog\valid_rmvideo.rm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_80X140.RM"-"c:\recog\valid_80x140.rm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp1.sdp"-"c:\recog\valid_sdp1.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp2.sdp"-"c:\recog\valid_sdp2.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp3.SDP"-"c:\recog\valid_sdp3.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp4.sdp"-"c:\recog\valid_sdp4.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp5.sdp"-"c:\recog\valid_sdp5.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp6.sdp"-"c:\recog\valid_sdp6.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp7.sdp"-"c:\recog\valid_sdp7.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_sdp8.sdp"-"c:\recog\valid_sdp8.sdp"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.3g2"-"c:\recog\valid_3gpp2.3g2"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2.wxt"-"c:\recog\valid_3gpp2.wxt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Corrupt_3GPP2.3g2"-"c:\recog\corrupt_3gpp2.3g2"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\Valid_3GPP2_BadBrand.3g2"-"c:\recog\valid_3gpp2_badbrand.3g2"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\valid_unicode.txt"-"c:\recog\valid_unicode.txt"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\_lmnand_miniboot.bin"-"c:\recog\common\_lmnand_miniboot.bin"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\HATCSS.msi"-"c:\recog\common\hatcss.msi"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Image.JPG"-"c:\recog\common\image.jpg"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pdf.pdf"-"c:\recog\common\pdf.pdf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\readme.rtf"-"c:\recog\common\readme.rtf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\whois.exe"-"c:\recog\common\whois.exe"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\3.ebm"-"c:\recog\common\3.ebm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\4.notebm"-"c:\recog\common\4.notebm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.dtd"-"c:\recog\common\a.dtd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wbxml"-"c:\recog\common\a.wbxml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wml"-"c:\recog\common\a.wml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlc"-"c:\recog\common\a.wmlc"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmls"-"c:\recog\common\a.wmls"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlsc"-"c:\recog\common\a.wmlsc"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda"-"c:\recog\common\agenda"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda-emb"-"c:\recog\common\agenda-emb"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\badcert.cer"-"c:\recog\common\badcert.cer"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Base64.VCF"-"c:\recog\common\base64.vcf"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Begin3.VCS"-"c:\recog\common\begin3.vcs"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\CALLMANAGER.APP"-"c:\recog\common\callmanager.app"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\copyfile.txt"-"c:\recog\common\copyfile.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\dsaprivate1.key"-"c:\recog\common\dsaprivate1.key"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jad"-"c:\recog\common\fullversiontest.jad"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jar"-"c:\recog\common\fullversiontest.jar"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\InstTest.jad"-"c:\recog\common\insttest.jad"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\legacy.sis"-"c:\recog\common\legacy.sis"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\roudedkeybag.der"-"c:\recog\common\roudedkeybag.der"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pkcs12.p12"-"c:\recog\common\pkcs12.p12"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample1.html"-"c:\recog\common\sample1.html"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample2.htm"-"c:\recog\common\sample2.htm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample3.xhtml"-"c:\recog\common\sample3.xhtml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample4.xml"-"c:\recog\common\sample4.xml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\symbian_key.pk8"-"c:\recog\common\symbian_key.pk8"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\tcaf.ini"-"c:\recog\common\tcaf.ini"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm"-"c:\recog\common\test.drm"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm.bin"-"c:\recog\common\test.drm.bin"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\testdoc.tsym"-"c:\recog\common\testdoc.tsym"
\ No newline at end of file
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\_lmnand_miniboot.bin"-"c:\recog\common\_lmnand_miniboot.bin"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\HATCSS.msi"-"c:\recog\common\hatcss.msi"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Image.JPG"-"c:\recog\common\image.jpg"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pdf.pdf"-"c:\recog\common\pdf.pdf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\readme.rtf"-"c:\recog\common\readme.rtf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\whois.exe"-"c:\recog\common\whois.exe"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\3.ebm"-"c:\recog\common\3.ebm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\4.notebm"-"c:\recog\common\4.notebm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.dtd"-"c:\recog\common\a.dtd"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wbxml"-"c:\recog\common\a.wbxml"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wml"-"c:\recog\common\a.wml"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlc"-"c:\recog\common\a.wmlc"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmls"-"c:\recog\common\a.wmls"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\a.wmlsc"-"c:\recog\common\a.wmlsc"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda"-"c:\recog\common\agenda"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\agenda-emb"-"c:\recog\common\agenda-emb"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\badcert.cer"-"c:\recog\common\badcert.cer"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Base64.VCF"-"c:\recog\common\base64.vcf"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\Begin3.VCS"-"c:\recog\common\begin3.vcs"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\CALLMANAGER.APP"-"c:\recog\common\callmanager.app"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\copyfile.txt"-"c:\recog\common\copyfile.txt"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\dsaprivate1.key"-"c:\recog\common\dsaprivate1.key"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jad"-"c:\recog\common\fullversiontest.jad"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\FullVersionTest.jar"-"c:\recog\common\fullversiontest.jar"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\InstTest.jad"-"c:\recog\common\insttest.jad"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\legacy.sis"-"c:\recog\common\legacy.sis"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\roudedkeybag.der"-"c:\recog\common\roudedkeybag.der"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\pkcs12.p12"-"c:\recog\common\pkcs12.p12"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample1.html"-"c:\recog\common\sample1.html"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample2.htm"-"c:\recog\common\sample2.htm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample3.xhtml"-"c:\recog\common\sample3.xhtml"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\sample4.xml"-"c:\recog\common\sample4.xml"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\symbian_key.pk8"-"c:\recog\common\symbian_key.pk8"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\tcaf.ini"-"c:\recog\common\tcaf.ini"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm"-"c:\recog\common\test.drm"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\test.drm.bin"-"c:\recog\common\test.drm.bin"
+//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\Recogniser\Data\common\testdoc.tsym"-"c:\recog\common\testdoc.tsym"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/TSU_MMF_MMRUF_ALLOC.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/TSU_MMF_MMRUF_ALLOC.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/TSU_MMF_MMRUF_ALLOC.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSU_MMF_MMRUF.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSU_MMF_MMRUF.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_badext.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_badext.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_badext.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSU_MMF_MMRUF.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_corrupt.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_corrupt.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/scripts/tsu_mmf_mmruf_corrupt.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 LOAD_SUITE TSU_MMF_MMRUF.dll
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudOutStream.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudOutStream.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepAudOutStream.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -62,19 +62,19 @@
 const TConvParameters KTestParameters[] =
 {	
 	// straight encode test
-	{ _S("MM-MMF-ACLNT-U-0631-CP"), KMMFFourCCCodePCMU8,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("PU8Mono1KhzTone.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0632-CP"), KMMFFourCCCodePCMU8,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PU8Stereo1KhzTone.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0633-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("PCMExp500hzMono8Khz.wav"),	KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0631-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0632-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0633-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
 	{ _S("MM-MMF-ACLNT-U-0634-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0635-CP"), KMMFFourCCCodeALAW,    TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("Mono500hzALw.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0636-CP"), KMMFFourCCCodeALAW,    TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("Stereo500hzALw.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0637-CP"), KMMFFourCCCodeMuLAW,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("Mono500hzMuLaw.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0638-CP"), KMMFFourCCCodeMuLAW,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("Stereo500hzMuLaw.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0639-CP"), KMMFFourCCCodeIMAD,    TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("ImaAdpcmMono8khz.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0640-CP"), KMMFFourCCCodePCM16B,  TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("Au16Be8khz500hzMono.au"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0641-CP"), KMMFFourCCCodePCM16B,  TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("AuStereo8khz500hz.au"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0858-CP"), KMMFFourCCCodeIMAD,    TMdaAudioDataSettings::ESampleRate32000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("ImaAdpcmMono8khz.wav"),	KErrNone },
-	{ _S("MM-MMF-ACLNT-U-0859-CP"), KMMFFourCCCodeIMAD,    TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, _S("ImaAdpcmMono8khz.wav"),	KErrNone }
+	{ _S("MM-MMF-ACLNT-U-0635-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0636-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0637-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0638-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0639-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0640-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0641-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0858-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsMono, 	_S("PCMExp500hzMono8Khz.wav"),		KErrNone },
+	{ _S("MM-MMF-ACLNT-U-0859-CP"), KMMFFourCCCodePCM16,   TMdaAudioDataSettings::ESampleRate8000Hz,	TMdaAudioDataSettings::EChannelsStereo, _S("PCMExp500hzStereo8Khz.wav"),	KErrNone }
 };
 	
 CTestStepAudOutStream* CTestStepAudOutStream::NewL()
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderSimultaneousPlay.cpp
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderSimultaneousPlay.cpp	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/TSU_MMF_ACLNT_01/TestStepRecorderSimultaneousPlay.cpp	Tue Nov 02 12:13:59 2010 +0000
@@ -2109,6 +2109,7 @@
 	if (iCurrentState != CMdaAudioRecorderUtility::EPlaying)
 		return EInconclusive;
 	position = iRecorderUtility->Position();
+	INFO_PRINTF2(_L("Clip Position = %d microseconds"), I64LOW(position.Int64()));
 	iRecorderUtility->SetPosition(TTimeIntervalMicroSeconds(KTwoSeconds));
 
 	// wait once for end of play - this should produce KErrNone
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -32,6 +32,7 @@
 ../scripts/TSU_MMF_ACLNT_01_POS_5.script		c:/mm/TSU_MMF_ACLNT_01_POS_5.script
 ../scripts/TSU_MMF_ACLNT_01_POS_6.script		c:/mm/TSU_MMF_ACLNT_01_POS_6.script
 ../scripts/TSU_MMF_ACLNT_01_POS_7.script		c:/mm/TSU_MMF_ACLNT_01_POS_7.script
+../scripts/TSU_MMF_ACLNT_01_POS_8.script		c:/mm/TSU_MMF_ACLNT_01_POS_8.script
 ../scripts/TSU_MMF_ACLNT_01_tone.script		c:/mm/TSU_MMF_ACLNT_01_tone.script
 ../scripts/TSU_MMF_ACLNT_01_PREEMPTION.script		c:/mm/tsu_mmf_aclnt_01_preemption.script
 ../scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script		c:/mm/tsu_mmf_aclnt_01_notification.script
@@ -77,7 +78,7 @@
 ../TSU_MMF_ACLNT_01/data/PCM16bitStereo.wav	c:/mm/mmf/testfiles/aclnt/pcm16bitstereo.wav
 ../TSU_MMF_ACLNT_01/data/4sec_wav.wav		c:/mm/mmf/testfiles/aclnt/4sec_wav.wav
 ../TSU_MMF_ACLNT_01/data/sample.wav		c:/mm/mmf/testfiles/aclnt/sample.wav
-../TSU_MMF_ACLNT_01/data/sequence2.sqn		c:/mm/mmf/testfiles/aclnt/sequence2.sqn
+../TSU_MMF_ACLNT_01/data/NokiaTune.nrt		c:/mm/mmf/testfiles/aclnt/NokiaTune.nrt
 ../TSU_MMF_ACLNT_01/data/testheaderTag.au		c:/mm/mmf/testfiles/aclnt/testheadertag.au
 ../TSU_MMF_ACLNT_01/data/cdec_ff_wav_fr.wav	c:/mm/mmf/testfiles/aclnt/cdec_ff_wav_fr.wav
 ../TSU_MMF_ACLNT_01/data/CorruptSampleRate.wav	c:/mm/mmf/testfiles/aclnt/corruptsamplerate.wav
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/unittest_aclnt_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/unittest_aclnt_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/group/unittest_aclnt_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -13,6 +13,15 @@
 // Description:
 //*Files (scripts, data, etc.) To Copy...<src> <destination>
 
+
+"\epoc32\release\armv5\udeb\testexecute.exe"-"c:\sys\bin\testexecute.exe"
+"\epoc32\release\armv5\udeb\testexecuteutils.dll"-"c:\sys\bin\testexecuteutils.dll"
+"\epoc32\data\z\system\data\testexecute.ini"-"c:\system\data\testexecute.ini"
+"\epoc32\release\armv5\udeb\testexecutelogclient.dll"-"c:\sys\bin\testexecutelogclient.dll"
+"\epoc32\release\armv5\udeb\testexecutelogengine.exe"-"c:\sys\bin\testexecutelogengine.exe"
+"\epoc32\release\armv5\udeb\rfileloggerclient.dll"-"c:\sys\bin\rfileloggerclient.dll"
+"\epoc32\release\armv5\udeb\rfileloggerserver.exe"-"c:\sys\bin\rfileloggerserver.exe"
+
 "\epoc32\release\armv5\udeb\TSU_MMF_ACLNT_01.DLL"-"c:\sys\bin\TSU_MMF_ACLNT_01.DLL"
 "\epoc32\release\armv5\urel\RTAUtils.exe"-"c:\sys\bin\RTAUtils.exe"
 "\epoc32\release\armv5\urel\rtaserver.exe"-"c:\sys\bin\rtaserver.exe"
@@ -25,122 +34,133 @@
 "\epoc32\release\armv5\urel\apgrfx.dll"-"c:\sys\bin\apgrfx.dll"
 "\epoc32\release\armv5\urel\apmime.dll"-"c:\sys\bin\apmime.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+//"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+//"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+//"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+//"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 //scripts
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01.script"-"c:\tsu_mmf_aclnt_01.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_1.script"-"c:\TSU_MMF_ACLNT_01_POS_1.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_2.script"-"c:\TSU_MMF_ACLNT_01_POS_2.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_3.script"-"c:\TSU_MMF_ACLNT_01_POS_3.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_4.script"-"c:\TSU_MMF_ACLNT_01_POS_4.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_5.script"-"c:\TSU_MMF_ACLNT_01_POS_5.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_6.script"-"c:\TSU_MMF_ACLNT_01_POS_6.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_7.script"-"c:\TSU_MMF_ACLNT_01_POS_7.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_tone.script"-"c:\TSU_MMF_ACLNT_01_tone.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_PREEMPTION.script"-"c:\tsu_mmf_aclnt_01_preemption.script"
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_NOTIFICATION.script"-"c:\tsu_mmf_aclnt_01_notification.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_Alloc.script"-"c:\tsu_mmf_aclnt_01_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_02_Alloc.script"-"c:\tsu_mmf_aclnt_02_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_03_Alloc.script"-"c:\tsu_mmf_aclnt_03_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_04_Alloc.script"-"c:\tsu_mmf_aclnt_04_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_05_Alloc.script"-"c:\tsu_mmf_aclnt_05_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_RF_ALLOC.script"-"c:\tsu_mmf_aclnt_rf_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01.script"-"c:\tsu_mmf_aclnt_01.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_1.script"-"c:\TSU_MMF_ACLNT_01_POS_1.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_2.script"-"c:\TSU_MMF_ACLNT_01_POS_2.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_3.script"-"c:\TSU_MMF_ACLNT_01_POS_3.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_4.script"-"c:\TSU_MMF_ACLNT_01_POS_4.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_5.script"-"c:\TSU_MMF_ACLNT_01_POS_5.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_6.script"-"c:\TSU_MMF_ACLNT_01_POS_6.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_7.script"-"c:\TSU_MMF_ACLNT_01_POS_7.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_POS_8.script"-"c:\TSU_MMF_ACLNT_01_POS_8.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_tone.script"-"c:\TSU_MMF_ACLNT_01_tone.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_PREEMPTION.script"-"c:\tsu_mmf_aclnt_01_preemption.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_NOTIFICATION.script"-"c:\tsu_mmf_aclnt_01_notification.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01_Alloc.script"-"c:\tsu_mmf_aclnt_01_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_02_Alloc.script"-"c:\tsu_mmf_aclnt_02_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_03_Alloc.script"-"c:\tsu_mmf_aclnt_03_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_04_Alloc.script"-"c:\tsu_mmf_aclnt_04_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_05_Alloc.script"-"c:\tsu_mmf_aclnt_05_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_RF_ALLOC.script"-"c:\tsu_mmf_aclnt_rf_alloc.script"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_DRM.script"-"c:\tsu_mmf_aclnt_drm.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_DRM_ALLOC.script"-"c:\tsu_mmf_aclnt_drm_alloc.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_DRM.script"-"c:\tsu_mmf_aclnt_drm.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_DRM_ALLOC.script"-"c:\tsu_mmf_aclnt_drm_alloc.script"
 
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrm.script"-"c:\tsu_mmf_aclnt_securedrm.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrm.script"-"c:\tsu_mmf_aclnt_securedrm.script"
 
 //ini
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01.ini"-"c:\mm\tsu_mmf_aclnt_01.ini"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrmtestdata.ini"-"c:\mm\tsu_mmf_aclnt_securedrmtestdata.ini"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrm.ini"-"c:\mm\tsu_mmf_aclnt_securedrm.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\TSU_MMF_ACLNT_01.ini"-"c:\mm\tsu_mmf_aclnt_01.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrmtestdata.ini"-"c:\mm\tsu_mmf_aclnt_securedrmtestdata.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\tsu_mmf_aclnt_securedrm.ini"-"c:\mm\tsu_mmf_aclnt_securedrm.ini"
 
 // data files :
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small.wav"-"c:\mm\mmf\testfiles\aclnt\small.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small1.wav"-"c:\mm\mmf\testfiles\aclnt\small1.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small2.wav"-"c:\mm\mmf\testfiles\aclnt\small2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\expectedsmall2.au"-"c:\mm\mmf\testfiles\aclnt\expectedsmall2.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTest.wav"-"c:\mm\mmf\testfiles\aclnt\maintest.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test16m2.au"-"c:\mm\mmf\testfiles\aclnt\test16m2.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\8bitUPCM.raw"-"c:\mm\mmf\testfiles\aclnt\8bitupcm.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\8bitmUPCM.raw"-"c:\mm\mmf\testfiles\aclnt\8bitmupcm.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawMono.au"-"c:\mm\mmf\testfiles\aclnt\alawmono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawStereo.au"-"c:\mm\mmf\testfiles\aclnt\alawstereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawMono.au"-"c:\mm\mmf\testfiles\aclnt\ulawmono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawStereo.au"-"c:\mm\mmf\testfiles\aclnt\ulawstereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8bitMono.au"-"c:\mm\mmf\testfiles\aclnt\pcm8bitmono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8bitStereo.au"-"c:\mm\mmf\testfiles\aclnt\pcm8bitstereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitMono.au"-"c:\mm\mmf\testfiles\aclnt\pcm16bitmono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitStereo.au"-"c:\mm\mmf\testfiles\aclnt\pcm16bitstereo.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\alawMono.wav"-"c:\mm\mmf\testfiles\aclnt\alawmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawStereo.wav"-"c:\mm\mmf\testfiles\aclnt\alawstereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawMono.wav"-"c:\mm\mmf\testfiles\aclnt\ulawmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawStereo.wav"-"c:\mm\mmf\testfiles\aclnt\ulawstereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8BitMono.wav"-"c:\mm\mmf\testfiles\aclnt\pcm8bitmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8BitStereo.wav"-"c:\mm\mmf\testfiles\aclnt\pcm8bitstereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Pcm16bitMono.wav"-"c:\mm\mmf\testfiles\aclnt\pcm16bitmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitStereo.wav"-"c:\mm\mmf\testfiles\aclnt\pcm16bitstereo.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\4sec_wav.wav"-"c:\mm\mmf\testfiles\aclnt\4sec_wav.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\sample.wav"-"c:\mm\mmf\testfiles\aclnt\sample.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\sequence2.sqn"-"c:\mm\mmf\testfiles\aclnt\sequence2.sqn"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\testheaderTag.au"-"c:\mm\mmf\testfiles\aclnt\testheadertag.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\cdec_ff_wav_fr.wav"-"c:\mm\mmf\testfiles\aclnt\cdec_ff_wav_fr.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\CorruptSampleRate.wav"-"c:\mm\mmf\testfiles\aclnt\corruptsamplerate.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst.wav"-"c:\mm\mmf\testfiles\aclnt\maintst.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst2.wav"-"c:\mm\mmf\testfiles\aclnt\maintst2.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst3.wav"-"c:\mm\mmf\testfiles\aclnt\maintst3.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Audio.content"-"c:\aclntitestdata\audio.content"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Audio.contentrights"-"c:\aclntitestdata\audio.contentrights"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\AudioContentNoRights.content"-"c:\aclntitestdata\audiocontentnorights.content"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\SingleTone.content"-"c:\mm\mmf\testfiles\aclnt\singletone.content"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\SingleTone.contentrights"-"c:\mm\mmf\testfiles\aclnt\singletone.contentrights"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\smallwav_audiocontent.xml"-"c:\mm\mmf\testfiles\aclnt\smallwav_audiocontent.xml"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\smallwav_audiorights.xml"-"c:\mm\mmf\testfiles\aclnt\smallwav_audiorights.xml"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small.wav"-"c:\mm\mmf\testfiles\aclnt\small.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small1.wav"-"c:\mm\mmf\testfiles\aclnt\small1.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small2.wav"-"c:\mm\mmf\testfiles\aclnt\small2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\expectedsmall2.au"-"c:\mm\mmf\testfiles\aclnt\expectedsmall2.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTest.wav"-"c:\mm\mmf\testfiles\aclnt\maintest.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test16m2.au"-"c:\mm\mmf\testfiles\aclnt\test16m2.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\8bitUPCM.raw"-"c:\mm\mmf\testfiles\aclnt\8bitupcm.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\8bitmUPCM.raw"-"c:\mm\mmf\testfiles\aclnt\8bitmupcm.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawMono.au"-"c:\mm\mmf\testfiles\aclnt\alawmono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawStereo.au"-"c:\mm\mmf\testfiles\aclnt\alawstereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawMono.au"-"c:\mm\mmf\testfiles\aclnt\ulawmono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawStereo.au"-"c:\mm\mmf\testfiles\aclnt\ulawstereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8bitMono.au"-"c:\mm\mmf\testfiles\aclnt\pcm8bitmono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8bitStereo.au"-"c:\mm\mmf\testfiles\aclnt\pcm8bitstereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitMono.au"-"c:\mm\mmf\testfiles\aclnt\pcm16bitmono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitStereo.au"-"c:\mm\mmf\testfiles\aclnt\pcm16bitstereo.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\alawMono.wav"-"c:\mm\mmf\testfiles\aclnt\alawmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ALawStereo.wav"-"c:\mm\mmf\testfiles\aclnt\alawstereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawMono.wav"-"c:\mm\mmf\testfiles\aclnt\ulawmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\uLawStereo.wav"-"c:\mm\mmf\testfiles\aclnt\ulawstereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8BitMono.wav"-"c:\mm\mmf\testfiles\aclnt\pcm8bitmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM8BitStereo.wav"-"c:\mm\mmf\testfiles\aclnt\pcm8bitstereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Pcm16bitMono.wav"-"c:\mm\mmf\testfiles\aclnt\pcm16bitmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCM16bitStereo.wav"-"c:\mm\mmf\testfiles\aclnt\pcm16bitstereo.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\4sec_wav.wav"-"c:\mm\mmf\testfiles\aclnt\4sec_wav.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\sample.wav"-"c:\mm\mmf\testfiles\aclnt\sample.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\NokiaTune.nrt"-"c:\mm\mmf\testfiles\aclnt\NokiaTune.nrt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\testheaderTag.au"-"c:\mm\mmf\testfiles\aclnt\testheadertag.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\cdec_ff_wav_fr.wav"-"c:\mm\mmf\testfiles\aclnt\cdec_ff_wav_fr.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\CorruptSampleRate.wav"-"c:\mm\mmf\testfiles\aclnt\corruptsamplerate.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst.wav"-"c:\mm\mmf\testfiles\aclnt\maintst.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst2.wav"-"c:\mm\mmf\testfiles\aclnt\maintst2.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\mainTst3.wav"-"c:\mm\mmf\testfiles\aclnt\maintst3.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Audio.content"-"c:\aclntitestdata\audio.content"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Audio.contentrights"-"c:\aclntitestdata\audio.contentrights"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\AudioContentNoRights.content"-"c:\aclntitestdata\audiocontentnorights.content"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\SingleTone.content"-"c:\mm\mmf\testfiles\aclnt\singletone.content"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\SingleTone.contentrights"-"c:\mm\mmf\testfiles\aclnt\singletone.contentrights"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\smallwav_audiocontent.xml"-"c:\mm\mmf\testfiles\aclnt\smallwav_audiocontent.xml"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\smallwav_audiorights.xml"-"c:\mm\mmf\testfiles\aclnt\smallwav_audiorights.xml"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recordtest.wav"-"c:\mm\mmf\testfiles\aclnt\recordtest.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recordtest.wav"-"c:\mm\mmf\testfiles\aclnt\recordtest.wav"
 
 // remove recorded.wav, as it causes problems
-//"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.wav"-"c:\mm\mmf\testfiles\aclnt/recorded.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.au"-"c:\mm\mmf\testfiles\aclnt\recorded.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.raw"-"c:\mm\mmf\testfiles\aclnt\recorded.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Cropped.wav"-"c:\mm\mmf\testfiles\aclnt\cropped.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Cropped.au"-"c:\mm\mmf\testfiles\aclnt\cropped.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\dtmfsample1.txt"-"c:\mm\mmf\testfiles\aclnt\dtmfsample1.txt"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\main_meta.wav"-"c:\mm\mmf\testfiles\aclnt\main_meta.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test.raw"-"c:\mm\mmf\testfiles\aclnt\test.raw"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test.pav"-"c:\mm\mmf\testfiles\aclnt\test.pav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\16BitSPCM.wav"-"c:\mm\mmf\testfiles\aclnt\16bitspcm.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Gsm610Mono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\gsm610mono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\corruptedGsm610Mono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\corruptedgsm610mono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3RAW.mp3"-"c:\mm\mmf\testfiles\aclnt\mp3raw.mp3"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3ID3.mp3"-"c:\mm\mmf\testfiles\aclnt\mp3id3.mp3"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3WAV.wav"-"c:\mm\mmf\testfiles\aclnt\mp3wav.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3DUMMY.exe"-"c:\mm\mmf\testfiles\aclnt\mp3dummy.exe"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit8KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit8khzmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit8KhzMono512Block.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit8khzmono512block.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit11KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit11khzmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit22KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit22khzmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit44KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit44khzmono.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Refimaadpcmwith512block2pcm16.wav"-"c:\mm\mmf\testfiles\aclnt\refimaadpcmwith512block2pcm16.wav"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.wav"-"c:\mm\mmf\testfiles\aclnt/recorded.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.au"-"c:\mm\mmf\testfiles\aclnt\recorded.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\recorded.raw"-"c:\mm\mmf\testfiles\aclnt\recorded.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Cropped.wav"-"c:\mm\mmf\testfiles\aclnt\cropped.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Cropped.au"-"c:\mm\mmf\testfiles\aclnt\cropped.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\dtmfsample1.txt"-"c:\mm\mmf\testfiles\aclnt\dtmfsample1.txt"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\main_meta.wav"-"c:\mm\mmf\testfiles\aclnt\main_meta.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test.raw"-"c:\mm\mmf\testfiles\aclnt\test.raw"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\test.pav"-"c:\mm\mmf\testfiles\aclnt\test.pav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\16BitSPCM.wav"-"c:\mm\mmf\testfiles\aclnt\16bitspcm.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Gsm610Mono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\gsm610mono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\corruptedGsm610Mono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\corruptedgsm610mono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3RAW.mp3"-"c:\mm\mmf\testfiles\aclnt\mp3raw.mp3"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3ID3.mp3"-"c:\mm\mmf\testfiles\aclnt\mp3id3.mp3"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3WAV.wav"-"c:\mm\mmf\testfiles\aclnt\mp3wav.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\MP3DUMMY.exe"-"c:\mm\mmf\testfiles\aclnt\mp3dummy.exe"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit8KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit8khzmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit8KhzMono512Block.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit8khzmono512block.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit11KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit11khzmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit22KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit22khzmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\IMAADPCM4Bit44KHzMono.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcm4bit44khzmono.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Refimaadpcmwith512block2pcm16.wav"-"c:\mm\mmf\testfiles\aclnt\refimaadpcmwith512block2pcm16.wav"
 
 // additional wav file for testing recording with modified audio input
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\r3.wav"-"c:\r3.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\r3.wav"-"c:\r3.wav"
 
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PU8Mono1KhzTone.wav"-"c:\mm\mmf\testfiles\aclnt\pu8mono1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PU8Stereo1KhzTone.wav"-"c:\mm\mmf\testfiles\aclnt\pu8stereo1khztone.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCMExp500hzMono8Khz.wav"-"c:\mm\mmf\testfiles\aclnt\pcmexp500hzmono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCMExp500hzStereo8Khz.wav"-"c:\mm\mmf\testfiles\aclnt\pcmexp500hzstereo8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Mono500hzALw.wav"-"c:\mm\mmf\testfiles\aclnt\mono500hzalw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Stereo500hzALw.wav"-"c:\mm\mmf\testfiles\aclnt\stereo500hzalw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Mono500hzMuLaw.wav"-"c:\mm\mmf\testfiles\aclnt\mono500hzmulaw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Stereo500hzMuLaw.wav"-"c:\mm\mmf\testfiles\aclnt\stereo500hzmulaw.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ImaAdpcmMono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcmmono8khz.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Au16Be8khz500hzMono.au"-"c:\mm\mmf\testfiles\aclnt\au16be8khz500hzmono.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\AuStereo8khz500hz.au"-"c:\mm\mmf\testfiles\aclnt\austereo8khz500hz.au"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\playtest.pnc"-"c:\mm\mmf\testfiles\aclnt\playtest.pnc"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PU8Mono1KhzTone.wav"-"c:\mm\mmf\testfiles\aclnt\pu8mono1khztone.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PU8Stereo1KhzTone.wav"-"c:\mm\mmf\testfiles\aclnt\pu8stereo1khztone.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCMExp500hzMono8Khz.wav"-"c:\mm\mmf\testfiles\aclnt\pcmexp500hzmono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\PCMExp500hzStereo8Khz.wav"-"c:\mm\mmf\testfiles\aclnt\pcmexp500hzstereo8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Mono500hzALw.wav"-"c:\mm\mmf\testfiles\aclnt\mono500hzalw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Stereo500hzALw.wav"-"c:\mm\mmf\testfiles\aclnt\stereo500hzalw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Mono500hzMuLaw.wav"-"c:\mm\mmf\testfiles\aclnt\mono500hzmulaw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Stereo500hzMuLaw.wav"-"c:\mm\mmf\testfiles\aclnt\stereo500hzmulaw.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\ImaAdpcmMono8khz.wav"-"c:\mm\mmf\testfiles\aclnt\imaadpcmmono8khz.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\Au16Be8khz500hzMono.au"-"c:\mm\mmf\testfiles\aclnt\au16be8khz500hzmono.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\AuStereo8khz500hz.au"-"c:\mm\mmf\testfiles\aclnt\austereo8khz500hz.au"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\playtest.pnc"-"c:\mm\mmf\testfiles\aclnt\playtest.pnc"
 
 // Test case: MM-MMF-ACLNT-U-0012-CP
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small.wav"-"c:\resource\small.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\TSU_MMF_ACLNT_01\data\small.wav"-"c:\resource\small.wav"
 
 //RTA data (For DRM scripts)
 "\epoc32\data\c\rta\rta.ini"-"c:\rta\rta.ini"
@@ -155,4 +175,4 @@
 
 
 //securedrm test data generation scripts
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\te_tsu_mmf_aclnt_securedrmtestdata.script"-"c:\testdata\scripts\te_tsu_mmf_aclnt_securedrmtestdata.script"
\ No newline at end of file
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\aclnt\scripts\te_tsu_mmf_aclnt_securedrmtestdata.script"-"c:\testdata\scripts\te_tsu_mmf_aclnt_securedrmtestdata.script"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.ini
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.ini	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.ini	Tue Nov 02 12:13:59 2010 +0000
@@ -19,7 +19,7 @@
 AudioPlayFName9  = c:\mm\mmf\testfiles\aclnt\4sec_wav.wav
 AudioPlayFName10  = c:\mm\mmf\testfiles\aclnt\sample.wav
 AudioPlayFName11  = c:\mm\mmf\testfiles\aclnt\testheaderTag.au
-AudioPlayFName12  = c:\mm\mmf\testfiles\aclnt\sequence2.sqn
+AudioPlayFName12  = c:\mm\mmf\testfiles\aclnt\NokiaTune.nrt
 AudioFNameToConvert  = c:\mm\mmf\testfiles\aclnt\small2.au
 AudioFNameToConvert2  = c:\mm\mmf\testfiles\aclnt\test16m2.wav
 AudioFNameToConvert3   = c:\mm\mmf\testfiles\aclnt\16bitmUPCM.raw
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01.script	Tue Nov 02 12:13:59 2010 +0000
@@ -70,9 +70,9 @@
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0020-CP C:\MM\TSU_MMF_ACLNT_01.ini
 TEST_COMPLETE
 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0025-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0025-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0025-CP - OpenUrl() not supported
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0025-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0032-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0032-CP C:\MM\TSU_MMF_ACLNT_01.ini
@@ -180,9 +180,9 @@
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0207-CP C:\MM\TSU_MMF_ACLNT_01.ini
 TEST_COMPLETE 
 
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0209-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0209-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0209-CP - OpenUrl() not supported
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0209-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0210-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0210-CP C:\MM\TSU_MMF_ACLNT_01.ini
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_NOTIFICATION.script	Tue Nov 02 12:13:59 2010 +0000
@@ -13,7 +13,7 @@
 // Description:
 // MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
 // 
-//
+////This script is not running as the functionality is not supported.
 
 # wait for ring.wav to finish playing
 delay 1000
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_3.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_3.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_3.script	Tue Nov 02 12:13:59 2010 +0000
@@ -85,12 +85,12 @@
 TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0631-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0631-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0631-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0632-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0632-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0632-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0633-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0633-CP
@@ -101,32 +101,32 @@
 TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0635-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0635-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0635-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0636-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0636-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0636-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0637-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0637-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0637-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0638-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0638-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0638-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0639-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0639-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0639-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0640-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0640-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0640-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0641-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0641-CP
-TEST_COMPLETE 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0641-CP
+//TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0642-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0642-CP
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_4.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_4.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_4.script	Tue Nov 02 12:13:59 2010 +0000
@@ -73,32 +73,32 @@
 TEST_COMPLETE 
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0740-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0740-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0740-CP
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0741-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0741-CP
 TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0742-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0742-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0742-CP
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0743-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0743-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0743-CP
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0744-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0744-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0744-CP
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0745-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0745-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0745-CP
+//TEST_COMPLETE
 
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0746-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0746-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0746-CP
+//TEST_COMPLETE
 
 // CR - Test entire Bitrate custom interface in DevSound through AudioInputStream
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0747-CP
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_5.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_5.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_5.script	Tue Nov 02 12:13:59 2010 +0000
@@ -235,59 +235,4 @@
 // DEF083334  Checking for ControllerImplementation info
 //! @SYMTestCaseID MM-MMF-ACLNT-U-1007-HP
 RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1007-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE 
-
-// DEF085172: Incorrect documentation of CMdaAudioRecorderUtility::SetVolume( )
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0965-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0965-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF087609: APIREG CMdaAudioPlayerUtility Panic tests fail with wrong panic
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0967-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0967-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// PDEF092098: DevSound fails to update policy if error occurs in StartPlayDataL
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0858-CP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0858-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// PDEF090287: CMdaAudioOutputStream resumes incorrectly after an error
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0859-CP
-RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0859-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF090666 : T:Aclnt - Pausing during repeat causes the file to close itself
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0968-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0968-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// DEF093014: T: CMdaAudioRecorderUtility::SetDestinationFormatL causes panic
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0969-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0969-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-// INC107513: Startup tone is played before tone initialization is completed.
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0970-HP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0970-HP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-
-//DEF120980:Creating two audiooutputstreams concurrently makes policyserver panic 
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0971-CP C:\MM\TSU_MMF_ACLNT_01.ini
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0972-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0972-CP
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0973-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0973-CP
-TEST_COMPLETE
-
-//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
-//! @SYMTestCaseID MM-MMF-ACLNT-U-0974-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0974-CP
-TEST_COMPLETE
+TEST_COMPLETE
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_7.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_7.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_7.script	Tue Nov 02 12:13:59 2010 +0000
@@ -38,8 +38,144 @@
 // Tests the calling Stop on AudioInputStream from BufferCopied callback
 //! @SYMTestCaseID MM-MMF-ACLNT-U-0751-CP
 RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0751-CP
+TEST_COMPLETE
 
 //DEF126403 PlayTone with 99% cpu time taken up elsewhere
 //! @SYMTestCaseID MM-MMF-ACLNT-U-2500-CP
-RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2500-CP C:\MM\TSU_MMF_ACLNT_01.ini MM-MMF-ACLNT-U-2500-CP
-TEST_COMPLETE
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-2500-CP C:\MM\TSU_MMF_ACLNT_01.ini MM-MMF-ACLNT-U-2500-CP
+//TEST_COMPLETE
+
+// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1000-HP
+//RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1000-HP
+//TEST_COMPLETE
+
+// CustomInterface CR - Add CustomInterface() to CMdaAudioInputStream
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1001-HP
+//RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1001-HP
+//TEST_COMPLETE
+
+// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
+///! @SYMTestCaseID MM-MMF-ACLNT-U-1002-HP
+//RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1002-HP
+//TEST_COMPLETE
+
+// DEF068366  Using record utility, callback of PlaybackBalance APIs fail.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1003-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1003-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
+
+// temporarly moved here as causes problem with the other tests.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0014-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0014-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0961-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0961-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0957-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0957-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0959-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0959-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1004-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1004-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1005-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1005-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1006-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1006-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1007-HP
+//RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1007-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE 
+
+// DEF085172: Incorrect documentation of CMdaAudioRecorderUtility::SetVolume( )
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0965-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0965-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF087609: APIREG CMdaAudioPlayerUtility Panic tests fail with wrong panic
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0967-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0967-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// PDEF092098: DevSound fails to update policy if error occurs in StartPlayDataL
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0858-CP
+//RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0858-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// PDEF090287: CMdaAudioOutputStream resumes incorrectly after an error
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0859-CP
+//RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0859-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF090666 : T:Aclnt - Pausing during repeat causes the file to close itself
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0968-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0968-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// DEF093014: T: CMdaAudioRecorderUtility::SetDestinationFormatL causes panic
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0969-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0969-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+// INC107513: Startup tone is played before tone initialization is completed.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0970-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0970-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+
+//DEF120980:Creating two audiooutputstreams concurrently makes policyserver panic 
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0971-CP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0972-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0972-CP
+//TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0973-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0973-CP
+//TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0974-CP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0974-CP
+//TEST_COMPLETE
+
+//DEF070060: Paused WAV can't always be resumed - Java TCK test setloopcount2 fails
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-HP
+//RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-HP C:\MM\TSU_MMF_ACLNT_01.ini
+//TEST_COMPLETE
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_8.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmlibs/mmfw/tsrc/mmfunittest/aclnt/scripts/TSU_MMF_ACLNT_01_POS_8.script	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,169 @@
+// Copyright (c) 2002-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:
+// Creation Date 29/07/2002
+// MMF 'Deprecated Audio Clients' Unit Testing script 13/08/2002
+// 
+//
+
+PRINT Run all the MMF 'Deprecated Audio Clients' unit tests, excluding memory Alloc failure tests
+PRINT 
+# wait for ring.wav to finish playing
+delay 1000
+
+//PAUSE_AT_END
+
+// 
+MULTITHREAD
+
+
+//
+LOAD_SUITE TSU_MMF_ACLNT_01.dll
+
+//////////////////////////////
+
+// Negative testing
+// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1000-HP
+RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1000-HP
+TEST_COMPLETE
+
+// CustomInterface CR - Add CustomInterface() to CMdaAudioInputStream
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1001-HP
+RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1001-HP
+TEST_COMPLETE
+
+// CustomInterface CR - Add CustomInterface() to CMdaAudioOutputStream
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1002-HP
+RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1002-HP
+TEST_COMPLETE
+
+// DEF068366  Using record utility, callback of PlaybackBalance APIs fail.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1003-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1003-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE 
+
+// temporarly moved here as causes problem with the other tests.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0014-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0014-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF078081: TCK fail: CMMFMdaAudioPlayerUtility::Duration can't handle infinite sounds
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0961-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0961-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0957-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0957-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0959-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0959-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+//CR0632 uri scheme
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0960-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0960-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1004-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1004-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1005-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1005-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1006-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1006-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE 
+
+// DEF083334  Checking for ControllerImplementation info
+//! @SYMTestCaseID MM-MMF-ACLNT-U-1007-HP
+RUN_TEST_STEP 200000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-1007-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE 
+
+// DEF085172: Incorrect documentation of CMdaAudioRecorderUtility::SetVolume( )
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0965-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0965-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF087609: APIREG CMdaAudioPlayerUtility Panic tests fail with wrong panic
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0967-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0967-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// PDEF092098: DevSound fails to update policy if error occurs in StartPlayDataL
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0858-CP
+RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0858-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// PDEF090287: CMdaAudioOutputStream resumes incorrectly after an error
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0859-CP
+RUN_TEST_STEP 320000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0859-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF090666 : T:Aclnt - Pausing during repeat causes the file to close itself
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0968-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0968-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// DEF093014: T: CMdaAudioRecorderUtility::SetDestinationFormatL causes panic
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0969-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0969-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+// INC107513: Startup tone is played before tone initialization is completed.
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0970-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0970-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+
+//DEF120980:Creating two audiooutputstreams concurrently makes policyserver panic 
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0971-CP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0972-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0972-CP
+TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0973-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0973-CP
+TEST_COMPLETE
+
+//DEF121928: Concurrently calling RecordL by audiorecorder in 3 threads make server panics
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0974-CP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0974-CP
+TEST_COMPLETE
+
+//DEF070060: Paused WAV can't always be resumed - Java TCK test setloopcount2 fails
+//! @SYMTestCaseID MM-MMF-ACLNT-U-0958-HP
+RUN_TEST_STEP 120000, TSU_MMF_ACLNT_01, MM-MMF-ACLNT-U-0958-HP C:\MM\TSU_MMF_ACLNT_01.ini
+TEST_COMPLETE
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_BASECL_TestCodec/101F77CC.rss
--- a/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_BASECL_TestCodec/101F77CC.rss	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/basecl/TSU_BASECL_TestCodec/101F77CC.rss	Tue Nov 02 12:13:59 2010 +0000
@@ -1,4 +1,5 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+//
+// Copyright (c) 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"
@@ -10,7 +11,8 @@
 //
 // Contributors:
 //
-// Description:
+// Description: 
+//
 //
 
 #include <mmfplugininterfaceuids.hrh>
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/basecl/group/unittest_basecl_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/basecl/group/unittest_basecl_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/basecl/group/unittest_basecl_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,6 +15,16 @@
 
 "\epoc32\release\armv5\urel\tsu_mmf_basecl.DLL"-"c:\sys\bin\tsu_mmf_basecl.DLL"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\tsu_mmf_basecl_testsrcsink.dll"-"c:\sys\bin\tsu_mmf_basecl_testsrcsink.dll"
 "\epoc32\localisation\101f77ca\rsc\101f77ca.rpp"-"c:\localisation\101f77ca\rsc\101f77ca.rpp"
 "\epoc32\localisation\group\101f77ca.info"-"c:\localisation\group\101f77ca.info"
@@ -31,21 +41,21 @@
 "\epoc32\data\z\resource\plugins\tsu_mmf_basecl_testformat.rsc"-"c:\resource\plugins\tsu_mmf_basecl_testformat.rsc"
 
 // script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\TSU_MMF_BASECL.script"-"c:\tsu_mmf_basecl.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\TSU_MMF_BASECL_Alloc.script"-"c:\tsu_mmf_basecl_alloc.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\TSU_MMF_BASECL.script"-"c:\tsu_mmf_basecl.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\TSU_MMF_BASECL_Alloc.script"-"c:\tsu_mmf_basecl_alloc.script"
 
 // ini file
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\tsu_mmf_basecl.ini"-"c:\tsu_mmf_basecl.ini"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\tsu_mmf_basecl.ini"-"c:\tsu_mmf_basecl.ini"
 
 //data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_8000_2.refsnd"-"c:\reference100hztone8000_1_8000_2.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_8000_1.refsnd"-"c:\reference100hztone8000_2_8000_1.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_11025_1.refsnd"-"c:\reference100hztone8000_1_11025_1.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_11025_2.refsnd"-"c:\reference100hztone8000_1_11025_2.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_6500_1.refsnd"-"c:\reference100hztone8000_1_6500_1.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_6500_2.refsnd"-"c:\reference100hztone8000_1_6500_2.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_11025_1.refsnd"-"c:\reference100hztone8000_2_11025_1.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_11025_2.refsnd"-"c:\reference100hztone8000_2_11025_2.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_6500_1.refsnd"-"c:\reference100hztone8000_2_6500_1.refsnd"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_6500_2.refsnd"-"c:\reference100hztone8000_2_6500_2.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_8000_2.refsnd"-"c:\reference100hztone8000_1_8000_2.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_8000_1.refsnd"-"c:\reference100hztone8000_2_8000_1.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_11025_1.refsnd"-"c:\reference100hztone8000_1_11025_1.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_11025_2.refsnd"-"c:\reference100hztone8000_1_11025_2.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_6500_1.refsnd"-"c:\reference100hztone8000_1_6500_1.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_1_6500_2.refsnd"-"c:\reference100hztone8000_1_6500_2.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_11025_1.refsnd"-"c:\reference100hztone8000_2_11025_1.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_11025_2.refsnd"-"c:\reference100hztone8000_2_11025_2.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_6500_1.refsnd"-"c:\reference100hztone8000_2_6500_1.refsnd"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\basecl\data\Reference100HzTone8000_2_6500_2.refsnd"-"c:\reference100hztone8000_2_6500_2.refsnd"
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/group/unittest_ctlfrm_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/group/unittest_ctlfrm_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/ctlfrm/group/unittest_ctlfrm_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -13,11 +13,22 @@
 // Description:
 //*Files (scripts, data, etc.) To Copy...<src> <destination>
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\mmfmp3format.dll"-"c:\sys\bin\mmfmp3format.dll"
 "\epoc32\localisation\101f7d99\rsc\101f7d99.rpp"-"c:\localisation\101f7d99\rsc\101f7d29.rpp"
 "\epoc32\localisation\group\101f7d99.info"-"c:\localisation\group\101f7d99.info"
 "\epoc32\data\z\resource\plugins\mmfmp3format.rsc"-"c:\resource\plugins\mmfmp3format.rsc"
 
+"\epoc32\release\armv5\urel\mmfmp3nullcodec.dll"-"c:\sys\bin\mmfmp3nullcodec.dll"
 "\epoc32\localisation\101f7d9a\rsc\101f7d9a.rpp"-"c:\localisation\101f7d9a\rsc\101f7d9a.rpp"
 "\epoc32\localisation\group\101f7d9a.info"-"c:\localisation\group\101f7d9a.info"
 "\epoc32\data\z\resource\plugins\mmfmp3nullcodec.rsc"-"c:\resource\plugins\mmfmp3nullcodec.rsc"
@@ -72,10 +83,10 @@
 "\epoc32\release\armv5\urel\ts_cmmftestcustomcommands.dll"-"c:\sys\bin\ts_cmmftestcustomcommands.dll"
 
 // Script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM.script"-"c:\tsu_mmf_ctlfrm.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM_SDRM.script"-"c:\tsu_mmf_ctlfrm_sdrm.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM_SDRM_ALLOC.script"-"c:\tsu_mmf_ctlfrm_sdrm_alloc.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\tsu_mmf_ctlfrm_subtitles.script"-"c:\tsu_mmf_ctlfrm_subtitles.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM.script"-"c:\tsu_mmf_ctlfrm.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM_SDRM.script"-"c:\tsu_mmf_ctlfrm_sdrm.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\TSU_MMF_CTLFRM_SDRM_ALLOC.script"-"c:\tsu_mmf_ctlfrm_sdrm_alloc.script"
+//"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\ctlfrm\scripts\tsu_mmf_ctlfrm_subtitles.script"-"c:\tsu_mmf_ctlfrm_subtitles.script"
 
 
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/devsubtitle/group/tsu_mmf_devsubtitle_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/devsubtitle/group/tsu_mmf_devsubtitle_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/devsubtitle/group/tsu_mmf_devsubtitle_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\mm\tsu_mmf_devsubtitle.script" - "c:\tsu_mmf_devsubtitle.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/group/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/group/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -14,7 +14,7 @@
 //
 
 #include "../aclnt/group/bld.inf"
-#include "../actrl/group/bld.inf"
+#include "../Actrl/group/bld.inf"
 #include "../AFMT/group/bld.inf"
 #include "../basecl/group/bld.inf"
 #include "../ctlfrm/group/bld.inf"
@@ -22,8 +22,10 @@
 #include "../MidiClnt/group/bld.inf"
 #include "../Recogniser/group/bld.inf"
 #include "../srssnk/group/bld.inf"
+#include "../SbcCodec/group/bld.INF"
 #include "../ACOD/group/bld.inf"
-#include "../DevSoundTest/group/bld.INF"
+#include "../DevSoundTest/group/bld.inf"
+#include "../DevSoundTest/CIPlugins/group/bld.inf"
 #include "videogroup/bld.inf"
 
 #ifdef SYMBIAN_VARIABLE_BITRATE_CODEC // use system wide flag to trigger model controller build
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/group/component_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/component_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/group/component_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 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"
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\basecl\TSU_MMF_BASECL.script"-"c:\mm\tsu_mmf_basecl.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/group/videogroup/bld.inf
--- a/mmlibs/mmfw/tsrc/mmfunittest/group/videogroup/bld.inf	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/group/videogroup/bld.inf	Tue Nov 02 12:13:59 2010 +0000
@@ -28,5 +28,5 @@
 
 #include "../../avictrl/group/bld.inf"
 
-#include "../../vclnt/group/bld.inf"
+#include "../../VCLNT/group/bld.inf"
 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_play.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_play.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_play.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 
 PRINT Run all the MMF OggController tests
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_record.script
--- a/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_record.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/scripts/tsu_mmf_oggctrl_record.script	Tue Nov 02 12:13:59 2010 +0000
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-//
+////This script is not running as the functionality is not supported.
 
 
 PRINT Run all the MMF OggController tests
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/srssnk/group/unittest_srssnk_test.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/srssnk/group/unittest_srssnk_test.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/srssnk/group/unittest_srssnk_test.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -15,8 +15,18 @@
 
 "\epoc32\release\armv5\udeb\tsu_mmf_srssnk.dll"-"c:\sys\bin\tsu_mmf_srssnk.dll"
 
+"\epoc32\release\armv5\urel\mmfaudiotonetestcontroller.dll"-"c:\sys\bin\mmfaudiotonetestcontroller.dll"
+"\epoc32\localisation\2002C398\rsc\2002C398.rpp"-"c:\localisation\2002C398\rsc\2002C398.rpp"
+"\epoc32\localisation\group\2002C398.info"-"c:\localisation\group\2002C398.info"
+"\epoc32\data\z\resource\plugins\mmfaudiotonetestcontroller.rsc"-"c:\resource\plugins\mmfaudiotonetestcontroller.rsc"
+
+"\epoc32\release\armv5\urel\mmfaudiowavtestcontroller.dll"-"c:\sys\bin\mmfaudiowavtestcontroller.dll"
+"\epoc32\localisation\2002C397\rsc\2002C397.rpp"-"c:\localisation\2002C397\rsc\2002C397.rpp"
+"\epoc32\localisation\group\2002C397.info"-"c:\localisation\group\2002C397.info"
+"\epoc32\data\z\resource\plugins\mmfaudiowavtestcontroller.rsc"-"c:\resource\plugins\mmfaudiowavtestcontroller.rsc"
+
 "\epoc32\release\armv5\urel\mmfmp3format.dll"-"c:\sys\bin\mmfmp3format.dll"
-"\epoc32\localisation\101f7d99\rsc\101f7d99.rpp"-"c:\localisation\101f7d99\rsc\101f7d29.rpp"
+"\epoc32\localisation\101f7d99\rsc\101f7d99.rpp"-"c:\localisation\101f7d99\rsc\101f7d99.rpp"
 "\epoc32\localisation\group\101f7d99.info"-"c:\localisation\group\101f7d99.info"
 "\epoc32\data\z\resource\plugins\mmfmp3format.rsc"-"c:\resource\plugins\mmfmp3format.rsc"
 
@@ -74,13 +84,13 @@
 "\epoc32\release\armv5\urel\ts_cmmftestcustomcommands.dll"-"c:\sys\bin\ts_cmmftestcustomcommands.dll"
 
 // script files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_ALLOC.script"-"c:\TSU_MMF_SRSSNK_ALLOC.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_FH_ALLOC.script"-"c:\TSU_MMF_SRSSNK_FH_ALLOC.script"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_Panic.script"-"c:\TSU_MMF_SRSSNK_Panic.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_ALLOC.script"-"c:\TSU_MMF_SRSSNK_ALLOC.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_FH_ALLOC.script"-"c:\TSU_MMF_SRSSNK_FH_ALLOC.script"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\TSU_MMF_SRSSNK_Panic.script"-"c:\TSU_MMF_SRSSNK_Panic.script"
 
 //data files
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile1.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile1.dat"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile2.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile2.dat"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile3.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile3.dat"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\mmftestfile1.wav"-"c:\mm\mmf\testfiles\srssnk\mmftestfile1.wav"
-"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\mmftestfile2.wav"-"c:\mm\mmf\testfiles\srssnk\mmftestfile2.wav"
\ No newline at end of file
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile1.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile1.dat"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile2.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile2.dat"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\MMFTestFile3.dat"-"c:\mm\mmf\testfiles\srssnk\mmftestfile3.dat"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\mmftestfile1.wav"-"c:\mm\mmf\testfiles\srssnk\mmftestfile1.wav"
+"\sf\os\mmaudio\mmlibs\mmfw\tsrc\mmfunittest\srssnk\data\mmftestfile2.wav"-"c:\mm\mmf\testfiles\srssnk\mmftestfile2.wav"
\ No newline at end of file
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/tsu_mmf_subtitledecoder_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/tsu_mmf_subtitledecoder_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/srtdecoder/group/tsu_mmf_subtitledecoder_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\mm\tsu_mmf_subtitledecoder.script" - "c:\tsu_mmf_subtitledecoder.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/subtitlegraphic/group/tsu_mmf_subtitlegraphic_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/subtitlegraphic/group/tsu_mmf_subtitlegraphic_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/subtitlegraphic/group/tsu_mmf_subtitlegraphic_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\mm\tsu_mmf_subtitlegraphic.script" - "c:\tsu_mmf_subtitlegraphic.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/tsu_mmf_videorenderer_data.pkg
--- a/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/tsu_mmf_videorenderer_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmfunittest/videorenderer/group/tsu_mmf_videorenderer_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of the License "Symbian Foundation License v1.0"
+; 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".
 ;
@@ -11,7 +11,9 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 "\epoc32\data\c\mm\tsu_mmf_videorenderer.script" - "c:\tsu_mmf_videorenderer.script"
+"\epoc32\data\c\mm\tsu_mmf_videorenderer_debug.script" - "c:\tsu_mmf_videorenderer_debug.script"
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents_data.pkg
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents_data.pkg	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group/tsi_mvs_agents_data.pkg	Tue Nov 02 12:13:59 2010 +0000
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2005-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"
@@ -11,7 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description:
+; Description: 
+;
 ;
 
 //ini
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent.script
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent.script	Tue Nov 02 12:13:59 2010 +0000
@@ -14,7 +14,7 @@
 // Description:
 // Creation Date 10/08/2005
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT Run the Multimedia Validation Audio Client Agent tests
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent_alloc.script
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent_alloc.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_audioagent_alloc.script	Tue Nov 02 12:13:59 2010 +0000
@@ -14,7 +14,7 @@
 // Description:
 // Creation Date 10/08/2005
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT Run the Multimedia Validation Audio Client Agent Alloc tests
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_plugin.script
--- a/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_plugin.script	Mon Oct 18 12:47:26 2010 +0100
+++ b/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/scripts/tsi_mvs_plugin.script	Tue Nov 02 12:13:59 2010 +0000
@@ -14,7 +14,7 @@
 // Description:
 // Creation Date 10/08/2005
 // 
-//
+////This script is not running as the functionality is not supported.
 
 PRINT Run the Multimedia Validation Client Plug-in Info tests
 PRINT 
diff -r 9d4397b300d1 -r b220a9341636 mmtestenv/mmtesttools/Doc/Lubbock Test Instructions.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmtestenv/mmtesttools/Doc/Lubbock Test Instructions.txt	Tue Nov 02 12:13:59 2010 +0000
@@ -0,0 +1,46 @@
+**************Running MultiMedia Tests On ASSABET and LUBBOCK Platforms**************
+
+This directory contains three .iby files, each of which should be copied to
+M:\EPOC32\ROM\INCLUDE\  (Where M:\ is your Epoc drive letter). They are listed below:
+
+MmfIntTests.iby - includes all dlls and scripts required for the MMF integration tests.
+IclIntTests.iby - includes all dlls and scripts required for the ICL integration tests.
+MmfUnitTests.iby - includes all dlls and scripts required for the MMF and testframework unit tests.
+IclUnitTests.iby - includes all dlls and scripts required for the ICL unit tests.
+
+(These are automatically copied using "bldmake bldfiles; abld export" from the source folder)
+
+---------------------------------------------------------------------------------
+
+The following batch files should be copied to M:\EPOC32\DATA\C\
+(Where M:\ is your Epoc drive letter)
+
+RunMMFIntTests.bat
+RunICLIntTests.bat
+RunICLUnitTests.bat
+RunMMFUnitTests.bat
+
+These batch files are intended for running on the target platform and will be integrated
+into target ROM builds by specifying the corresponding .iby file when building the ROM.
+
+(These are automatically copied using "bldmake bldfiles; abld export" from the source folder)
+
+----------------------------------------------------------------------------------
+
+Finally the file CopyDataToCf.bat should be used to copy all the files required for all tests onto a CF card, which can then be inserted into the target device in order to provide all test data. From the command prompt (PC), usage is:
+
+CopyDataToCF F:  (where F: is the CF card drive letter)
+
+Copying all the data onto the CF card takes several minutes. Note that the data is copied from DATA\C\ subdirectories. A chkdsk operation will automatically be performed at the end of the copy process for your convenience.
+
+----------------------------------------------------------------------------------
+
+Now, from the EPOC32\ROM\ directory, build a ROM for your selected target device as normal,  specifying ONE of the .iby files above as an additional include. The tests have been split over several iby files so as to fit onto a ROM (max size ~18MB). Boot the target device as normal and insert the CF card containing data files into the E: drive slot on the target device. (note: on Lubbock E:\ drive is the CF card slot, 
+not the PC card one).
+
+The batch file required to run your selected tests can now be found on the Root of the Z: drive and can be run from EShell.
+
+from Z:\, type RunMmfIntTests, RunIclIntTests, RunIclUnitTests or RunMmfUnitTests accordingly.
+
+The test result html files will be stored in C:\logs\testresults\ as normal.
+