Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:51 +0000
branchCompilerCompatibility
changeset 6 d3f4aa43df41
parent 4 a5b0096567da (current diff)
parent 3 4f62049db6ac (diff)
child 9 c2cb2ecb7d09
Automatic merge from PDK_3.0.h
mmmw_plat/mtp_keys_api/group/bld.inf
mmmw_plat/mtp_keys_api/inc/MtpPrivateCRKeys.h
mmmw_plat/mtp_keys_api/inc/MtpPrivatePSKeys.h
mmmw_plat/mtp_keys_api/mtp_keys_api.metaxml
mmmw_plat/mtp_wmdrm_api/group/bld.inf
mmmw_plat/mtp_wmdrm_api/inc/MMtpJanusDrmIf.h
mmmw_plat/mtp_wmdrm_api/mtp_wmdrm_api.metaxml
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_wClose.SIS
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_woClose.SIS
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.pkg
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sis
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sisx
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd-key.pem
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd.cer
--- a/layers.sysdef.xml	Mon Mar 08 21:44:05 2010 +0000
+++ b/layers.sysdef.xml	Sun Mar 14 13:11:51 2010 +0000
@@ -13,9 +13,6 @@
 			<module name="">
 				<unit unitID="mmmw_3GPExtParserLib" mrp="" bldFile="&layer_real_source_path;/mmserv/metadatautility/3GPExtParserLib/group" filter="!sf_build" name="mmmw_3GPExtParserLib" />
 			</module>
-			<module name="">
-				<unit unitID="mtp" mrp="" bldFile="&layer_real_source_path;/mtp/group" filter="!sf_build" name="mtp" />
-			</module>
     </layer>
     
   	<layer name="api_test_layer">
@@ -49,9 +46,6 @@
 			<module name="">
 				<unit unitID="mmmw_3GPExtParserLib_group" mrp="" bldFile="&layer_real_source_path;/mmserv/metadatautility/3GPExtParserLib/group" filter="!sf_build" name="mmmw_3GPExtParserLib_group" />
 			</module>
-			<module name="">
-				<unit unitID="mtp_group" mrp="" bldFile="&layer_real_source_path;/mtp/group" filter="!sf_build" name="mtp_group" />
-			</module>
     </layer>
 
   	<layer name="mw_mmmw_tms_layer">
--- a/mmmw_plat/group/bld.inf	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/group/bld.inf	Sun Mar 14 13:11:51 2010 +0000
@@ -30,8 +30,6 @@
 #include "../emc_volume_effect_api/group/bld.inf"
 #include "../emc_balance_effect_api/group/bld.inf"
 #include "../emc_descriptor_source_api/group/bld.inf"
-#include "../mtp_wmdrm_api/group/bld.inf"
-#include "../mtp_keys_api/group/bld.inf"
 #include "../emc_drm_config_intfc_api/group/bld.inf"
 #include "../voip_audio_services_api/group/bld.inf"
 #include "../configuration_components_factory_api/group/bld.inf"
--- a/mmmw_plat/mtp_keys_api/group/bld.inf	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2006 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:   File that exports the files belonging to 
-:                MTP Keys API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/MtpPrivateCRKeys.h     MW_LAYER_PLATFORM_EXPORT_PATH(MtpPrivateCRKeys.h)
-../inc/MtpPrivatePSKeys.h     MW_LAYER_PLATFORM_EXPORT_PATH(MtpPrivatePSKeys.h)
--- a/mmmw_plat/mtp_keys_api/inc/MtpPrivateCRKeys.h	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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:   Header Information for MTP Private Cenrep Keys
-*
-*/
-
-
-#ifndef MTPPRIVATECRKEYS_H
-#define MTPPRIVATECRKEYS_H
-
-#include <e32cmn.h>
-
-// MTP Settings API
-const TUid KCRUIDMTPSettings = {0x101FFC53};    // MTP CenRep Key UID
-const TUint32 KMTPDeleteFlag = 0x00000001;      // MTP CenRep Key for Delete contents
-
-#endif // MTPPRIVATECRKEYS_H
--- a/mmmw_plat/mtp_keys_api/inc/MtpPrivatePSKeys.h	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:   Header Information for MTP Private Publish & Subsribe Keys
-*
-*/
-
-
-#ifndef MTPPRIVATEPSKEYS_H
-#define MTPPRIVATEPSKEYS_H
-
-// Security Code UI Originator API
-const TUid KMtpPSUid = {0x101FFC51};    // Mtp Key UID
-const TInt KMtpPSStatus = 1;            // Mtp UID
-
-enum TMtpPSStatus
-    {
-    EMtpPSStatusUninitialized = 0, 
-    EMtpPSStatusActive, 
-    EMtpPSStatusReadyToSync
-    };
-
-#endif // MTPPRIVATEPSKEYS_H
--- a/mmmw_plat/mtp_keys_api/mtp_keys_api.metaxml	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="eba779447f4b459225cbd374f504d422" dataversion="2.0">
-  <name>MTP Keys API</name>
-  <description>This API defines the Central Repository and Publish &amp; Subscribe keys defined by MTP.</description>
-  <type>c++</type>
-  <collection>mtp</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/mmmw_plat/mtp_wmdrm_api/group/bld.inf	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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:   File that exports the files belonging to 
-:                MTP WMDRM API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/MMtpJanusDrmIf.h     MW_LAYER_PLATFORM_EXPORT_PATH(MMtpJanusDrmIf.h)
--- a/mmmw_plat/mtp_wmdrm_api/inc/MMtpJanusDrmIf.h	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* 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:   Defines the interface for implementation of the Windows DRM commands for MTP
-*                An implementor should derive from the class contained in this header file and
-*                supply a DLL with a single export which returns a pointer to an instance of
-*                the MMtpJanusDrmIf class.  The ordinal 1 export may not be a leaving function
-*                - all memory allocation should be done on the ConstructL() function call,
-*                which may leave.
-*
-*/
-
-
-#ifndef MMTPJANUSDRMIF_H
-#define MMTPJANUSDRMIF_H
-
-#include <e32std.h>
-
-
-/**
- *  Interface class of Windows DRM for MTP
- *
- *  @lib MtpServer.lib
- *  @since S60 3.2
- */
-class MMtpJanusDrmIf
-    {
-    public:
-    
-        /**
-         * Second phase constructor. All allocation for the library should be performed at this call
-         *
-         * @since S60 3.2
-         */
-        virtual void ConstructL() = 0;
-        
-        /**
-         * Called before the library is unloaded. All destruction and clean-up should be performed at this call
-         *
-         * @since S60 3.2
-         */
-        virtual void Close() = 0;
-                
-        /**
-         * Gets a secure time challenge from the initiator
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor to populate with the challenge data (responder->initiator)
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt GetSecureTimeChallenge(TDes8& aDataPhase, TUint32& aResponseParamOne) = 0;
-        
-        /**
-         * Sends a secure time response to the responder
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the response data (initiator->responder)
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SetSecureTimeResponse(const TDesC8& aDataPhase, TUint32& aResponseParamOne) = 0;
-    
-        /**
-         * Sends a license response object to the responder
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the license response data
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SetLicenseResponse(const TDesC8& aDataPhase, TUint32& aResponseParamOne) = 0;
-        
-        /**
-         * Sends a list of items to the initiator, based on the parameters in the query
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the sync list requested (responder -> initiator)
-         * @param aParamOne Contains the maximum remaining count value for the query (IN) and the DRM_RESULT (OUT)
-         * @param aParamTwo Contains the maximum remaining song validity for the query (IN) and the next starting index (OUT)
-         * @param aParamThree Contains the starting index for the data phase (IN) and the number of items processed (OUT)
-         * @param aParamFour Contains the number of items that should be processed in this call (IN)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt GetSyncList(TDes8& aDataPhase, TUint32& aParamOne, TUint32& aParamTwo, 
-                                 TUint32& aParamThree, TUint32 aParamFour) = 0;
-    
-        /**
-         * Sends a meter challenge query.
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the meter challenge query (initiator -> responder)
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SendMeterChallengeQuery(const TDesC8& aDataPhase, TUint32& aResponseParamOne) = 0;
-        
-        /**
-         * Gets a meter challenge from the initiator
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor to populate with the challenge data (responder->initiator)
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt GetMeterChallenge(TDes8& aDataPhase, TUint32& aResponseParamOne) = 0;
-        
-        /**
-         * Sends a meter response to the responder
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the response data (initiator->responder)
-         * @param aResponseParamOne Contains the DRM_RESULT (OUT)
-         * @param aMeterResponseFlags Contains the bit mask of flags to be passed to the initiator
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SetMeterResponse(const TDesC8& aDataPhase, TUint32& aResponseParamOne, TUint32& aMeterResponseFlags) = 0;
-        
-        /**
-         * Instructs the mobile device to clean the data store
-         *
-         * @since S60 3.2
-         * @param aParamOne Contains the cleaning flags bitmask (IN) and the DRM_RESULT (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt CleanDataStore(TUint32& aParamOne) = 0;
-
-        /**
-         * Gets the state of the license requested in the data phase
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the state query data
-         * @param aParamOne Contains the DRM_RESULT (OUT)
-         * @param aParamTwo Contains the category (OUT)
-         * @param aParamThree Contains the DRM license state (OUT)
-         * @param aParamFour Contains the DRM license state (OUT)
-         * @param aParamFive Contains reserved data (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt GetLicenseState(const TDesC8& aDataPhase, TUint32& aParamOne, TUint32& aParamTwo, 
-                                     TUint32& aParamThree, TUint32& aParamFour, TUint32& aParamFive) = 0;
-                                 
-        /**
-         * Sends a WMDRM command to the portable device for processing
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the command data phase (initiator -> responder)
-         * @param aParamOne Contains the operation code (IN) and the DRM_RESULT (OUT)
-         * @param aParamTwo Contains the first request argument (IN) and the first response result (OUT)
-         * @param aParamThree Contains the second request argument (IN) and the second response result (OUT)
-         * @param aParamFour Contains the third request argument (IN) and the third response result (OUT)
-         * @param aParamFive Contains the fourth request argument (IN) and the fourth response result (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SendWMDRMCommand(const TDesC8& aDataPhase, TUint32& aParamOne, TUint32& aParamTwo, 
-                                      TUint32& aParamThree, TUint32& aParamFour, TUint32& aParamFive) = 0;
-
-        /**
-         * Sends a WMDRM request to the portable device for processing
-         *
-         * @since S60 3.2
-         * @param aDataPhase Descriptor containing the command data phase (responder -> initiator)
-         * @param aParamOne Contains the operation code (IN) and the DRM_RESULT (OUT)
-         * @param aParamTwo Contains the first request argument (IN) and the first response result (OUT)
-         * @param aParamThree Contains the second request argument (IN) and the second response result (OUT)
-         * @param aParamFour Contains the third request argument (IN) and the third response result (OUT)
-         * @param aParamFive Contains the fourth request argument (IN) and the fourth response result (OUT)
-         * @return Error state. Negative values are Symbian error codes, positive values are MTP error codes
-         */
-        virtual TInt SendWMDRMRequest(TDes8& aDataPhase, TUint32& aParamOne, TUint32& aParamTwo, 
-                                      TUint32& aParamThree, TUint32& aParamFour, TUint32& aParamFive) = 0;
-        
-        /**
-         * Get the device certificate to pass back as the device property. The descriptor returned should
-         * contain the device certificate information as required by the GetDeviceProperty MTP command for
-         * the MTP_PROPERTYCODE_JANUS_DEVICECERTIFICATE dataset. 
-         * Ownership of the descriptor is passed back
-         *
-         * @since S60 3.2
-         * @return A populated buffer of the device certificate dataset, or NULL in the case of an error
-         */
-        virtual HBufC* DeviceCertificate() = 0;
-
-        /**
-         * Get the secure time of the device.
-         * Ownership of the descriptor is passed back
-         *
-         * @since S60 3.2
-         * @return A populated buffer of the device secure time, or NULL in the case of an error
-         */
-//        virtual HBufC* SecureTime() = 0;
-    };
-
-#endif // MMTPJANUSDRMIF_H
--- a/mmmw_plat/mtp_wmdrm_api/mtp_wmdrm_api.metaxml	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="686aaf9587f8c50a32b406699fdcc640" dataversion="2.0">
-  <name>MTP WMDRM API</name>
-  <description>This API defines the API used by MTP for handling WMDRM commands.</description>
-  <type>c++</type>
-  <collection>mtp</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/inc/TMSAudioServicesTestClass.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/inc/TMSAudioServicesTestClass.h	Sun Mar 14 13:11:51 2010 +0000
@@ -31,6 +31,7 @@
 #include <TmsCall.h>
 #include <TmsStream.h>
 #include <TmsFormat.h>
+#include <TmsDtmf.h>
 #include <TmsClientSink.h>
 #include <TmsClientSource.h>
 #include <TmsClientSourceObsrvr.h>
@@ -331,6 +332,9 @@
     TInt GetDownlinkVersion(CStifItemParser& aItem);
     TInt CreateUplinkStream(CStifItemParser& aItem);
     TInt GetUplinkVersion(CStifItemParser& aItem);
+    TInt CreateDTMFTonePlayer(CStifItemParser& aItem);
+    TInt DeleteDTMFTonePlayer(CStifItemParser& aItem);
+    TInt CreateRingTonePlayer(CStifItemParser& aItem);
     TInt GetSupportedFormats(CStifItemParser& aItem);
     TInt IsCallTypeSupported(CStifItemParser& aItem);
     //  TInt GetSupportedUplinkFormats( CStifItemParser& aItem );
@@ -348,6 +352,11 @@
     TInt Gain(CStifItemParser& aItem);
     TInt Volume(CStifItemParser& aItem);
 
+    TInt InitDTMFTonePlayer(CStifItemParser& aItem);
+    TInt DTMFTonePlay(CStifItemParser& aItem);
+    TInt CloseDTMFPlayer(CStifItemParser& aItem);
+    TInt StopDTMFTonePlayer(CStifItemParser& aItem);
+
     TInt GetBufferType(CStifItemParser& aItem);
 
     //  TInt GetSupportedBitrates( CStifItemParser& aItem );
@@ -417,12 +426,13 @@
     // reference to TestModuleIf
     CTestModuleIf& iTestModuleIf;
 
-    // Dn/Uplink
     TMSFactory* iFactory;
     TMSStream* iTmsDnlink;
     TMSCall* iTmsCall;
     TMSStream* iTmsUplink;
-    TMSAudioOutput device;
+    TMSDTMF* iDTMFTonePlayerDn;
+    TMSDTMF* iDTMFTonePlayerUp;
+    TMSAudioOutput iDevice;
 
     // Codec format APIs
     TMSBuffer* iTmsBuffer;
--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -116,6 +116,9 @@
     iLog->Log(_L(""));
     iLog->Log(_L(""));
 
+    delete iDTMFTonePlayerDn;
+    delete iDTMFTonePlayerUp;
+
     // delete iPlayBuf;
 
     if (iTmsDnlink)
@@ -171,6 +174,8 @@
         ENTRY( "GetEffectType", CTmsAudioServicesTestClass::GetEffectType ),
         ENTRY( "CreateDownlinkStream", CTmsAudioServicesTestClass::CreateDownlinkStream ),
         ENTRY( "CreateUplinkStream", CTmsAudioServicesTestClass::CreateUplinkStream ),
+        ENTRY( "CreateDTMFTonePlayer", CTmsAudioServicesTestClass::CreateDTMFTonePlayer ),
+        ENTRY( "DeleteDTMFTonePlayer", CTmsAudioServicesTestClass::DeleteDTMFTonePlayer ),
         ENTRY( "GetSupportedFormats", CTmsAudioServicesTestClass::GetSupportedFormats ),
         ENTRY( "IsCallTypeSupported", CTmsAudioServicesTestClass::IsCallTypeSupported ),
         ENTRY( "SetDownlinkFormat", CTmsAudioServicesTestClass::SetDownlinkFormat ),
@@ -193,6 +198,10 @@
         ENTRY( "GetBitRateList", CTmsAudioServicesTestClass::GetBitRateList ),
         ENTRY( "SetBitrates", CTmsAudioServicesTestClass::SetBitrates ),
         ENTRY( "GetBitrates", CTmsAudioServicesTestClass::GetBitrates ),
+        ENTRY( "InitDTMFTonePlayer", CTmsAudioServicesTestClass::InitDTMFTonePlayer ),
+        ENTRY( "DTMFTonePlay", CTmsAudioServicesTestClass::DTMFTonePlay ),
+        ENTRY( "CloseDTMFPlayer", CTmsAudioServicesTestClass::CloseDTMFPlayer ),
+        ENTRY( "StopDTMFPlayer", CTmsAudioServicesTestClass::StopDTMFTonePlayer ),
         ENTRY( "GetDownlinkVersion", CTmsAudioServicesTestClass::GetDownlinkVersion ),
         ENTRY( "GetUplinkVersion", CTmsAudioServicesTestClass::GetUplinkVersion ),
         ENTRY( "GetType", CTmsAudioServicesTestClass::GetType ),
@@ -1115,6 +1124,75 @@
     return error;
     }
 
+TInt CTmsAudioServicesTestClass::CreateDTMFTonePlayer(CStifItemParser& aItem)
+    {
+    iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer"));
+    TInt error = KErrNone;
+    TPtrC StreamType;
+    error = aItem.GetNextString(StreamType);
+
+    if (error == KErrNone)
+        {
+        if (StreamType == KTagDnlink)
+            {
+            if (iTmsCall)
+                {
+                error = iFactory->CreateDTMF(0, iDTMFTonePlayerDn);
+                FTRACE(FPrint(_L("CreateDTMF Error [%d]"),error));
+                }
+            }
+        else if (StreamType == KTagUplink)
+            {
+            if (iTmsCall)
+                {
+                error = iFactory->CreateDTMF(0, iDTMFTonePlayerUp);
+                }
+            }
+        else
+            {
+            iLog->Log(KMsgBadTestParameters);
+            error = KErrBadTestParameter;}
+        }
+    iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer Error [%d]"),
+            error);
+    return error;
+    }
+
+TInt CTmsAudioServicesTestClass::DeleteDTMFTonePlayer(CStifItemParser& aItem)
+    {
+    iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer"));
+    TInt error = KErrNone;
+    TPtrC StreamType;
+    error = aItem.GetNextString(StreamType);
+
+    if (error == KErrNone)
+        {
+        if (StreamType == KTagDnlink)
+            {
+            if (iTmsCall && iDTMFTonePlayerDn)
+                {
+                error = iFactory->DeleteDTMF(iDTMFTonePlayerDn);
+                FTRACE(FPrint(_L("DeleteDTMF Error [%d]"),error));
+                }
+            }
+        else if (StreamType == KTagUplink)
+            {
+            if (iTmsCall && iDTMFTonePlayerUp)
+                {
+                error = iFactory->DeleteDTMF(iDTMFTonePlayerUp);
+                }
+            }
+        else
+            {
+            iLog->Log(KMsgBadTestParameters);
+            error = KErrBadTestParameter;
+            }
+        }
+    iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer Error [%d]"),
+            error);
+    return error;
+    }
+
 TInt CTmsAudioServicesTestClass::GetSupportedFormats(CStifItemParser& aItem)
     {
     iLog->Log(_L("CTmsAudioServicesTestClass::GetSupportedFormats"));
@@ -2001,11 +2079,10 @@
 
     if (iTmsGlobalRouting)
         {
-        error = iTmsGlobalRouting->GetOutput(device);
+        error = iTmsGlobalRouting->GetOutput(iDevice);
         iLog->Log(
-                _L("CTmsAudioServicesTestClass::GetOutput, error:[%d] device:[%d]"),
-                error, device);
-
+                _L("CTmsAudioServicesTestClass::GetOutput, error:[%d] iDevice:[%d]"),
+                error, iDevice);
         }
 
     if (error != KErrNone)
@@ -2019,7 +2096,7 @@
         {
         if (OutputType == KTagNone)
             {
-            if (device != TMS_AUDIO_OUTPUT_NONE)
+            if (iDevice != TMS_AUDIO_OUTPUT_NONE)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2029,7 +2106,7 @@
             }
         else if (OutputType == KTagPublic)
             {
-            if (device != TMS_AUDIO_OUTPUT_PUBLIC)
+            if (iDevice != TMS_AUDIO_OUTPUT_PUBLIC)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2039,7 +2116,7 @@
             }
         else if (OutputType == KTagPrivate)
             {
-            if (device != TMS_AUDIO_OUTPUT_PRIVATE)
+            if (iDevice != TMS_AUDIO_OUTPUT_PRIVATE)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2049,7 +2126,7 @@
             }
         else if (OutputType == KTagHandset)
             {
-            if (device != TMS_AUDIO_OUTPUT_HANDSET)
+            if (iDevice != TMS_AUDIO_OUTPUT_HANDSET)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2059,7 +2136,7 @@
             }
         else if (OutputType == KTagLoudspeaker)
             {
-            if (device != TMS_AUDIO_OUTPUT_LOUDSPEAKER)
+            if (iDevice != TMS_AUDIO_OUTPUT_LOUDSPEAKER)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2069,7 +2146,7 @@
             }
         else if (OutputType == KTagWiredAccessory)
             {
-            if (device != TMS_AUDIO_OUTPUT_WIRED_ACCESSORY)
+            if (iDevice != TMS_AUDIO_OUTPUT_WIRED_ACCESSORY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2079,7 +2156,7 @@
             }
         else if (OutputType == KTagAccessory)
             {
-            if (device != TMS_AUDIO_OUTPUT_ACCESSORY)
+            if (iDevice != TMS_AUDIO_OUTPUT_ACCESSORY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2089,7 +2166,7 @@
             }
         else if (OutputType == KTagTTY)
             {
-            if (device != TMS_AUDIO_OUTPUT_ETTY)
+            if (iDevice != TMS_AUDIO_OUTPUT_ETTY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2114,7 +2191,7 @@
 
     if (iTmsGlobalRouting)
         {
-        error = iTmsGlobalRouting->GetPreviousOutput(device);
+        error = iTmsGlobalRouting->GetPreviousOutput(iDevice);
         iLog->Log(
                 _L("CTmsAudioServicesTestClass::GetPreviousOutput, error:[%d] "),
                 error);
@@ -2131,7 +2208,7 @@
         {
         if (OutputType == KTagNone)
             {
-            if (device != TMS_AUDIO_OUTPUT_NONE)
+            if (iDevice != TMS_AUDIO_OUTPUT_NONE)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2141,7 +2218,7 @@
             }
         else if (OutputType == KTagPublic)
             {
-            if (device != TMS_AUDIO_OUTPUT_PUBLIC)
+            if (iDevice != TMS_AUDIO_OUTPUT_PUBLIC)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2151,7 +2228,7 @@
             }
         else if (OutputType == KTagPrivate)
             {
-            if (device != TMS_AUDIO_OUTPUT_PRIVATE)
+            if (iDevice != TMS_AUDIO_OUTPUT_PRIVATE)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2161,7 +2238,7 @@
             }
         else if (OutputType == KTagHandset)
             {
-            if (device != TMS_AUDIO_OUTPUT_HANDSET)
+            if (iDevice != TMS_AUDIO_OUTPUT_HANDSET)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2171,7 +2248,7 @@
             }
         else if (OutputType == KTagLoudspeaker)
             {
-            if (device != TMS_AUDIO_OUTPUT_LOUDSPEAKER)
+            if (iDevice != TMS_AUDIO_OUTPUT_LOUDSPEAKER)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2181,7 +2258,7 @@
             }
         else if (OutputType == KTagWiredAccessory)
             {
-            if (device != TMS_AUDIO_OUTPUT_WIRED_ACCESSORY)
+            if (iDevice != TMS_AUDIO_OUTPUT_WIRED_ACCESSORY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2191,7 +2268,7 @@
             }
         else if (OutputType == KTagAccessory)
             {
-            if (device != TMS_AUDIO_OUTPUT_ACCESSORY)
+            if (iDevice != TMS_AUDIO_OUTPUT_ACCESSORY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2201,7 +2278,7 @@
             }
         else if (OutputType == KTagTTY)
             {
-            if (device != TMS_AUDIO_OUTPUT_ETTY)
+            if (iDevice != TMS_AUDIO_OUTPUT_ETTY)
                 {
                 error = KErrUnexpectedValue;
                 iLog->Log(
@@ -2251,6 +2328,39 @@
         {
         error = KErrNotReady;
         }
+
+    return error;
+    }
+
+TInt CTmsAudioServicesTestClass::InitDTMFTonePlayer(CStifItemParser& /*aItem */)
+    {
+    FTRACE(FPrint(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer")));
+    iLog->Log(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer"));
+    TInt error = KErrNone;
+    return error;
+    }
+
+TInt CTmsAudioServicesTestClass::DTMFTonePlay(CStifItemParser& /*aItem */)
+    {
+    FTRACE (FPrint(_L("CTmsAudioServicesTestClass::DTMFTonePlay")));
+    iLog->Log(_L("CTmsAudioServicesTestClass::DTMFTonePlay"));
+    TInt error = KErrNone;
+    return error;
+    }
+
+TInt CTmsAudioServicesTestClass::CloseDTMFPlayer(CStifItemParser& /*aItem */)
+    {
+    FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer")));
+    iLog->Log(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer"));
+    TInt error = KErrNone;
+    return error;
+    }
+
+TInt CTmsAudioServicesTestClass::StopDTMFTonePlayer(CStifItemParser& /*aItem */)
+    {
+    FTRACE(FPrint(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer")));
+    iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlay"));
+    TInt error = KErrNone;
     return error;
     }
 
--- a/mmmw_plat/voip_audio_services_api/inc/voipaudiocommon.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipaudiocommon.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines set of common constants and enumerated lists.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines set of common constants and enumerated lists.
+ *
+ */
 
 #ifndef __VOIPAUDIOCOMMON_H
 #define __VOIPAUDIOCOMMON_H
@@ -26,7 +25,7 @@
 /**
  *  TVoIPCodecFormat
  *  ?description
- *  @since S60 v5.0
+ *
  */
 enum TVoIPCodecFormat
     {
@@ -41,5 +40,4 @@
 
 #endif //__VOIPAUDIOCOMMON_H
 
-
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipdatabuffer.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipdatabuffer.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,43 +1,40 @@
 /*
-* Copyright (c) 2008 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:  Defines buffer type for VoIP data streaming.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines buffer type for VoIP data streaming.
+ *
+ */
 
 #ifndef __VOIPDATABUFFER_H
 #define __VOIPDATABUFFER_H
 
 #include <e32base.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPDataBufferImpl;
 class CVoIPJBDataBufferImpl;
 
-
 /**
  *  CVoIPDataBuffer
  *  ?description
- *  @since S60 v5.0
+ *
  */
 class CVoIPDataBuffer
     {
 public:
     /**
-    * Buffer types
-    */
+     * Buffer types
+     */
     enum TVoIPBufferType
         {
         EStandard,
@@ -101,15 +98,15 @@
     void ConstructL(CVoIPDataBufferImpl* aVoIPDataBufferImpl);
 
 private:
+
     CVoIPDataBufferImpl* iVoIPDataBufferImpl;
 
     };
 
-
 /**
  *  CVoIPJBDataBuffer
  *  ?description
- *  @since S60 v5.0
+ *
  */
 class CVoIPJBDataBuffer : public CVoIPDataBuffer
     {
@@ -161,11 +158,11 @@
     void ConstructL(CVoIPJBDataBufferImpl* aVoIPJBDataBufferImpl);
 
 private:
+
     CVoIPJBDataBufferImpl* iVoIPJBDataBufferImpl;
 
     };
 
 #endif //__VOIPDATABUFFER_H
 
-
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipdownlinkstream.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipdownlinkstream.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines VoIP downlink stream APIs.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines VoIP downlink stream APIs.
+ *
+ */
 
 #ifndef __VOIPDOWNLINKSTREAM_H
 #define __VOIPDOWNLINKSTREAM_H
@@ -22,7 +21,6 @@
 #include <voipaudiocommon.h>
 #include <voipdtmftoneplayer.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPAudioDownlinkStream;
 class CVoIPAudioDownlinkStreamImpl;
@@ -35,14 +33,14 @@
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MVoIPDownlinkObserver
     {
 public:
-    static const TUint KOpenComplete       = 1;
-    static const TUint KDownlinkError      = 2;
-    static const TUint KDownlinkClosed     = 3;
+    static const TUint KOpenComplete = 1;
+    static const TUint KDownlinkError = 2;
+    static const TUint KDownlinkClosed = 3;
     static const TUint KAudioDeviceChanged = 4;
 
 public:
@@ -55,7 +53,7 @@
      * @return void
      */
     virtual void FillBuffer(const CVoIPAudioDownlinkStream& aSrc,
-                            CVoIPDataBuffer* aBuffer) = 0;
+            CVoIPDataBuffer* aBuffer) = 0;
     /**
      * ?description
      *
@@ -65,19 +63,17 @@
      * @param TInt - Status
      * @return void
      */
-    virtual void Event(const CVoIPAudioDownlinkStream& aSrc,
-                       TInt aEventType,
-                       TInt aError) = 0;
+    virtual void Event(const CVoIPAudioDownlinkStream& aSrc, TInt aEventType,
+            TInt aError) = 0;
     };
 
-
 /**
  *  CVoIPAudioDownlinkStream class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPAudioDownlinkStream
     {
@@ -85,7 +81,7 @@
     /**
      *  TVoIPOutputDevice
      *  ?description
-     *  @since S60 v5.0
+ *
      */
     enum TVoIPOutputDevice
         {
@@ -158,7 +154,7 @@
      * @return TInt
      */
     IMPORT_C TInt SetFormat(TVoIPCodecFormat aFormat,
-                            CVoIPFormatIntfc*& aIntfc);
+            CVoIPFormatIntfc*& aIntfc);
 
     /**
      * ?description
@@ -232,8 +228,8 @@
      * @param none
      * @return TInt
      */
-     void ConstructL(
-          CVoIPAudioDownlinkStreamImpl* aVoIPAudioDownlinkStreamImpl);
+    void ConstructL(
+            CVoIPAudioDownlinkStreamImpl* aVoIPAudioDownlinkStreamImpl);
 
 private:
     /**
@@ -249,5 +245,4 @@
 
 #endif //__VOIPDOWNLINKSTREAM_H
 
-
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipdtmftoneplayer.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipdtmftoneplayer.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,39 +1,36 @@
 /*
-* Copyright (c) 2008 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:  Defines VoIP DTMF tone player APIs.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines VoIP DTMF tone player APIs.
+ *
+ */
 
 #ifndef __VOIPDTMFTONEPLAYER_H
 #define __VOIPDTMFTONEPLAYER_H
 
-
 // FORWARD DECLARATIONS
 class CVoIPAudioUplinkStream;
 class CVoIPAudioDownlinkStream;
 class CDTMFTonePlayer;
 class CDTMFTonePlayerImpl;
 
-
 /**
  *  MDTMFToneObserver class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MDTMFToneObserver
     {
@@ -51,19 +48,17 @@
      * @param TInt - Status
      * @return void
      */
-    virtual void Event(const CDTMFTonePlayer& aPlayer,
-                       TInt aEventType,
-                       TInt aError) = 0;
+    virtual void Event(const CDTMFTonePlayer& aPlayer, TInt aEventType,
+            TInt aError) = 0;
     };
 
-
 /**
  *  CDTMFTonePlayer class
  *
  *  DTMF Tone Player class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CDTMFTonePlayer
     {
@@ -149,7 +144,7 @@
      * @return TInt
      */
     IMPORT_C TInt RemoveVoIPAudioDownlinkStream(
-                  CVoIPAudioDownlinkStream& aStream);
+            CVoIPAudioDownlinkStream& aStream);
 
 protected:
 
@@ -179,5 +174,4 @@
 
 #endif //__VOIPDTMFTONEPLAYER_H
 
-
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipformatintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipformatintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,46 +1,43 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs common to all supported codecs.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs common to all supported codecs.
+ *
+ */
 
 #ifndef __VOIPFORMATINTFC_H
 #define __VOIPFORMATINTFC_H
 
 #include <voipaudiocommon.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPFormatIntfc;
 class CVoIPFormatIntfcImpl;
 
-
 /**
  *  MVoIPFormatObserver class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MVoIPFormatObserver
     {
 public:
-    static const TUint KSilenceBegin     = 1;
-    static const TUint KSilenceUpdate    = 2;
-    static const TUint KSilenceEnd       = 3;
+    static const TUint KSilenceBegin = 1;
+    static const TUint KSilenceUpdate = 2;
+    static const TUint KSilenceEnd = 3;
     static const TUint KObserverEventMax = 4;
 
 public:
@@ -55,14 +52,13 @@
     virtual void Event(const CVoIPFormatIntfc& aSrc, TInt aEventType) = 0;
     };
 
-
 /**
  *  CVoIPFormatIntfc class
  *
  *  Base class for codec format configuration
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPFormatIntfc
     {
@@ -70,7 +66,7 @@
     /**
      *  TG711CodecMode
      *  ?description
-     *  @since S60 v5.0
+ *
      */
     enum TG711CodecMode
         {
@@ -81,7 +77,7 @@
     /**
      *  TILBCCodecMode
      *  ?description
-     *  @since S60 v5.0
+ *
      */
     enum TILBCCodecMode
         {
@@ -209,6 +205,7 @@
     void ConstructL(CVoIPFormatIntfcImpl* aVoIPFormatIntfcImpl);
 
 protected:
+
     CVoIPFormatIntfcImpl* iVoIPFormatIntfcImpl;
 
     };
--- a/mmmw_plat/voip_audio_services_api/inc/voipg711decoderintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipg711decoderintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs specific to G.711 decoder.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs specific to G.711 decoder.
+ *
+ */
 
 #ifndef __VOIPG711DECFORMATINTFC_H
 #define __VOIPG711DECFORMATINTFC_H
@@ -22,18 +21,16 @@
 #include <voipaudiocommon.h>
 #include <voipformatintfc.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPG711DecoderIntfcImpl;
 
-
 /**
  *  CVoIPG711DecoderIntfc class
  *
  *  G.711 decoder configuration class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPG711DecoderIntfc : public CVoIPFormatIntfc
     {
@@ -125,7 +122,6 @@
 
     };
 
-
 #endif //__VOIPG711DECFORMATINTFC_H
 
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipg711encoderintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipg711encoderintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs specific to G.711 encoder.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs specific to G.711 encoder.
+ *
+ */
 
 #ifndef __VOIPG711ENCFORMATINTFC_H
 #define __VOIPG711ENCFORMATINTFC_H
@@ -22,18 +21,16 @@
 #include <voipaudiocommon.h>
 #include <voipformatintfc.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPG711EncoderIntfcImpl;
 
-
 /**
  *  CVoIPG711EncoderIntfc class
  *
  *  G.711 encoder configuration class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPG711EncoderIntfc : public CVoIPFormatIntfc
     {
@@ -89,7 +86,6 @@
 
     };
 
-
 #endif //__VOIPG711ENCFORMATINTFC_H
 
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipg729decoderintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipg729decoderintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs specific to G.729 decoder.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs specific to G.729 decoder.
+ *
+ */
 
 #ifndef __VOIPG729DECFORMATINTFC_H
 #define __VOIPG729DECFORMATINTFC_H
@@ -22,18 +21,16 @@
 #include <voipaudiocommon.h>
 #include <voipformatintfc.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPG729DecoderIntfcImpl;
 
-
 /**
  *  CVoIPG729DecoderIntfc class
  *
  *  G.729 decoder configuration class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPG729DecoderIntfc : public CVoIPFormatIntfc
     {
@@ -80,7 +77,6 @@
 
     };
 
-
 #endif //__VOIPG729DECFORMATINTFC_H
 
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipilbcdecoderintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipilbcdecoderintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs specific to iLBC decoder.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs specific to iLBC decoder.
+ *
+ */
 
 #ifndef __VOIPILBCDECFORMATINTFC_H
 #define __VOIPILBCDECFORMATINTFC_H
@@ -22,18 +21,16 @@
 #include <voipaudiocommon.h>
 #include <voipformatintfc.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPILBCDecoderIntfcImpl;
 
-
 /**
  *  CVoIPILBCDecoderIntfc class
  *
  *  iLBC decoder configuration class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPILBCDecoderIntfc : public CVoIPFormatIntfc
     {
@@ -107,7 +104,6 @@
 
     };
 
-
 #endif //__VOIPILBCDECFORMATINTFC_H
 
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipilbcencoderintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipilbcencoderintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs specific to iLBC encoder.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs specific to iLBC encoder.
+ *
+ */
 
 #ifndef __VOIPILBCENCFORMATINTFC_H
 #define __VOIPILBCENCFORMATINTFC_H
@@ -22,18 +21,16 @@
 #include <voipaudiocommon.h>
 #include <voipformatintfc.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPILBCEncoderIntfcImpl;
 
-
 /**
  *  CVoIPILBCEncoderIntfc class
  *
  *  iLBC encoder configuration class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPILBCEncoderIntfc : public CVoIPFormatIntfc
     {
@@ -89,7 +86,6 @@
 
     };
 
-
 #endif //__VOIPILBCENCFORMATINTFC_H
 
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voipjitterbufferintfc.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipjitterbufferintfc.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs common to all supported codecs.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs common to all supported codecs.
+ *
+ */
 
 #ifndef __VOIPJITTERBUFFERINTFC_H
 #define __VOIPJITTERBUFFERINTFC_H
@@ -23,16 +22,14 @@
 #include <e32base.h>
 #include <voipaudiocommon.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPJitterBufferIntfc;
 class CVoIPJitterBufferIntfcImpl;
 
-
 /**
  *  TVoIPJBConfig
  *  ?description
- *  @since S60 v5.0
+ *
  */
 class TVoIPJBConfig
     {
@@ -62,14 +59,13 @@
     TUint iJBPlayToneDuration;
     };
 
-
 /**
  *  MVoIPJitterBufferObserver class
  *
  *  description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MVoIPJitterBufferObserver
     {
@@ -87,17 +83,16 @@
      * @return void
      */
     virtual void Event(const CVoIPJitterBufferIntfc& aSrc,
-                       TInt aEventType) = 0;
+            TInt aEventType) = 0;
     };
 
-
 /**
  *  CVoIPFormatIntfc class
  *
  *  Base class for codec format configuration
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPJitterBufferIntfc
     {
@@ -120,7 +115,6 @@
      */
     IMPORT_C TInt SetObserver(MVoIPJitterBufferObserver& aObserver);
 
-
     /**
      * ConfigureJitterBuffer
      * @since S60 v5.0
@@ -162,7 +156,7 @@
      * @param none
      * @return none
      */
-      CVoIPJitterBufferIntfc();
+    CVoIPJitterBufferIntfc();
 
     /**
      * 2-nd phase constructor
@@ -180,5 +174,4 @@
 
 #endif  //__VOIPJITTERBUFFERINTFC_H
 
-
 // End of File
--- a/mmmw_plat/voip_audio_services_api/inc/voipringtonefactory.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipringtonefactory.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,37 +1,34 @@
 /*
-* Copyright (c) 2008 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:  Defines factory object for creating ring tone player.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines factory object for creating ring tone player.
+ *
+ */
 
 #ifndef __RINGTONEFACTORY_H
 #define __RINGTONEFACTORY_H
 
-
 // FORWARD DECLARATIONS
 class CRingTonePlayer;
 class CRingToneFactoryImpl;
 
-
 /**
  *  CRingToneFactory class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CRingToneFactory
     {
--- a/mmmw_plat/voip_audio_services_api/inc/voipringtoneplayer.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipringtoneplayer.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,43 +1,40 @@
 /*
-* Copyright (c) 2008 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:  Defines APIs for VoIP ring tone player.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines APIs for VoIP ring tone player.
+ *
+ */
 
 #ifndef __RINGTONEPLAYER_H
 #define __RINGTONEPLAYER_H
 
-
 // FORWARD DECLARATIONS
 class RFile;
 class CRingTonePlayer;
 class CRingTonePlayerImpl;
 
-
 /**
  *  MRingToneObserver class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MRingToneObserver
     {
 public:
-    static const TUint KOpenComplete     = 1;
+    static const TUint KOpenComplete = 1;
     static const TUint KPlaybackComplete = 2;
 
 public:
@@ -50,19 +47,17 @@
      * @param TInt - Status
      * @return void
      */
-    virtual void Event(const CRingTonePlayer& aSrc,
-                       TInt aEventType,
-                       TInt aError) = 0;
+    virtual void Event(const CRingTonePlayer& aSrc, TInt aEventType,
+            TInt aError) = 0;
     };
 
-
 /**
  *  CRingTonePlayer class
  *
  *  Ring Tone Player class
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CRingTonePlayer
     {
@@ -94,8 +89,7 @@
      * @param TPtr
      * @return TInt
      */
-    IMPORT_C TInt Open(MRingToneObserver& aObserver,
-                       TPtr aFileName);
+    IMPORT_C TInt Open(MRingToneObserver& aObserver, TPtr aFileName);
 
     /**
      * ?description
@@ -105,8 +99,7 @@
      * @param RFile&
      * @return TInt
      */
-    IMPORT_C TInt Open(MRingToneObserver& aObserver,
-                       RFile& aFileHandle);
+    IMPORT_C TInt Open(MRingToneObserver& aObserver, RFile& aFileHandle);
 
     /**
      * ?description
@@ -117,9 +110,8 @@
      * @param TPtr8
      * @return TInt
      */
-    IMPORT_C TInt Open(MRingToneObserver& aObserver,
-                       TPtr8 aDesTone,
-                       TPtr8 aMimeType);
+    IMPORT_C TInt Open(MRingToneObserver& aObserver, TPtr8 aDesTone,
+            TPtr8 aMimeType);
 
     /**
      * ?description
--- a/mmmw_plat/voip_audio_services_api/inc/voipuplinkstream.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voipuplinkstream.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Defines VoIP uplink stream APIs.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines VoIP uplink stream APIs.
+ *
+ */
 
 #ifndef __VOIPUPLINKSTREAM_H
 #define __VOIPUPLINKSTREAM_H
@@ -22,27 +21,25 @@
 #include <voipaudiocommon.h>
 #include <voipdtmftoneplayer.h>
 
-
 // FORWARD DECLARATIONS
 class CVoIPDataBuffer;
 class CVoIPFormatIntfc;
 class CVoIPAudioUplinkStream;
 class CVoIPAudioUplinkStreamImpl;
 
-
 /**
  *  MVoIPUplinkObserver class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class MVoIPUplinkObserver
     {
 public:
     static const TUint KOpenComplete = 1;
-    static const TUint KUplinkError  = 2;
+    static const TUint KUplinkError = 2;
     static const TUint KUplinkClosed = 3;
 
 public:
@@ -55,7 +52,7 @@
      * @return void
      */
     virtual void EmptyBuffer(const CVoIPAudioUplinkStream& aSrc,
-                             CVoIPDataBuffer* aBuffer) = 0;
+            CVoIPDataBuffer* aBuffer) = 0;
 
     /**
      * ?description
@@ -66,19 +63,17 @@
      * @param TInt - Status
      * @return void
      */
-    virtual void Event(const CVoIPAudioUplinkStream& aSrc,
-                       TInt aEventType,
-                       TInt aError) = 0;
+    virtual void Event(const CVoIPAudioUplinkStream& aSrc, TInt aEventType,
+            TInt aError) = 0;
     };
 
-
 /**
  *  CVoIPAudioUplinkStream class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPAudioUplinkStream
     {
@@ -147,7 +142,7 @@
      * @return TInt
      */
     IMPORT_C TInt SetFormat(TVoIPCodecFormat aFormat,
-                            CVoIPFormatIntfc*& aIntfc);
+            CVoIPFormatIntfc*& aIntfc);
 
     /**
      * ?description
@@ -219,5 +214,4 @@
 
 #endif //__VOIPUPLINKSTREAM_H
 
-
 // End of file
--- a/mmmw_plat/voip_audio_services_api/inc/voiputilityfactory.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/inc/voiputilityfactory.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,21 +1,20 @@
 /*
-* Copyright (c) 2008 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:  Defines factory object for creating VoIP downlink and uplink
-*                streams as well as DTMF tone player.
-*
-*/
-
+ * Copyright (c) 2008 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:  Defines factory object for creating VoIP downlink and uplink
+ *                streams as well as DTMF tone player.
+ *
+ */
 
 #ifndef __VOIPUTILITYFACTORY_H
 #define __VOIPUTILITYFACTORY_H
@@ -30,14 +29,13 @@
 class CDTMFTonePlayer;
 class CVoIPJitterBufferIntfc;
 
-
 /**
  *  CVoIPUtilityFactory class
  *
  *  ?more_complete_description
  *
  *  @lib VoIPAudioIntfc.dll
- *  @since S60 v5.0
+ *
  */
 class CVoIPUtilityFactory
     {
@@ -45,7 +43,7 @@
     /**
      *  TVoIPCallType
      *  ?description
-     *  @since S60 v5.0
+ *
      */
     enum TVoIPCallType
         {
@@ -83,8 +81,7 @@
      * @return TInt
      */
     IMPORT_C TInt CreateDownlinkStream(const TVersion aVersion,
-                                       const TVoIPCallType aCallType,
-                                       CVoIPAudioDownlinkStream*& aDnLink);
+            const TVoIPCallType aCallType, CVoIPAudioDownlinkStream*& aDnLink);
 
     /**
      * ?description
@@ -96,8 +93,8 @@
      * @return TInt
      */
     IMPORT_C TInt CreateDownlinkStream(const TVersion aVersion,
-                                       CVoIPJitterBufferIntfc*& aJBIntfc,
-                                       CVoIPAudioDownlinkStream*& aDnLink);
+            CVoIPJitterBufferIntfc*& aJBIntfc,
+            CVoIPAudioDownlinkStream*& aDnLink);
 
     /**
      * ?description
@@ -109,8 +106,7 @@
      * @return TInt
      */
     IMPORT_C TInt CreateUplinkStream(const TVersion aVersion,
-                                     const TVoIPCallType aCallType,
-                                     CVoIPAudioUplinkStream*& aUpLink);
+            const TVoIPCallType aCallType, CVoIPAudioUplinkStream*& aUpLink);
 
     /**
      * ?description
@@ -132,8 +128,8 @@
      * @return TInt
      */
     IMPORT_C TInt CreateBuffer(CVoIPDataBuffer*& aBuffer,
-		           			   const CVoIPDataBuffer::TVoIPBufferType aType,
-        		   			   const TVoIPCodecFormat aCodecFormat = EG711);
+            const CVoIPDataBuffer::TVoIPBufferType aType,
+            const TVoIPCodecFormat aCodecFormat = EG711);
 
     /**
      * ?description
@@ -143,7 +139,7 @@
      * @return TInt -
      */
     IMPORT_C TInt GetSupportedDownlinkFormats(
-                  RArray<TVoIPCodecFormat>& aFormats);
+            RArray<TVoIPCodecFormat>& aFormats);
 
     /**
      * ?description
@@ -153,7 +149,7 @@
      * @return TInt -
      */
     IMPORT_C TInt GetSupportedUplinkFormats(
-                  RArray<TVoIPCodecFormat>& aFormats);
+            RArray<TVoIPCodecFormat>& aFormats);
 
 private:
 
--- a/mmmw_plat/voip_audio_services_api/tsrc/Group/bld.inf	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/Group/bld.inf	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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: voip audio service -  .
-*
-*/
-
+ * 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: Voip Audio Service - STIF
+ *
+ */
 
 PRJ_PLATFORMS
 // Specify the platforms your component needs to be built for here.
Binary file mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_wClose.SIS has changed
Binary file mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_woClose.SIS has changed
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.pkg	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-;
-; 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: voip audio service - Test App
-;
-
-;languages
-&EN
-
-;Header
-#{"VoIPAudioServicesTestClass"},(0x10005942),1,0,0
-
-;Localised Vendor name
-%{"VoIPAudioServicesTestClass"}
-
-;Unique Vendor name
-:"Vendor"
-
-;Files to install
-
-"\epoc32\release\armv5\urel\VoIPAudioServicesTestClass.dll"-"c:\Sys\Bin\VoIPAudioServicesTestClass.dll"
-"..\..\init\TestFramework.ini"-"c:\Testframework\TestFramework.ini"
-"..\..\conf\VoIPAudioServicesTestClass.cfg"-"c:\Testframework\VoIPAudioServicesTestClass.cfg"
-
-
-"..\..\data\mmc\alarm 1.aac"-"e:\testing\data\alarm 1.aac"
-"..\..\data\mmc\alarm.aac"-"e:\testing\data\alarm.aac"
-"..\..\data\mmc\test_8khz.wav"-"e:\testing\data\test_8khz.wav"
\ No newline at end of file
Binary file mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sis has changed
Binary file mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sisx has changed
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd-key.pem	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd.cer	Mon Mar 08 21:44:05 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
--- a/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/inc/VoIPAudioServicesTestClass.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/inc/VoIPAudioServicesTestClass.h	Sun Mar 14 13:11:51 2010 +0000
@@ -106,9 +106,9 @@
 _LIT16(KTestFile3, "\\testing\\data\\test_8khz.wav");
 #else
 _LIT( KVoIPAudioServicesTestClassLogPath, "e:\\testing\\Log\\" );
-_LIT16(KTestFile1, "e:\\testing\\data\\alarm 1.aac");
-_LIT16(KTestFile2, "e:\\testing\\data\\alarm.aac");
-_LIT16(KTestFile3, "e:\\testing\\data\\test_8khz.wav");
+_LIT16(KTestFile1, "c:\\testing\\data\\alarm 1.aac");
+_LIT16(KTestFile2, "c:\\testing\\data\\alarm.aac");
+_LIT16(KTestFile3, "c:\\testing\\data\\test_8khz.wav");
 #endif
 
 // Log file
Binary file mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/sis/RD.crt has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/sis/RD.key	Sun Mar 14 13:11:51 2010 +0000
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
+uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
+vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
+AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
+REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
+/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
+s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
+sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
+pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
+VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
+P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
+1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
+1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
+-----END RSA PRIVATE KEY-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/sis/VoIPAudioServicesTestClass.pkg	Sun Mar 14 13:11:51 2010 +0000
@@ -0,0 +1,37 @@
+;
+; 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: VoIP Audio Service - STIF Test
+;
+
+;languages
+&EN
+
+;Header
+#{"VoIPAudioServicesTestClass"},(0x10005942),1,0,0
+
+;Localised Vendor name
+%{"VoIPAudioServicesTestClass"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+
+"/epoc32/release/armv5/urel/VoIPAudioServicesTestClass.dll"-"c:/Sys/Bin/VoIPAudioServicesTestClass.dll"
+;"../../init/TestFramework.ini"-"c:/Testframework/TestFramework.ini"
+"../../conf/VoIPAudioServicesTestClass.cfg"-"c:/Testframework/VoIPAudioServicesTestClass.cfg"
+
+;"../../data/mmc/alarm 1.aac"-"e:/testing/data/alarm 1.aac"
+;"../../data/mmc/alarm.aac"-"e:/testing/data/alarm.aac"
+"../../data/mmc/test_8khz.wav"-"c:/testing/data/test_8khz.wav"
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/sis/create_sis.bat	Sun Mar 14 13:11:51 2010 +0000
@@ -0,0 +1,3 @@
+del VoIPAudioServicesTestClass.sis*
+makesis VoIPAudioServicesTestClass.pkg VoIPAudioServicesTestClass.sis
+signsis VoIPAudioServicesTestClass.sis VoIPAudioServicesTestClass.sisx rd.crt rd.key
--- a/mmmw_plat/voip_audio_services_api/tsrc/init/TestFramework.ini	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/init/TestFramework.ini	Sun Mar 14 13:11:51 2010 +0000
@@ -1,5 +1,5 @@
 #
-# This is STIFTestFramework initialization file
+# This is STIF initialization file
 # Comment lines start with '#'-character.
 # See STIF TestFramework users guide.doc for instructions
 
@@ -22,6 +22,8 @@
 # 	- File format indicates the type of the test report.
 #		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
 #		+ HTML, Test report will be html type, for example 'TestReport.html'.
+#   + XML, Test report will be xml type, for example 'TestReport.xml'.
+#          Note, that xml format is available only when output is set to FILE.
 #
 # 	- File output indicates output source of the test report.
 #		+ FILE, Test report logging to file.
@@ -41,25 +43,25 @@
 
 [Engine_Defaults]
 
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
+TestReportMode= FullReport    # Possible values are: 'Empty', 'Summary', 'Environment',
+                              #                      'TestCases' or 'FullReport'
 
-CreateTestReport= YES			# Possible values: YES or NO
+CreateTestReport= YES         # Possible values: YES or NO
 
-TestReportFilePath= c:\LOGS\TestFramework\
-TestReportFileName= TestReport_VoIPAudioServicesTestClass
+TestReportFilePath= C:\LOGS\TestFramework\
+TestReportFileName= TestReport
 
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
+TestReportFormat= TXT         # Possible values: TXT, HTML or XML
+TestReportOutput= FILE        # Possible values: FILE or RDEBUG
+TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
 
 DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
 
-DisableMeasurement= stifmeasurementdisablenone	# Possible values are:
-						# 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
-					  	# 'stifmeasurementplugin01', 'stifmeasurementplugin02',
-					  	# 'stifmeasurementplugin03', 'stifmeasurementplugin04',
-					  	# 'stifmeasurementplugin05' or 'stifbappeaprofiler'
+DisableMeasurement= stifmeasurementdisablenone  # Possible values are:
+              # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
+              # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
+              # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
+              # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
 
 [End_Defaults]
 # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -86,12 +88,9 @@
 # In the simplest case it is enough to specify only the
 # name of the test module when adding new test module
 
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
 [New_Module]
 ModuleName= TestScripter
+IniFile= c:\TestFramework\VoIPAudioServicesTestClass.ini
 TestCaseFile= c:\testframework\VoIPAudioServicesTestClass.cfg
 [End_Module]
 
@@ -114,7 +113,7 @@
 
 
 # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
+# Set STIF logging overwrite parameters for Logger.
 # 	Hardware and emulator environment logging path and styles can
 # 	be configured from here to overwrite the Logger's implemented values.
 #	
@@ -174,24 +173,24 @@
 #NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
 #NOTE: TestEngine and TestServer logging settings cannot change here
 
-#CreateLogDirectories= YES		# Possible values: YES or NO
+#CreateLogDirectories= YES    # Possible values: YES or NO
 
 #EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
+#EmulatorFormat= HTML         # Possible values: TXT or HTML
+#EmulatorOutput= FILE         # Possible values: FILE or RDEBUG
 
 #HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
+#HardwareFormat= HTML         # Possible values: TXT or HTML
+#HardwareOutput= FILE         # Possible values: FILE or RDEBUG
 
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
+#FileCreationMode= OVERWRITE  # Possible values: OVERWRITE or APPEND
 
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
+#ThreadIdToLogFile= YES       # Possible values: YES or NO
+#WithTimeStamp= YES           # Possible values: YES or NO
+#WithLineBreak= YES           # Possible values: YES or NO
+#WithEventRanking= YES        # Possible values: YES or NO
 
-#FileUnicode= YES			# Possible values: YES or NO
+#FileUnicode= YES             # Possible values: YES or NO
 
 [End_Logger_Defaults]
 # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
--- a/mmmw_plat/voip_audio_services_api/tsrc/init/VoIPAudioServicesTestClass.ini	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmmw_plat/voip_audio_services_api/tsrc/init/VoIPAudioServicesTestClass.ini	Sun Mar 14 13:11:51 2010 +0000
@@ -1,4 +1,4 @@
 [general]
 logFileName VoIPAudioServicesTestClass.log
-logPath e:\testing\Log\
+logPath C:\Log\
 [general_end]
--- a/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/audioeffectsui/equalizer/src/EqualizerPresetsDialog.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -1018,6 +1018,13 @@
                 }
             return EKeyWasConsumed;
             }
+        else if ( aKeyEvent.iCode == EKeyEnter )
+            {
+            const TInt index = iListBox->CurrentItemIndex();
+            TPresetName preset = GetHighlightedPresetInListBox();
+            ActivateEqrPresetL(index, preset);
+            return EKeyWasConsumed;
+            }
         }
     return CAknDialog::OfferKeyEventL( aKeyEvent, aType ); 
     }
--- a/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/radioutility/radioserver/Server/Src/RadioServer.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -1901,6 +1901,7 @@
             {
             // Client has requested stop only if the requesting client is the only primary client.
             // There are other clients, so don't stop the audio in this case.
+            CompleteAsyncRequest(KErrNone);         //the request needs to be completed though 
             return;
             }
         iState = EStateTunerOn;
--- a/mmserv/tms/inc/tmscallserverstartparam.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/inc/tmscallserverstartparam.h	Sun Mar 14 13:11:51 2010 +0000
@@ -18,13 +18,14 @@
 #ifndef TMSCALLSERVERSTARTPARAM_H
 #define TMSCALLSERVERSTARTPARAM_H
 
+#include <glib.h>
 #include <e32std.h>
 
 namespace TMS {
 
-const TInt KTMSCallServerStackSize = 0x5000; //  20 KB
-const TInt KTMSCallServerInitHeapSize = 0x500000; // 5.2 MB
-const TInt KTMSCallServerMaxHeapSize = 0x1800000; //  25 MB
+const gint KTMSCallServerStackSize = 0x5000; //  20 KB
+const gint KTMSCallServerInitHeapSize = 0x500000; // 5.2 MB
+const gint KTMSCallServerMaxHeapSize = 0x1800000; //  25 MB
 
 // FORWARD DECLARATIONS
 class TMSServer;
--- a/mmserv/tms/inc/tmsproxy.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/inc/tmsproxy.h	Sun Mar 14 13:11:51 2010 +0000
@@ -118,7 +118,7 @@
 
     // Message queue and the handler
     RMsgQueue<TmsMsgBuf> iMsgQueue;
-    CQueueHandler* iMsgQHandler;
+    TMSQueueHandler* iMsgQHandler;
     };
 
 } //namespace TMS
--- a/mmserv/tms/inc/tmsqueuehandler.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/inc/tmsqueuehandler.h	Sun Mar 14 13:11:51 2010 +0000
@@ -37,13 +37,13 @@
 class MQueueHandlerObserver
     {
 public:
-    virtual void QueueEvent(TInt aEventType, TInt aError, void* user_data) = 0;
+    virtual void QueueEvent(gint aEventType, gint aError, void* user_data) = 0;
     };
 
 /**
- *  CQueueHandler class
+ *  TMSQueueHandler class
  */
-NONSHARABLE_CLASS(CQueueHandler) : public CActive
+NONSHARABLE_CLASS(TMSQueueHandler) : public CActive
     {
 public:
 
@@ -52,13 +52,13 @@
      * Contructor
      *
      */
-    static CQueueHandler* NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+    static TMSQueueHandler* NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
             TMSGlobalContext* glblCtx);
 
     /**
      * destructor
      */
-    virtual ~CQueueHandler();
+    virtual ~TMSQueueHandler();
 
     /**
      * Start
@@ -72,15 +72,15 @@
      */
     TRequestStatus* Status();
 
-    TInt AddObserver(MQueueHandlerObserver& obsvr, TInt aClientId);
-    TInt RemoveObserver(MQueueHandlerObserver& obsvr);
+    gint AddObserver(MQueueHandlerObserver& obsvr, gint aClientId);
+    gint RemoveObserver(MQueueHandlerObserver& obsvr);
 
 private:
 
     /**
      * constructor
      */
-    CQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+    TMSQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
             TMSGlobalContext* glblCtx);
 
     void ConstructL();
@@ -89,19 +89,20 @@
     void DoCancel();
     void RunL();
     TInt RunError(TInt aError);
-    void DoFillBuffer(TInt aBufLen, TInt aStatus, TBool flag, TUint32 key);
-    void DoEmptyBuffer(TInt aBufLen, TInt aStatus, TBool flag, TUint32 key);
-    TInt FindStreamInList();
-    TInt FindGainEffectInList();
-    TInt FindVolEffectInList();
-    TMSStreamState ConvertToStreamState(TInt request);
+
+    void DoFillBuffer(gint aBufLen, gint aStatus, gboolean flag, guint32 key);
+    void DoEmptyBuffer(gint aBufLen, gint aStatus, gboolean flag, guint32 key);
+    gint FindStreamInList();
+    gint FindGainEffectInList();
+    gint FindVolEffectInList();
+    TMSStreamState ConvertToStreamState(gint request);
 
 private:
     // data
 
     RPointerArray<MQueueHandlerObserver> iObserversList; // (not owned)
     MQueueHandlerObserver* iObserver; //not owned
-    RArray<TInt> iClientList;
+    RArray<gint> iClientList;
     RMsgQueue<TmsMsgBuf>* iMsgQueue;
 
     RChunk iChunk;
--- a/mmserv/tms/inc/tmsshared.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/inc/tmsshared.h	Sun Mar 14 13:11:51 2010 +0000
@@ -27,19 +27,19 @@
 namespace TMS {
 
 // CONSTANTS
-const TUint KQueueCreateWaitTime = 10; //10ms
+const guint KQueueCreateWaitTime = 10; //10ms
 
-const TUint KTMSG711FrameLen10ms = 82; //10ms ->  80 + 2 for header
-const TUint KTMSG711FrameLen20ms = 162; //20ms -> 160 + 2 for header
+const guint KTMSG711FrameLen10ms = 82;  //10ms ->  80 + 2 for header
+const guint KTMSG711FrameLen20ms = 162; //20ms -> 160 + 2 for header
 
-const TInt KTMSAMRNBFrameLen   = 14; //frame-mode OFF
-const TInt KTMSAMRNBFrameLenFM = 32; //frame-mode ON
+const gint KTMSAMRNBFrameLen   = 14; //frame-mode OFF
+const gint KTMSAMRNBFrameLenFM = 32; //frame-mode ON
 
-const TInt KTMSILBCFrameLen20ms = 40; //20ms
-const TInt KTMSILBCFrameLen30ms = 52; //30ms
+const gint KTMSILBCFrameLen20ms = 40; //20ms
+const gint KTMSILBCFrameLen30ms = 52; //30ms
 
-const TInt KTMSG729FrameLen   = 24; //10 octets + 2 for header
-const TUint KTMSPCM16FrameLen = 4096;
+const gint KTMSG729FrameLen   = 24; //10 octets + 2 for header
+const guint KTMSPCM16FrameLen = 4096;
 
 // ENUMERATIONS
 
@@ -150,7 +150,7 @@
     gboolean iFrameMode;
     gboolean iFrameModeReqForEC;
     guint iBitrate;
-    RArray<TUint> iArrBitrates;
+    RArray<guint> iArrBitrates;
     };
 
 // -----------------------------------------------------------------------------
Binary file mmserv/tms/sis/10207C80.cre has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmserv/tms/sis/tms_cenrep.pkg	Sun Mar 14 13:11:51 2010 +0000
@@ -0,0 +1,29 @@
+;
+; 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:	Package file for Project TMS Cenrep.
+;
+; Languages
+&EN
+
+; Header
+#{ "TMS CenRep INI file"}, (0x10202BE9), 1, 0, 0, TYPE=SP
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Vendor"
+
+; CenRep ini file
+"10207c80.cre" - "$:\private\10202be9\10207c80.cre"
--- a/mmserv/tms/tmscallserver/eabi/tmscallserver.def	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/eabi/tmscallserver.def	Sun Mar 14 13:11:51 2010 +0000
@@ -1,23 +1,23 @@
 EXPORTS
 	_ZN3TMS13TMSCallServer11StartThreadEPv @ 1 NONAME
-	_ZTIN3TMS10CallCSAdptE @ 2 NONAME
-	_ZTIN3TMS10CallIPAdptE @ 3 NONAME
-	_ZTIN3TMS11TarSettingsE @ 4 NONAME
-	_ZTIN3TMS13TMSCallServerE @ 5 NONAME
-	_ZTIN3TMS13TMSVoIPUplinkE @ 6 NONAME
-	_ZTIN3TMS14TMSCallSessionE @ 7 NONAME
-	_ZTIN3TMS15TMSVoIPDownlinkE @ 8 NONAME
-	_ZTIN3TMS16IPCallStreamBaseE @ 9 NONAME
+	_ZTIN3TMS11TMSCallAdptE @ 2 NONAME
+	_ZTIN3TMS11TMSIPUplinkE @ 3 NONAME
+	_ZTIN3TMS13TMSCallCSAdptE @ 4 NONAME
+	_ZTIN3TMS13TMSCallIPAdptE @ 5 NONAME
+	_ZTIN3TMS13TMSCallServerE @ 6 NONAME
+	_ZTIN3TMS13TMSIPDownlinkE @ 7 NONAME
+	_ZTIN3TMS14TMSCallSessionE @ 8 NONAME
+	_ZTIN3TMS14TMSTarSettingsE @ 9 NONAME
 	_ZTIN3TMS17TMSCallDelayTimerE @ 10 NONAME
-	_ZTIN3TMS8CallAdptE @ 11 NONAME
-	_ZTVN3TMS10CallCSAdptE @ 12 NONAME
-	_ZTVN3TMS10CallIPAdptE @ 13 NONAME
-	_ZTVN3TMS11TarSettingsE @ 14 NONAME
-	_ZTVN3TMS13TMSCallServerE @ 15 NONAME
-	_ZTVN3TMS13TMSVoIPUplinkE @ 16 NONAME
-	_ZTVN3TMS14TMSCallSessionE @ 17 NONAME
-	_ZTVN3TMS15TMSVoIPDownlinkE @ 18 NONAME
-	_ZTVN3TMS16IPCallStreamBaseE @ 19 NONAME
+	_ZTIN3TMS19TMSIPCallStreamBaseE @ 11 NONAME
+	_ZTVN3TMS11TMSCallAdptE @ 12 NONAME
+	_ZTVN3TMS11TMSIPUplinkE @ 13 NONAME
+	_ZTVN3TMS13TMSCallCSAdptE @ 14 NONAME
+	_ZTVN3TMS13TMSCallIPAdptE @ 15 NONAME
+	_ZTVN3TMS13TMSCallServerE @ 16 NONAME
+	_ZTVN3TMS13TMSIPDownlinkE @ 17 NONAME
+	_ZTVN3TMS14TMSCallSessionE @ 18 NONAME
+	_ZTVN3TMS14TMSTarSettingsE @ 19 NONAME
 	_ZTVN3TMS17TMSCallDelayTimerE @ 20 NONAME
-	_ZTVN3TMS8CallAdptE @ 21 NONAME
+	_ZTVN3TMS19TMSIPCallStreamBaseE @ 21 NONAME
 
--- a/mmserv/tms/tmscallserver/inc/calladpt.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/calladpt.h	Sun Mar 14 13:11:51 2010 +0000
@@ -23,12 +23,12 @@
 
 namespace TMS {
 
-// CallAdpt class
-class CallAdpt
+// TMSCallAdpt class
+class TMSCallAdpt
     {
 public:
-    static gint CreateCallL(gint callType, CallAdpt*& callAdpt);
-    virtual ~CallAdpt();
+    static gint CreateCallL(gint callType, TMSCallAdpt*& callAdpt);
+    virtual ~TMSCallAdpt();
     virtual gint CreateStream(TMSCallType callType,
             TMSStreamType strmType, gint& outStrmId) = 0;
     virtual gint InitStreamL(TMSCallType callType,
@@ -86,7 +86,7 @@
             CBufFlat*& outputsbuffer) = 0;
 
 protected:
-    CallAdpt();
+    TMSCallAdpt();
     virtual gint PostConstruct();
 
 protected:
--- a/mmserv/tms/tmscallserver/inc/callcsadpt.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/callcsadpt.h	Sun Mar 14 13:11:51 2010 +0000
@@ -28,21 +28,20 @@
 namespace TMS {
 
 // FORWARD DECLARATIONS
-class CSUplink;
-class CSDownlink;
-class TarSettings;
+class TMSCSUplink;
+class TMSCSDownlink;
+class TMSTarSettings;
 
 /*
  * CallCSAdapt class
  */
-class CallCSAdpt : public CBase,
-                   public CallAdpt,
-                   public MCSPDevSoundObserver,
-                   public MTelephonyAudioRoutingObserver
+class TMSCallCSAdpt : public TMSCallAdpt,
+                      public TMSCSPDevSoundObserver,
+                      public MTelephonyAudioRoutingObserver
     {
 public:
-    CallCSAdpt();
-    virtual ~CallCSAdpt();
+    TMSCallCSAdpt();
+    virtual ~TMSCallCSAdpt();
     virtual gint PostConstruct();
 
     virtual gint CreateStream(TMSCallType callType, TMSStreamType strmType,
@@ -102,7 +101,7 @@
     void NotifyClient(const gint strmId, const gint aCommand,
             const gint aStatus = KErrNone, const gint64 aInt64 = TInt64(0));
 
-    //From MCSPDevSoundObserver
+    //From TMSCSPDevSoundObserver
     void DownlinkInitCompleted(TInt status);
     void UplinkInitCompleted(TInt status);
     void UplinkActivatedSuccessfully();
@@ -121,10 +120,10 @@
 private:
     gint iNextStreamId;
 
-    CSUplink* iCSUplink;
-    CSDownlink* iCSDownlink;
+    TMSCSUplink* iCSUplink;
+    TMSCSDownlink* iCSDownlink;
     CTelephonyAudioRouting* iRouting;
-    TarSettings* iTarSettings;
+    TMSTarSettings* iTarSettings;
     TMSStreamType iStrmtype;
 
     RMsgQueue<TmsMsgBuf> iMsgQueueUp;
--- a/mmserv/tms/tmscallserver/inc/callipadpt.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/callipadpt.h	Sun Mar 14 13:11:51 2010 +0000
@@ -28,17 +28,17 @@
 namespace TMS {
 
 // FORWARD DECLARATIONS
-class TMSVoIPDownlink;
-class TMSVoIPUplink;
+class TMSIPDownlink;
+class TMSIPUplink;
 
-// CallIPAdpt class
-class CallIPAdpt : public CallAdpt
+// TMSCallIPAdpt class
+class TMSCallIPAdpt : public TMSCallAdpt
     {
 public:
     // Constractor
-    static CallIPAdpt* NewL();
+    static TMSCallIPAdpt* NewL();
 
-    virtual ~CallIPAdpt();
+    virtual ~TMSCallIPAdpt();
     virtual gint PostConstruct();
 
     virtual gint CreateStream(TMSCallType callType, TMSStreamType strmType,
@@ -117,7 +117,7 @@
 
 private:
     void ConstructL();
-    CallIPAdpt();
+    TMSCallIPAdpt();
 
     void NotifyClient(const gint strmId, const TInt aCommand,
             const TInt aStatus = KErrNone, const TInt64 aInt64 = TInt64(0));
@@ -131,8 +131,8 @@
     gboolean iDnlinkInitialized;
     gint iDnlinkStreamId;
 
-    TMSVoIPDownlink* iVoIPDownlink;
-    TMSVoIPUplink* iVoIPUplink;
+    TMSIPDownlink* iIPDownlink;
+    TMSIPUplink* iIPUplink;
 
     // Message queues for communication and data transfer back to the client
     RMsgQueue<TmsMsgBuf> iMsgQueueUp;
--- a/mmserv/tms/tmscallserver/inc/csdownlink.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/csdownlink.h	Sun Mar 14 13:11:51 2010 +0000
@@ -24,19 +24,19 @@
 namespace TMS {
 
 //
-class MCSPDevSoundObserver;
+class TMSCSPDevSoundObserver;
 
 /**
  *  Provides Downlink functionality.
  *
  */
-NONSHARABLE_CLASS(CSDownlink) : public CSPDevSound
+NONSHARABLE_CLASS(TMSCSDownlink) : public TMSCSPDevSound
     {
 public:
 
-    static CSDownlink* NewL(MCSPDevSoundObserver& aObserver);
+    static TMSCSDownlink* NewL(TMSCSPDevSoundObserver& aObserver);
 
-    virtual ~CSDownlink();
+    virtual ~TMSCSDownlink();
 
     /**
      * Sets volume.
@@ -82,7 +82,7 @@
 
 protected:
 
-    CSDownlink(MCSPDevSoundObserver& aObserver);
+    TMSCSDownlink(TMSCSPDevSoundObserver& aObserver);
 
     void ConstructL();
     };
--- a/mmserv/tms/tmscallserver/inc/cspdevsound.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/cspdevsound.h	Sun Mar 14 13:11:51 2010 +0000
@@ -22,24 +22,24 @@
 
 namespace TMS {
 
-class MCSPDevSoundObserver;
+class TMSCSPDevSoundObserver;
 
 /**
  *  Wrapper for CMMFDevSound
  *
  */
-NONSHARABLE_CLASS(CSPDevSound) : public CBase,
-                                 public MDevSoundObserver
+NONSHARABLE_CLASS(TMSCSPDevSound) : public CBase,
+                                    public MDevSoundObserver
     {
 public:
 
     /**
      * Destructor.
      */
-    virtual ~CSPDevSound();
+    virtual ~TMSCSPDevSound();
 
     /**
-     * Activates the dev sound stream. MCSPDevSoundObserver methods are called
+     * Activates the dev sound stream. TMSCSPDevSoundObserver methods are called
      * when activation goes ok or fails. If the stream is already active or
      * activating then nothing is done.
      */
@@ -118,7 +118,7 @@
 
 protected:
 
-    CSPDevSound(MCSPDevSoundObserver& aObserver);
+    TMSCSPDevSound(TMSCSPDevSoundObserver& aObserver);
 
     void ConstructL(TMMFState aMode, gint aAudioPreference,
             gint aAudioPriority);
@@ -155,7 +155,7 @@
      * Observer for successfull activation.
      * Not own.
      */
-    MCSPDevSoundObserver& iObserver;
+    TMSCSPDevSoundObserver& iObserver;
 
     };
 
--- a/mmserv/tms/tmscallserver/inc/csuplink.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/csuplink.h	Sun Mar 14 13:11:51 2010 +0000
@@ -27,13 +27,13 @@
  *  Provides uplink functionality.
  *
  */
-NONSHARABLE_CLASS(CSUplink) : public CSPDevSound
+NONSHARABLE_CLASS(TMSCSUplink) : public TMSCSPDevSound
     {
 public:
 
-    static CSUplink* NewL(MCSPDevSoundObserver& aObserver);
+    static TMSCSUplink* NewL(TMSCSPDevSoundObserver& aObserver);
 
-    virtual ~CSUplink();
+    virtual ~TMSCSUplink();
 
     /**
      * Determines mic mute state.
@@ -95,7 +95,7 @@
 
 protected:
 
-    CSUplink(MCSPDevSoundObserver& aObserver);
+    TMSCSUplink(TMSCSPDevSoundObserver& aObserver);
     void ConstructL();
     };
 
--- a/mmserv/tms/tmscallserver/inc/ipcallstream.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/ipcallstream.h	Sun Mar 14 13:11:51 2010 +0000
@@ -39,8 +39,8 @@
 #include "gstg729decoderinterface.h"
 #else //__USE_GSTREAMER__
 #include <sounddevice.h>
-#include <VoIPDownlinkStream.h>
-#include <VoIPUplinkStream.h>
+#include <voipdownlinkstream.h>
+#include <voipuplinkstream.h>
 
 // FORWARD DECLARATIONS
 class CAudioOutput;
@@ -57,13 +57,13 @@
 namespace TMS {
 
 // -----------------------------------------------------------------------------
-//  Class Name:  IPCallStreamBase
+//  Class Name:  TMSIPCallStreamBase
 //
 //  Base abstract class for creating VoIP uplink and downlink streams.
 // -----------------------------------------------------------------------------
-class IPCallStreamBase : public CBase
+class TMSIPCallStreamBase : public CBase
 #ifndef __USE_GSTREAMER__
-                       , public MDevSoundObserver
+                          , public MDevSoundObserver
 #endif //__USE_GSTREAMER__
     {
 public:
@@ -76,7 +76,7 @@
         };
 
 public:
-    virtual ~IPCallStreamBase();
+    virtual ~TMSIPCallStreamBase();
 
     virtual void Start() = 0;
     virtual void Stop() = 0;
@@ -132,22 +132,22 @@
     };
 
 // -----------------------------------------------------------------------------
-//  Class Name:  TMSVoIPDownlink
+//  Class Name:  TMSIPDownlink
 //
 //  Class handling VoIP downlink stream object.
 // -----------------------------------------------------------------------------
-class TMSVoIPDownlink : public IPCallStreamBase
+class TMSIPDownlink : public TMSIPCallStreamBase
     {
 public:
-    virtual ~TMSVoIPDownlink();
+    virtual ~TMSIPDownlink();
 
 #ifdef __USE_GSTREAMER__
     static void cb_raw_playback_handoff(GstElement* appsrc, guint size);
     static gboolean bus_call(GstBus* bus, GstMessage* msg, gpointer data);
 #endif //__USE_GSTREAMER__
-    static TMSVoIPDownlink* NewL(const guint32 codecID,
+    static TMSIPDownlink* NewL(const guint32 codecID,
             const TMMFPrioritySettings priority);
-    TMSVoIPDownlink();
+    TMSIPDownlink();
     void ConstructL(const guint32 codecID,
             const TMMFPrioritySettings priority);
 
@@ -229,22 +229,22 @@
     };
 
 // -----------------------------------------------------------------------------
-//  Class Name:  TMSVoIPUplink
+//  Class Name:  TMSIPUplink
 //
 //  Class handling VoIP uplink stream.
 // -----------------------------------------------------------------------------
-class TMSVoIPUplink : public IPCallStreamBase
+class TMSIPUplink : public TMSIPCallStreamBase
     {
 public:
-    virtual ~TMSVoIPUplink();
+    virtual ~TMSIPUplink();
 
 #ifdef __USE_GSTREAMER__
     static void cb_record_raw_handoff(GstElement *sink);
     static gboolean bus_call(GstBus* bus, GstMessage* msg, gpointer data);
 #endif //__USE_GSTREAMER__
-    static TMSVoIPUplink* NewL(const guint32 codecID,
+    static TMSIPUplink* NewL(const guint32 codecID,
             const TMMFPrioritySettings priority);
-    TMSVoIPUplink();
+    TMSIPUplink();
     void ConstructL(const guint32 codecID,
             const TMMFPrioritySettings priority);
 
--- a/mmserv/tms/tmscallserver/inc/mcspdevsoundobserver.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/mcspdevsoundobserver.h	Sun Mar 14 13:11:51 2010 +0000
@@ -25,7 +25,7 @@
  *  successfully ramped up.
  *
  */
-class MCSPDevSoundObserver
+class TMSCSPDevSoundObserver
     {
 public:
     virtual void DownlinkInitCompleted(TInt x) = 0;
--- a/mmserv/tms/tmscallserver/inc/tarsettings.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/tarsettings.h	Sun Mar 14 13:11:51 2010 +0000
@@ -27,7 +27,7 @@
 namespace TMS {
 
 // CLASS DECLARATION
-class TarSettings : public CBase
+class TMSTarSettings
     {
 public:
     // Constructors and destructor
@@ -35,12 +35,12 @@
     /**
      * Two-phased constructor.
      */
-    static TarSettings* NewL();
+    static TMSTarSettings* NewL();
 
     /**
      * Destructor.
      */
-    virtual ~TarSettings();
+    virtual ~TMSTarSettings();
 
 public:
     // New functions
@@ -52,7 +52,7 @@
     /**
      * C++ default constructor.
      */
-    TarSettings();
+    TMSTarSettings();
 
     /**
      * By default Symbian 2nd phase constructor is private.
@@ -60,7 +60,7 @@
     void ConstructL();
 
 private:
-    TInt iVolume; //Volume
+    gint iVolume; //Volume
     };
 
 } //namespace TMS
--- a/mmserv/tms/tmscallserver/inc/tmscallsession.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/inc/tmscallsession.h	Sun Mar 14 13:11:51 2010 +0000
@@ -26,7 +26,7 @@
 
 // FORWARD DECLARATIONS
 class TMSCallServer;
-class CallAdpt;
+class TMSCallAdpt;
 
 /*
  * Class Name:  TMSCallSession
@@ -90,7 +90,7 @@
 
 private:
     TMSCallServer& iTMSCallServer;
-    CallAdpt* iCallAdpt;
+    TMSCallAdpt* iCallAdpt;
     gint iGlobalVol;
     gint iGlobalGain;
     };
--- a/mmserv/tms/tmscallserver/src/calladpt.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/calladpt.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -24,42 +24,42 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// CallAdpt::CallAdpt
+// TMSCallAdpt::TMSCallAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallAdpt::CallAdpt()
+TMSCallAdpt::TMSCallAdpt()
     {
     TRACE_PRN_FN_ENT;
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CallAdpt::~CallAdpt
+// TMSCallAdpt::~TMSCallAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallAdpt::~CallAdpt()
+TMSCallAdpt::~TMSCallAdpt()
     {
     TRACE_PRN_FN_ENT;
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CallAdpt::CreateCallL
+// TMSCallAdpt::CreateCallL
 //
 // -----------------------------------------------------------------------------
 //
-gint CallAdpt::CreateCallL(gint callType, CallAdpt*& callAdpt)
+gint TMSCallAdpt::CreateCallL(gint callType, TMSCallAdpt*& callAdpt)
     {
     TRACE_PRN_FN_ENT;
-    CallAdpt* self(NULL);
+    TMSCallAdpt* self(NULL);
     gint retVal(TMS_RESULT_SUCCESS);
     switch (callType)
         {
         case TMS_CALL_IP:
             retVal = TMS_RESULT_INSUFFICIENT_MEMORY;
-            self = CallIPAdpt::NewL();
+            self = TMSCallIPAdpt::NewL();
             if (self)
                 {
                 retVal = self->PostConstruct();
@@ -73,7 +73,7 @@
 
         case TMS_CALL_CS:
             retVal = TMS_RESULT_INSUFFICIENT_MEMORY;
-            self = new CallCSAdpt();
+            self = new TMSCallCSAdpt();
             if (self)
                 {
                 retVal = self->PostConstruct();
@@ -94,14 +94,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallAdpt::PostConstruct
+// TMSCallAdpt::PostConstruct
 //
 // -----------------------------------------------------------------------------
 //
-gint CallAdpt::PostConstruct()
+gint TMSCallAdpt::PostConstruct()
     {
-    TRACE_PRN_FN_ENT;
-    TRACE_PRN_FN_EXT;
     return TMS_RESULT_SUCCESS;
     }
 
--- a/mmserv/tms/tmscallserver/src/callcsadpt.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/callcsadpt.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -30,11 +30,11 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::CallCSAdpt
+// TMSCallCSAdpt::TMSCallCSAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallCSAdpt::CallCSAdpt()
+TMSCallCSAdpt::TMSCallCSAdpt()
     {
     TRACE_PRN_FN_ENT;
 
@@ -46,11 +46,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::~CallCSAdpt
+// TMSCallCSAdpt::~TMSCallCSAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallCSAdpt::~CallCSAdpt()
+TMSCallCSAdpt::~TMSCallCSAdpt()
     {
     TRACE_PRN_FN_ENT;
     delete iCSDownlink;
@@ -72,11 +72,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::PostConstruct
+// TMSCallCSAdpt::PostConstruct
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::PostConstruct()
+gint TMSCallCSAdpt::PostConstruct()
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
@@ -89,11 +89,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::CreateStream
+// TMSCallCSAdpt::CreateStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::CreateStream(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::CreateStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint& outStrmId)
     {
     TRACE_PRN_FN_ENT;
@@ -133,11 +133,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::InitStream
+// TMSCallCSAdpt::InitStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::InitStreamL(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::InitStreamL(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId, TMSFormatType /*frmtType*/,
         const RMessage2& aMessage)
     {
@@ -157,7 +157,7 @@
                     }
                 if (status == TMS_RESULT_SUCCESS)
                     {
-                    TRAP(status, iCSUplink = CSUplink::NewL(*this));
+                    TRAP(status, iCSUplink = TMSCSUplink::NewL(*this));
                     }
                 iStrmtype = TMS_STREAM_UPLINK;
                 }
@@ -177,14 +177,14 @@
                     }
                 if (status == TMS_RESULT_SUCCESS)
                     {
-                    TRAP(status, iCSDownlink = CSDownlink::NewL(*this));
+                    TRAP(status, iCSDownlink = TMSCSDownlink::NewL(*this));
                     if (status == TMS_RESULT_SUCCESS)
                         {
                         TRAP(status, iRouting =
                              CTelephonyAudioRouting::NewL(*this));
                         if (status == TMS_RESULT_SUCCESS)
                             {
-                            iTarSettings = TarSettings::NewL();
+                            iTarSettings = TMSTarSettings::NewL();
                             }
                         }
                     }
@@ -206,11 +206,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::StartStream
+// TMSCallCSAdpt::StartStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::StartStream(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::StartStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -238,11 +238,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::PauseStream
+// TMSCallCSAdpt::PauseStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::PauseStream(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::PauseStream(TMSCallType /*callType*/,
         TMSStreamType /*strmType*/, gint /*strmId*/)
     {
     TRACE_PRN_FN_ENT;
@@ -252,11 +252,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::StopStream
+// TMSCallCSAdpt::StopStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::StopStream(TMSCallType /*callType*/, TMSStreamType strmType,
+gint TMSCallCSAdpt::StopStream(TMSCallType /*callType*/, TMSStreamType strmType,
         gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -288,11 +288,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DeinitStream
+// TMSCallCSAdpt::DeinitStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::DeinitStream(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::DeinitStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -326,11 +326,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DeleteStream
+// TMSCallCSAdpt::DeleteStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::DeleteStream(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::DeleteStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -360,11 +360,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DataXferBufferEmptied
+// TMSCallCSAdpt::DataXferBufferEmptied
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::DataXferBufferEmptied(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::DataXferBufferEmptied(TMSCallType /*callType*/,
         TMSStreamType /*strmType*/, gint /*strmId*/)
     {
     TRACE_PRN_FN_ENT;
@@ -374,11 +374,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DataXferBufferFilled
+// TMSCallCSAdpt::DataXferBufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::DataXferBufferFilled(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::DataXferBufferFilled(TMSCallType /*callType*/,
         TMSStreamType /*strmType*/, gint /*strmId*/, guint /*datasize*/)
     {
     TRACE_PRN_FN_ENT;
@@ -388,11 +388,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetDataXferBufferHndl
+// TMSCallCSAdpt::GetDataXferBufferHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetDataXferBufferHndl(const TMSCallType /*callType*/,
+gint TMSCallCSAdpt::GetDataXferBufferHndl(const TMSCallType /*callType*/,
         const TMSStreamType /*strmType*/, const gint /*strmId*/,
         const guint32 /*key*/, RChunk& /*chunk*/)
     {
@@ -403,11 +403,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetMaxVolume
+// TMSCallCSAdpt::GetMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetMaxVolume(guint& volume)
+gint TMSCallCSAdpt::GetMaxVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -421,11 +421,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetVolume
+// TMSCallCSAdpt::SetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetVolume(const guint volume)
+gint TMSCallCSAdpt::SetVolume(const guint volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -440,11 +440,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetVolume
+// TMSCallCSAdpt::GetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetVolume(guint& volume)
+gint TMSCallCSAdpt::GetVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -459,11 +459,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetMaxGain
+// TMSCallCSAdpt::GetMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetMaxGain(guint& gain)
+gint TMSCallCSAdpt::GetMaxGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -477,11 +477,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetGain
+// TMSCallCSAdpt::SetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetGain(const guint gain)
+gint TMSCallCSAdpt::SetGain(const guint gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -496,11 +496,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetGain
+// TMSCallCSAdpt::GetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetGain(guint& gain)
+gint TMSCallCSAdpt::GetGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -514,11 +514,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetGlobalMaxVolume
+// TMSCallCSAdpt::GetGlobalMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetGlobalMaxVolume(guint& volume)
+gint TMSCallCSAdpt::GetGlobalMaxVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -532,11 +532,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetGlobalVolume
+// TMSCallCSAdpt::SetGlobalVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetGlobalVolume(const guint volume)
+gint TMSCallCSAdpt::SetGlobalVolume(const guint volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
@@ -552,11 +552,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetGlobalVolume
+// TMSCallCSAdpt::GetGlobalVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetGlobalVolume(guint& volume)
+gint TMSCallCSAdpt::GetGlobalVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -571,11 +571,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetMaxGain
+// TMSCallCSAdpt::GetMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetGlobalMaxGain(guint& gain)
+gint TMSCallCSAdpt::GetGlobalMaxGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -589,11 +589,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetGain
+// TMSCallCSAdpt::SetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetGlobalGain(const guint gain)
+gint TMSCallCSAdpt::SetGlobalGain(const guint gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
@@ -609,11 +609,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetGlobalGain
+// TMSCallCSAdpt::GetGlobalGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetGlobalGain(guint& gain)
+gint TMSCallCSAdpt::GetGlobalGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_ILLEGAL_OPERATION);
@@ -627,11 +627,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetCodecMode
+// TMSCallCSAdpt::GetCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetCodecMode(const TMSFormatType /*fmttype*/,
+gint TMSCallCSAdpt::GetCodecMode(const TMSFormatType /*fmttype*/,
         const TMSStreamType /*strmtype*/, gint& /*mode*/)
     {
     TRACE_PRN_FN_ENT;
@@ -641,11 +641,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetCodecMode
+// TMSCallCSAdpt::SetCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetCodecMode(const TMSFormatType /*fmttype*/,
+gint TMSCallCSAdpt::SetCodecMode(const TMSFormatType /*fmttype*/,
         const TMSStreamType /*strmtype*/, const gint /*mode*/)
     {
     TRACE_PRN_FN_ENT;
@@ -655,11 +655,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetSupportedBitRatesCount
+// TMSCallCSAdpt::GetSupportedBitRatesCount
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetSupportedBitRatesCount(guint& /*count*/)
+gint TMSCallCSAdpt::GetSupportedBitRatesCount(guint& /*count*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -668,11 +668,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetSupportedBitRates
+// TMSCallCSAdpt::GetSupportedBitRates
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetSupportedBitRates(CBufFlat*& brbuffer)
+gint TMSCallCSAdpt::GetSupportedBitRates(CBufFlat*& brbuffer)
     {
     TRACE_PRN_FN_ENT;
     TRAPD(status, GetSupportedBitRatesL(brbuffer));
@@ -681,22 +681,22 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetSupportedBitRatesL
+// TMSCallCSAdpt::GetSupportedBitRatesL
 //
 // GetSupportedBitRates implementation which can leave.
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::GetSupportedBitRatesL(CBufFlat*& /*brbuffer*/)
+void TMSCallCSAdpt::GetSupportedBitRatesL(CBufFlat*& /*brbuffer*/)
     {
     User::Leave(TMS_RESULT_FEATURE_NOT_SUPPORTED);
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetBitRate
+// TMSCallCSAdpt::GetBitRate
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetBitRate(guint& /*bitrate*/)
+gint TMSCallCSAdpt::GetBitRate(guint& /*bitrate*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -705,11 +705,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetBitRate
+// TMSCallCSAdpt::SetBitRate
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetBitRate(const guint /*bitrate*/)
+gint TMSCallCSAdpt::SetBitRate(const guint /*bitrate*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -718,11 +718,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetVAD
+// TMSCallCSAdpt::GetVAD
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetVAD(const TMSFormatType /*fmttype*/, gboolean& /*vad*/)
+gint TMSCallCSAdpt::GetVAD(const TMSFormatType /*fmttype*/, gboolean& /*vad*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -731,11 +731,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetVAD
+// TMSCallCSAdpt::SetVAD
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetVAD(const TMSFormatType /*fmttype*/, const gboolean /*vad*/)
+gint TMSCallCSAdpt::SetVAD(const TMSFormatType /*fmttype*/, const gboolean /*vad*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -744,11 +744,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetCNG
+// TMSCallCSAdpt::GetCNG
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetCNG(const TMSFormatType /*fmttype*/, gboolean& /*cng*/)
+gint TMSCallCSAdpt::GetCNG(const TMSFormatType /*fmttype*/, gboolean& /*cng*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -757,11 +757,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetCNG
+// TMSCallCSAdpt::SetCNG
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetCNG(const TMSFormatType /*fmttype*/, const gboolean /*cng*/)
+gint TMSCallCSAdpt::SetCNG(const TMSFormatType /*fmttype*/,
+        const gboolean /*cng*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -770,11 +771,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetPlc
+// TMSCallCSAdpt::GetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetPlc(const TMSFormatType /*fmttype*/, gboolean& /*plc*/)
+gint TMSCallCSAdpt::GetPlc(const TMSFormatType /*fmttype*/, gboolean& /*plc*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -783,11 +784,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetPlc
+// TMSCallCSAdpt::SetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetPlc(const TMSFormatType /*fmttype*/, const gboolean /*plc*/)
+gint TMSCallCSAdpt::SetPlc(const TMSFormatType /*fmttype*/,
+        const gboolean /*plc*/)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_FEATURE_NOT_SUPPORTED);
@@ -796,11 +798,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetOutput
+// TMSCallCSAdpt::SetOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::SetOutput(TMSAudioOutput output)
+gint TMSCallCSAdpt::SetOutput(TMSAudioOutput output)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
@@ -824,11 +826,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetOutput
+// TMSCallCSAdpt::GetOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetOutput(TMSAudioOutput& output)
+gint TMSCallCSAdpt::GetOutput(TMSAudioOutput& output)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
@@ -846,11 +848,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetPreviousOutput
+// TMSCallCSAdpt::GetPreviousOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetPreviousOutput(TMSAudioOutput& output)
+gint TMSCallCSAdpt::GetPreviousOutput(TMSAudioOutput& output)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
@@ -867,11 +869,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::GetAvailableOutputsL
+// TMSCallCSAdpt::GetAvailableOutputsL
 //
 // -----------------------------------------------------------------------------
 //
-gint CallCSAdpt::GetAvailableOutputsL(gint& count, CBufFlat*& outputsbuffer)
+gint TMSCallCSAdpt::GetAvailableOutputsL(gint& count, CBufFlat*& outputsbuffer)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
@@ -904,14 +906,14 @@
     }
 
 
-// From MCSPDevSoundObserver
+// From TMSCSPDevSoundObserver
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DownlinkInitCompleted
+// TMSCallCSAdpt::DownlinkInitCompleted
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::DownlinkInitCompleted(TInt status)
+void TMSCallCSAdpt::DownlinkInitCompleted(TInt status)
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iDnlinkStreamId, ECmdDownlinkInitComplete, status, 0);
@@ -919,11 +921,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::UplinkInitCompleted
+// TMSCallCSAdpt::UplinkInitCompleted
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::UplinkInitCompleted(TInt status)
+void TMSCallCSAdpt::UplinkInitCompleted(TInt status)
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iUplinkStreamId, ECmdUplinkInitComplete, status, 0);
@@ -931,11 +933,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::UplinkActivatedSuccessfully
+// TMSCallCSAdpt::UplinkActivatedSuccessfully
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::UplinkActivatedSuccessfully()
+void TMSCallCSAdpt::UplinkActivatedSuccessfully()
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iUplinkStreamId, ECmdUplinkStarted, KErrNone, 0);
@@ -943,11 +945,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DownlinkActivatedSuccessfully
+// TMSCallCSAdpt::DownlinkActivatedSuccessfully
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::DownlinkActivatedSuccessfully()
+void TMSCallCSAdpt::DownlinkActivatedSuccessfully()
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iDnlinkStreamId, ECmdDownlinkStarted, KErrNone, 0);
@@ -955,11 +957,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::UplinkActivationFailed
+// TMSCallCSAdpt::UplinkActivationFailed
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::UplinkActivationFailed()
+void TMSCallCSAdpt::UplinkActivationFailed()
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iUplinkStreamId, ECmdUplinkStarted, TMS_RESULT_FATAL_ERROR, 0);
@@ -967,11 +969,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::DownlinkActivationFailed
+// TMSCallCSAdpt::DownlinkActivationFailed
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::DownlinkActivationFailed()
+void TMSCallCSAdpt::DownlinkActivationFailed()
     {
     TRACE_PRN_FN_ENT;
     NotifyClient(iDnlinkStreamId, ECmdDownlinkStarted,
@@ -980,11 +982,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::AvailableOutputsChanged
+// TMSCallCSAdpt::AvailableOutputsChanged
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::AvailableOutputsChanged(
+void TMSCallCSAdpt::AvailableOutputsChanged(
         CTelephonyAudioRouting& /*aTelephonyAudioRouting*/)
     {
     TRACE_PRN_FN_ENT;
@@ -995,11 +997,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::OutputChanged
+// TMSCallCSAdpt::OutputChanged
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::OutputChanged(CTelephonyAudioRouting& aTelephonyAudioRouting)
+void TMSCallCSAdpt::OutputChanged(
+        CTelephonyAudioRouting& aTelephonyAudioRouting)
     {
     TRACE_PRN_FN_ENT;
     TRoutingMsgBufPckg pckg;
@@ -1010,11 +1013,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::SetOutputComplete
+// TMSCallCSAdpt::SetOutputComplete
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::SetOutputComplete(
+void TMSCallCSAdpt::SetOutputComplete(
         CTelephonyAudioRouting& aTelephonyAudioRouting, gint /*aError*/)
     {
     TRACE_PRN_FN_ENT;
@@ -1030,11 +1033,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallCSAdpt::NotifyClient
+// TMSCallCSAdpt::NotifyClient
 //
 // -----------------------------------------------------------------------------
 //
-void CallCSAdpt::NotifyClient(const gint strmId, const gint aCommand,
+void TMSCallCSAdpt::NotifyClient(const gint strmId, const gint aCommand,
         const gint aStatus, const gint64 /*aInt64*/)
     {
     iMsgBuffer.iRequest = aCommand;
--- a/mmserv/tms/tmscallserver/src/callipadpt.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/callipadpt.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -25,13 +25,13 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::NewL
+// TMSCallIPAdpt::NewL
 // Symbian constructor.
 // -----------------------------------------------------------------------------
 //
-CallIPAdpt* CallIPAdpt::NewL()
+TMSCallIPAdpt* TMSCallIPAdpt::NewL()
     {
-    CallIPAdpt* self = new (ELeave) CallIPAdpt();
+    TMSCallIPAdpt* self = new (ELeave) TMSCallIPAdpt();
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -39,33 +39,33 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::ConstructL
+// TMSCallIPAdpt::ConstructL
 // 2-nd phase constructor.
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::ConstructL()
+void TMSCallIPAdpt::ConstructL()
     {
     TRACE_PRN_FN_ENT;
-    iVoIPUplink = NULL;
-    iVoIPDownlink = NULL;
+    iIPUplink = NULL;
+    iIPDownlink = NULL;
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::CallIPAdpt
+// TMSCallIPAdpt::TMSCallIPAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallIPAdpt::CallIPAdpt()
+TMSCallIPAdpt::TMSCallIPAdpt()
     {
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::~CallIPAdpt
+// TMSCallIPAdpt::~TMSCallIPAdpt
 //
 // -----------------------------------------------------------------------------
 //
-CallIPAdpt::~CallIPAdpt()
+TMSCallIPAdpt::~TMSCallIPAdpt()
     {
     TRACE_PRN_FN_ENT;
 
@@ -73,8 +73,8 @@
     iCodecs.Close();
     iArrBitrates.Reset();
 
-    delete iVoIPUplink;
-    delete iVoIPDownlink;
+    delete iIPUplink;
+    delete iIPDownlink;
 
     if (iMsgQueueUp.Handle() > 0)
         {
@@ -89,11 +89,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::PostConstruct
+// TMSCallIPAdpt::PostConstruct
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::PostConstruct()
+gint TMSCallIPAdpt::PostConstruct()
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
@@ -106,11 +106,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::CreateStream
+// TMSCallIPAdpt::CreateStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::CreateStream(TMSCallType /*callType*/,
+gint TMSCallIPAdpt::CreateStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint& outStrmId)
     {
     TRACE_PRN_FN_ENT;
@@ -154,11 +154,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::InitStream
+// TMSCallIPAdpt::InitStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::InitStreamL(TMSCallType /*callType*/,
+gint TMSCallIPAdpt::InitStreamL(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId, TMSFormatType frmtType,
         const RMessage2& aMessage)
     {
@@ -208,12 +208,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::StartStream
+// TMSCallIPAdpt::StartStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::StartStream(TMSCallType /*callType*/, TMSStreamType strmType,
-        gint strmId)
+gint TMSCallIPAdpt::StartStream(TMSCallType /*callType*/,
+        TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
@@ -221,9 +221,9 @@
         {
         case TMS_STREAM_UPLINK:
             {
-            if (strmId == iUplinkStreamId && iVoIPUplink)
+            if (strmId == iUplinkStreamId && iIPUplink)
                 {
-                iVoIPUplink->Start();
+                iIPUplink->Start();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iUplinkStreamId, ECmdUplinkStarted, status);
                 }
@@ -231,9 +231,9 @@
             }
         case TMS_STREAM_DOWNLINK:
             {
-            if (strmId == iDnlinkStreamId && iVoIPDownlink)
+            if (strmId == iDnlinkStreamId && iIPDownlink)
                 {
-                iVoIPDownlink->Start();
+                iIPDownlink->Start();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iDnlinkStreamId, ECmdDownlinkStarted, status);
                 }
@@ -250,12 +250,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::PauseStream
+// TMSCallIPAdpt::PauseStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::PauseStream(TMSCallType /*callType*/, TMSStreamType strmType,
-        gint strmId)
+gint TMSCallIPAdpt::PauseStream(TMSCallType /*callType*/,
+        TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
@@ -263,9 +263,9 @@
         {
         case TMS_STREAM_UPLINK:
             {
-            if (strmId == iUplinkStreamId && iVoIPUplink)
+            if (strmId == iUplinkStreamId && iIPUplink)
                 {
-                iVoIPUplink->Stop();
+                iIPUplink->Stop();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iUplinkStreamId, ECmdUplinkPaused, status);
                 }
@@ -273,9 +273,9 @@
             }
         case TMS_STREAM_DOWNLINK:
             {
-            if (strmId == iDnlinkStreamId && iVoIPDownlink)
+            if (strmId == iDnlinkStreamId && iIPDownlink)
                 {
-                iVoIPDownlink->Stop();
+                iIPDownlink->Stop();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iDnlinkStreamId, ECmdDownlinkPaused, status);
                 }
@@ -292,11 +292,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::StopStream
+// TMSCallIPAdpt::StopStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::StopStream(TMSCallType /*callType*/, TMSStreamType strmType,
+gint TMSCallIPAdpt::StopStream(TMSCallType /*callType*/, TMSStreamType strmType,
         gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -306,9 +306,9 @@
         {
         case TMS_STREAM_UPLINK:
             {
-            if (strmId == iUplinkStreamId && iVoIPUplink)
+            if (strmId == iUplinkStreamId && iIPUplink)
                 {
-                iVoIPUplink->Stop();
+                iIPUplink->Stop();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iUplinkStreamId, ECmdUplinkInitComplete, status);
                 }
@@ -316,9 +316,9 @@
             }
         case TMS_STREAM_DOWNLINK:
             {
-            if (strmId == iDnlinkStreamId && iVoIPDownlink)
+            if (strmId == iDnlinkStreamId && iIPDownlink)
                 {
-                iVoIPDownlink->Stop();
+                iIPDownlink->Stop();
                 status = TMS_RESULT_SUCCESS;
                 NotifyClient(iDnlinkStreamId, ECmdDownlinkInitComplete, status);
                 }
@@ -335,12 +335,12 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::DeinitStream
+// TMSCallIPAdpt::DeinitStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::DeinitStream(TMSCallType /*callType*/, TMSStreamType strmType,
-        gint strmId)
+gint TMSCallIPAdpt::DeinitStream(TMSCallType /*callType*/,
+        TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
@@ -349,9 +349,9 @@
         {
         case TMS_STREAM_UPLINK:
             {
-            if (strmId == iUplinkStreamId && iVoIPUplink)
+            if (strmId == iUplinkStreamId && iIPUplink)
                 {
-                iVoIPUplink->Stop();
+                iIPUplink->Stop();
                 //iUplinkStreamId = -1;
                 iUplinkInitialized = FALSE;
                 status = TMS_RESULT_SUCCESS;
@@ -362,9 +362,9 @@
             }
         case TMS_STREAM_DOWNLINK:
             {
-            if (strmId == iDnlinkStreamId && iVoIPDownlink)
+            if (strmId == iDnlinkStreamId && iIPDownlink)
                 {
-                iVoIPDownlink->Stop();
+                iIPDownlink->Stop();
                 //iDnlinkStreamId = -1;
                 iDnlinkInitialized = FALSE;
                 status = TMS_RESULT_SUCCESS;
@@ -385,11 +385,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::DeleteStream
+// TMSCallIPAdpt::DeleteStream
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::DeleteStream(TMSCallType /*callType*/,
+gint TMSCallIPAdpt::DeleteStream(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -427,11 +427,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::DataXferBufferEmptied
+// TMSCallIPAdpt::DataXferBufferEmptied
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::DataXferBufferEmptied(TMSCallType /*callType*/,
+gint TMSCallIPAdpt::DataXferBufferEmptied(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId)
     {
     TRACE_PRN_FN_ENT;
@@ -458,11 +458,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::DataXferBufferFilled
+// TMSCallIPAdpt::DataXferBufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::DataXferBufferFilled(TMSCallType /*callType*/,
+gint TMSCallIPAdpt::DataXferBufferFilled(TMSCallType /*callType*/,
         TMSStreamType strmType, gint strmId, guint datasize)
     {
     TRACE_PRN_FN_ENT;
@@ -487,11 +487,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetDataXferBufferHndl
+// TMSCallIPAdpt::GetDataXferBufferHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetDataXferBufferHndl(const TMSCallType /*callType*/,
+gint TMSCallIPAdpt::GetDataXferBufferHndl(const TMSCallType /*callType*/,
         const TMSStreamType strmType, const gint strmId, const guint32 key,
         RChunk& chunk)
     {
@@ -524,20 +524,20 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetMaxVolume
+// TMSCallIPAdpt::GetMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetMaxVolume(guint& volume)
+gint TMSCallIPAdpt::GetMaxVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
 
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->GetMaxVolume(volume);
+        status = iIPDownlink->GetMaxVolume(volume);
         iMaxVolume = volume;
-        TRACE_PRN_N1(_L("TMS->CallIPAdpt: GetMaxVolume [%d]"), iMaxVolume);
+        TRACE_PRN_N1(_L("TMS->TMSCallIPAdpt: GetMaxVolume [%d]"), iMaxVolume);
         }
 
     TRACE_PRN_FN_EXT;
@@ -545,17 +545,17 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetVolume
+// TMSCallIPAdpt::SetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetVolume(const guint volume)
+gint TMSCallIPAdpt::SetVolume(const guint volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->SetVolume(volume);
+        status = iIPDownlink->SetVolume(volume);
         NotifyClient(iDnlinkStreamId, ECmdSetVolume, status);
         }
     TRACE_PRN_FN_EXT;
@@ -563,53 +563,53 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetVolume
+// TMSCallIPAdpt::GetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetVolume(guint& volume)
+gint TMSCallIPAdpt::GetVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->GetVolume(volume);
+        status = iIPDownlink->GetVolume(volume);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetMaxGain
+// TMSCallIPAdpt::GetMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetMaxGain(guint& gain)
+gint TMSCallIPAdpt::GetMaxGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->GetMaxGain(gain);
+        status = iIPUplink->GetMaxGain(gain);
         iMaxGain = gain;
-        TRACE_PRN_N1(_L("TMS->CallIPAdpt::GetMaxGain [%d]"), iMaxGain);
+        TRACE_PRN_N1(_L("TMS->TMSCallIPAdpt::GetMaxGain [%d]"), iMaxGain);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetGain
+// TMSCallIPAdpt::SetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetGain(const guint gain)
+gint TMSCallIPAdpt::SetGain(const guint gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->SetGain(gain);
+        status = iIPUplink->SetGain(gain);
         NotifyClient(iUplinkStreamId, ECmdSetGain, status);
         }
     TRACE_PRN_FN_EXT;
@@ -617,134 +617,134 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetGain
+// TMSCallIPAdpt::GetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetGain(guint& gain)
+gint TMSCallIPAdpt::GetGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->GetGain(gain);
+        status = iIPUplink->GetGain(gain);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetGlobalMaxVolume
+// TMSCallIPAdpt::GetGlobalMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetGlobalMaxVolume(guint& volume)
+gint TMSCallIPAdpt::GetGlobalMaxVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->GetMaxVolume(volume);
+        status = iIPDownlink->GetMaxVolume(volume);
         iMaxVolume = volume;
-        TRACE_PRN_N1(_L("TMS->CallIPAdpt: GetMaxVolume [%d]"), iMaxVolume);
+        TRACE_PRN_N1(_L("TMS->TMSCallIPAdpt: GetMaxVolume [%d]"), iMaxVolume);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetGlobalVolume
+// TMSCallIPAdpt::SetGlobalVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetGlobalVolume(const guint volume)
+gint TMSCallIPAdpt::SetGlobalVolume(const guint volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->SetVolume(volume);
+        status = iIPDownlink->SetVolume(volume);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetGlobalVolume
+// TMSCallIPAdpt::GetGlobalVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetGlobalVolume(guint& volume)
+gint TMSCallIPAdpt::GetGlobalVolume(guint& volume)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        status = iVoIPDownlink->GetVolume(volume);
+        status = iIPDownlink->GetVolume(volume);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetGlobalMaxGain
+// TMSCallIPAdpt::GetGlobalMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetGlobalMaxGain(guint& gain)
+gint TMSCallIPAdpt::GetGlobalMaxGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->GetMaxGain(gain);
+        status = iIPUplink->GetMaxGain(gain);
         iMaxGain = gain;
-        TRACE_PRN_N1(_L("TMS->CallIPAdpt::GetMaxGain [%d]"), iMaxGain);
+        TRACE_PRN_N1(_L("TMS->TMSCallIPAdpt::GetMaxGain [%d]"), iMaxGain);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetGlobalGain
+// TMSCallIPAdpt::SetGlobalGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetGlobalGain(const guint gain)
+gint TMSCallIPAdpt::SetGlobalGain(const guint gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->SetGain(gain);
+        status = iIPUplink->SetGain(gain);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetGlobalGain
+// TMSCallIPAdpt::GetGlobalGain
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetGlobalGain(guint& gain)
+gint TMSCallIPAdpt::GetGlobalGain(guint& gain)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iUplinkInitialized && iVoIPUplink)
+    if (iUplinkInitialized && iIPUplink)
         {
-        status = iVoIPUplink->GetGain(gain);
+        status = iIPUplink->GetGain(gain);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetCodecMode
+// TMSCallIPAdpt::GetCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetCodecMode(const TMSFormatType fmttype,
+gint TMSCallIPAdpt::GetCodecMode(const TMSFormatType fmttype,
         const TMSStreamType strmtype, gint& mode)
     {
     TRACE_PRN_FN_ENT;
@@ -766,11 +766,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetCodecMode
+// TMSCallIPAdpt::SetCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetCodecMode(const TMSFormatType fmttype,
+gint TMSCallIPAdpt::SetCodecMode(const TMSFormatType fmttype,
         const TMSStreamType strmtype, const gint mode)
     {
     TRACE_PRN_FN_ENT;
@@ -792,17 +792,17 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetSupportedBitRatesCount
+// TMSCallIPAdpt::GetSupportedBitRatesCount
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetSupportedBitRatesCount(guint& count)
+gint TMSCallIPAdpt::GetSupportedBitRatesCount(guint& count)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        status = iVoIPUplink->GetSupportedBitrates(iArrBitrates);
+        status = iIPUplink->GetSupportedBitrates(iArrBitrates);
         count = iArrBitrates.Count();
         }
     TRACE_PRN_FN_EXT;
@@ -810,26 +810,26 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetSupportedBitRates
+// TMSCallIPAdpt::GetSupportedBitRates
 //
 // Bitrates are already returned from the codec as a result of call to
 // GetSupportedBitratesCount(). Just pack them into a descriptor and return
 // back to the client.
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetSupportedBitRates(CBufFlat*& brbuffer)
+gint TMSCallIPAdpt::GetSupportedBitRates(CBufFlat*& brbuffer)
     {
     TRAPD(status, GetSupportedBitRatesL(brbuffer));
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetSupportedBitRatesL
+// TMSCallIPAdpt::GetSupportedBitRatesL
 //
 // GetSupportedBitRates implementation which can leave.
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::GetSupportedBitRatesL(CBufFlat*& brbuffer)
+void TMSCallIPAdpt::GetSupportedBitRatesL(CBufFlat*& brbuffer)
     {
     TRACE_PRN_FN_ENT;
     RBufWriteStream stream;
@@ -840,7 +840,7 @@
     for (guint i = 0; i < numOfItems; i++)
         {
         stream.WriteUint32L(iArrBitrates[i]);
-        //TRACE_PRN_N1(_L("TMS->CallIPAdpt: BR: [%d]"), iArrBitrates[i]);
+        //TRACE_PRN_N1(_L("TMS->TMSCallIPAdpt: BR: [%d]"), iArrBitrates[i]);
         }
 
     CleanupStack::PopAndDestroy(&stream);
@@ -848,162 +848,163 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetBitRate
+// TMSCallIPAdpt::GetBitRate
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetBitRate(guint& bitrate)
+gint TMSCallIPAdpt::GetBitRate(guint& bitrate)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        status = iVoIPUplink->GetBitrate(bitrate);
+        status = iIPUplink->GetBitrate(bitrate);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetBitRate
+// TMSCallIPAdpt::SetBitRate
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetBitRate(const guint bitrate)
+gint TMSCallIPAdpt::SetBitRate(const guint bitrate)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        status = iVoIPUplink->SetBitrate(bitrate);
+        status = iIPUplink->SetBitrate(bitrate);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetVAD
+// TMSCallIPAdpt::GetVAD
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetVAD(const TMSFormatType fmttype, gboolean& vad)
+gint TMSCallIPAdpt::GetVAD(const TMSFormatType fmttype, gboolean& vad)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        status = iVoIPUplink->GetVad(fmttype, vad);
+        status = iIPUplink->GetVad(fmttype, vad);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetVAD
+// TMSCallIPAdpt::SetVAD
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetVAD(const TMSFormatType fmttype, const gboolean vad)
+gint TMSCallIPAdpt::SetVAD(const TMSFormatType fmttype, const gboolean vad)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        status = iVoIPUplink->SetVad(fmttype, vad);
+        status = iIPUplink->SetVad(fmttype, vad);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetCNG
+// TMSCallIPAdpt::GetCNG
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetCNG(const TMSFormatType fmttype, gboolean& cng)
+gint TMSCallIPAdpt::GetCNG(const TMSFormatType fmttype, gboolean& cng)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->GetCng(fmttype, cng);
+        status = iIPDownlink->GetCng(fmttype, cng);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetCNG
+// TMSCallIPAdpt::SetCNG
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetCNG(const TMSFormatType fmttype, const gboolean cng)
+gint TMSCallIPAdpt::SetCNG(const TMSFormatType fmttype, const gboolean cng)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->SetCng(fmttype, cng);
+        status = iIPDownlink->SetCng(fmttype, cng);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetPlc
+// TMSCallIPAdpt::GetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetPlc(const TMSFormatType fmttype, gboolean& plc)
+gint TMSCallIPAdpt::GetPlc(const TMSFormatType fmttype, gboolean& plc)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->GetPlc(fmttype, plc);
+        status = iIPDownlink->GetPlc(fmttype, plc);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetPlc
+// TMSCallIPAdpt::SetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetPlc(const TMSFormatType fmttype, const gboolean plc)
+gint TMSCallIPAdpt::SetPlc(const TMSFormatType fmttype, const gboolean plc)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_INVALID_STATE);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->SetPlc(fmttype, plc);
+        status = iIPDownlink->SetPlc(fmttype, plc);
         }
     TRACE_PRN_FN_EXT;
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::OpenDownlinkL
+// TMSCallIPAdpt::OpenDownlinkL
 // Method for player initialization.
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::OpenDownlinkL(const RMessage2& aMessage)
+gint TMSCallIPAdpt::OpenDownlinkL(const RMessage2& aMessage)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
 
-    // Ensure clients have MultimediaDD capability to use this priority/pref
-    // TODO: TMS must monitor for emergency call now
-    iPriority.iPref = TMdaPriorityPreference(KAudioPrefVoipAudioDownlink);
-    iPriority.iPriority = TMdaPriority(KAudioPriorityVoipAudioDownlink);
+    // Clients must have MultimediaDD capability to use this priority/pref.
+    // TODO: Also, TMS will monitor for emergency call and if detected it
+    //       will deny access to audio resources.
+    iPriority.iPref = KAudioPrefVoipAudioDownlink;
+    iPriority.iPriority = KAudioPriorityVoipAudioDownlink;
 
-    if (!iVoIPDownlink)
+    if (!iIPDownlink)
         {
-        iVoIPDownlink = TMSVoIPDownlink::NewL(iDnFourCC, iPriority);
+        iIPDownlink = TMSIPDownlink::NewL(iDnFourCC, iPriority);
         }
 
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
         // Open message queue for handling server notifications to the client
         if (iMsgQueueDn.Handle() <= 0)
@@ -1015,7 +1016,7 @@
         if (status == TMS_RESULT_SUCCESS)
             {
             // For transfer data buffer processing
-            iVoIPDownlink->SetMsgQueue(iMsgQueueDn);
+            iIPDownlink->SetMsgQueue(iMsgQueueDn);
             }
         }
 
@@ -1025,25 +1026,25 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::OpenUplinkL
+// TMSCallIPAdpt::OpenUplinkL
 // Method for recorder initialization.
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::OpenUplinkL(const RMessage2& aMessage)
+gint TMSCallIPAdpt::OpenUplinkL(const RMessage2& aMessage)
     {
     TRACE_PRN_FN_ENT;
     gint status(TMS_RESULT_SUCCESS);
 
     // Ensure clients have MultimediaDD capability to use this priority/pref
-    iPriority.iPref = TMdaPriorityPreference(KAudioPrefVoipAudioUplink);
-    iPriority.iPriority = TMdaPriority(KAudioPriorityVoipAudioUplink);
+    iPriority.iPref = KAudioPrefVoipAudioUplink;
+    iPriority.iPriority = KAudioPriorityVoipAudioUplink;
 
-    if (!iVoIPUplink)
+    if (!iIPUplink)
         {
-        iVoIPUplink = TMSVoIPUplink::NewL(iUpFourCC, iPriority);
+        iIPUplink = TMSIPUplink::NewL(iUpFourCC, iPriority);
         }
 
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
         // Open message queue for handling server notifications to the client
         if (iMsgQueueUp.Handle() <= 0)
@@ -1055,7 +1056,7 @@
         if (status == TMS_RESULT_SUCCESS)
             {
             // For transfer data buffer processing
-            iVoIPUplink->SetMsgQueue(iMsgQueueUp);
+            iIPUplink->SetMsgQueue(iMsgQueueUp);
             }
         }
 
@@ -1065,11 +1066,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetFormat
+// TMSCallIPAdpt::SetFormat
 //
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::SetFormat(const gint strmId, const TUint32 aFormat)
+void TMSCallIPAdpt::SetFormat(const gint strmId, const TUint32 aFormat)
     {
     if (strmId == iUplinkStreamId)
         {
@@ -1082,37 +1083,37 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::BufferFilled
+// TMSCallIPAdpt::BufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::BufferFilledL(TUint dataSize)
+void TMSCallIPAdpt::BufferFilledL(TUint dataSize)
     {
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        iVoIPDownlink->BufferFilled(dataSize);
+        iIPDownlink->BufferFilled(dataSize);
         }
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::BufferEmptied
+// TMSCallIPAdpt::BufferEmptied
 //
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::BufferEmptiedL()
+void TMSCallIPAdpt::BufferEmptiedL()
     {
-    if (iVoIPUplink)
+    if (iIPUplink)
         {
-        iVoIPUplink->BufferEmptied();
+        iIPUplink->BufferEmptied();
         }
     }
 
-// ----------------------------------------------------------------------------
-// CallIPAdpt::GetDataXferChunkHndl
+// -----------------------------------------------------------------------------
+// TMSCallIPAdpt::GetDataXferChunkHndl
 //
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetDataXferChunkHndl(const TMSStreamType strmType,
+gint TMSCallIPAdpt::GetDataXferChunkHndl(const TMSStreamType strmType,
         const TUint32 key, RChunk& chunk)
     {
     TRACE_PRN_FN_ENT;
@@ -1122,17 +1123,17 @@
         {
         case TMS_STREAM_DOWNLINK:
             {
-            if (iVoIPDownlink)
+            if (iIPDownlink)
                 {
-                status = iVoIPDownlink->GetDataXferChunkHndl(key, chunk);
+                status = iIPDownlink->GetDataXferChunkHndl(key, chunk);
                 }
             break;
             }
         case TMS_STREAM_UPLINK:
             {
-            if (iVoIPUplink)
+            if (iIPUplink)
                 {
-                status = iVoIPUplink->GetDataXferChunkHndl(key, chunk);
+                status = iIPUplink->GetDataXferChunkHndl(key, chunk);
                 }
             break;
             }
@@ -1146,26 +1147,27 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetIlbcCodecMode
+// TMSCallIPAdpt::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetIlbcCodecMode(const gint mode, const TMSStreamType strmtype)
+gint TMSCallIPAdpt::SetIlbcCodecMode(const gint mode,
+        const TMSStreamType strmtype)
     {
     gint status(TMS_RESULT_INVALID_ARGUMENT);
 
     if (strmtype == TMS_STREAM_DOWNLINK)
         {
-        if (iDnlinkInitialized && iVoIPDownlink)
+        if (iDnlinkInitialized && iIPDownlink)
             {
-            status = iVoIPDownlink->SetIlbcCodecMode(mode);
+            status = iIPDownlink->SetIlbcCodecMode(mode);
             }
         }
     else if (strmtype == TMS_STREAM_UPLINK)
         {
-        if (iUplinkInitialized && iVoIPUplink)
+        if (iUplinkInitialized && iIPUplink)
             {
-            status = iVoIPUplink->SetIlbcCodecMode(mode);
+            status = iIPUplink->SetIlbcCodecMode(mode);
             }
         }
 
@@ -1173,26 +1175,26 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetIlbcCodecMode
+// TMSCallIPAdpt::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetIlbcCodecMode(gint& mode, const TMSStreamType strmtype)
+gint TMSCallIPAdpt::GetIlbcCodecMode(gint& mode, const TMSStreamType strmtype)
     {
     gint status(TMS_RESULT_INVALID_ARGUMENT);
 
     if (strmtype == TMS_STREAM_DOWNLINK)
         {
-        if (iDnlinkInitialized && iVoIPDownlink)
+        if (iDnlinkInitialized && iIPDownlink)
             {
-            status = iVoIPDownlink->GetIlbcCodecMode(mode);
+            status = iIPDownlink->GetIlbcCodecMode(mode);
             }
         }
     else if (strmtype == TMS_STREAM_UPLINK)
         {
-        if (iUplinkInitialized && iVoIPUplink)
+        if (iUplinkInitialized && iIPUplink)
             {
-            status = iVoIPUplink->GetIlbcCodecMode(mode);
+            status = iIPUplink->GetIlbcCodecMode(mode);
             }
         }
 
@@ -1200,26 +1202,27 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetG711CodecMode
+// TMSCallIPAdpt::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetG711CodecMode(const gint mode, const TMSStreamType strmtype)
+gint TMSCallIPAdpt::SetG711CodecMode(const gint mode,
+        const TMSStreamType strmtype)
     {
     gint status(TMS_RESULT_INVALID_ARGUMENT);
 
     if (strmtype == TMS_STREAM_DOWNLINK)
         {
-        if (iDnlinkInitialized && iVoIPDownlink)
+        if (iDnlinkInitialized && iIPDownlink)
             {
-            status = iVoIPDownlink->SetG711CodecMode(mode);
+            status = iIPDownlink->SetG711CodecMode(mode);
             }
         }
     else if (strmtype == TMS_STREAM_UPLINK)
         {
-        if (iUplinkInitialized && iVoIPUplink)
+        if (iUplinkInitialized && iIPUplink)
             {
-            status = iVoIPUplink->SetG711CodecMode(mode);
+            status = iIPUplink->SetG711CodecMode(mode);
             }
         }
 
@@ -1227,26 +1230,26 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetG711CodecMode
+// TMSCallIPAdpt::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetG711CodecMode(gint& mode, const TMSStreamType strmtype)
+gint TMSCallIPAdpt::GetG711CodecMode(gint& mode, const TMSStreamType strmtype)
     {
     gint status(TMS_RESULT_INVALID_ARGUMENT);
 
     if (strmtype == TMS_STREAM_DOWNLINK)
         {
-        if (iDnlinkInitialized && iVoIPDownlink)
+        if (iDnlinkInitialized && iIPDownlink)
             {
-            status = iVoIPDownlink->GetG711CodecMode(mode);
+            status = iIPDownlink->GetG711CodecMode(mode);
             }
         }
     else if (strmtype == TMS_STREAM_UPLINK)
         {
-        if (iUplinkInitialized && iVoIPUplink)
+        if (iUplinkInitialized && iIPUplink)
             {
-            status = iVoIPUplink->GetG711CodecMode(mode);
+            status = iIPUplink->GetG711CodecMode(mode);
             }
         }
 
@@ -1254,132 +1257,133 @@
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::FrameModeRequiredForEC
+// TMSCallIPAdpt::FrameModeRequiredForEC
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::FrameModeRqrdForEC(gboolean& frmodereq)
+gint TMSCallIPAdpt::FrameModeRqrdForEC(gboolean& frmodereq)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->FrameModeRqrdForEC(frmodereq);
+        status = iIPDownlink->FrameModeRqrdForEC(frmodereq);
         }
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetFrameMode
+// TMSCallIPAdpt::SetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetFrameMode(const gboolean frmode)
+gint TMSCallIPAdpt::SetFrameMode(const gboolean frmode)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->SetFrameMode(frmode);
+        status = iIPDownlink->SetFrameMode(frmode);
         }
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetFrameMode
+// TMSCallIPAdpt::GetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetFrameMode(gboolean& frmode)
+gint TMSCallIPAdpt::GetFrameMode(gboolean& frmode)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->GetFrameMode(frmode);
+        status = iIPDownlink->GetFrameMode(frmode);
         }
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::ConcealErrorForNextBuffer
+// TMSCallIPAdpt::ConcealErrorForNextBuffer
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::ConcealErrorForNextBuffer()
+gint TMSCallIPAdpt::ConcealErrorForNextBuffer()
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->ConcealErrorForNextBuffer();
+        status = iIPDownlink->ConcealErrorForNextBuffer();
         }
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::BadLsfNextBuffer
+// TMSCallIPAdpt::BadLsfNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::BadLsfNextBuffer()
+gint TMSCallIPAdpt::BadLsfNextBuffer()
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iVoIPDownlink)
+    if (iIPDownlink)
         {
-        status = iVoIPDownlink->BadLsfNextBuffer();
+        status = iIPDownlink->BadLsfNextBuffer();
         }
     return status;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::SetOutput
+// TMSCallIPAdpt::SetOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::SetOutput(TMSAudioOutput output)
+gint TMSCallIPAdpt::SetOutput(TMSAudioOutput output)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        TRAP(status, iVoIPDownlink->SetAudioDeviceL(output));
+        TRAP(status, iIPDownlink->SetAudioDeviceL(output));
         }
     return status;
     }
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetOutput
+// TMSCallIPAdpt::GetOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetOutput(TMSAudioOutput& output)
+gint TMSCallIPAdpt::GetOutput(TMSAudioOutput& output)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
-    if (iDnlinkInitialized && iVoIPDownlink)
+    if (iDnlinkInitialized && iIPDownlink)
         {
-        TRAP(status, iVoIPDownlink->GetAudioDeviceL(output));
+        TRAP(status, iIPDownlink->GetAudioDeviceL(output));
         }
     return status;
     }
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetPreviousOutput
+// TMSCallIPAdpt::GetPreviousOutput
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetPreviousOutput(TMSAudioOutput& /*output*/)
+gint TMSCallIPAdpt::GetPreviousOutput(TMSAudioOutput& /*output*/)
     {
     return TMS_RESULT_FEATURE_NOT_SUPPORTED;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::GetAvailableOutputsL
+// TMSCallIPAdpt::GetAvailableOutputsL
 //
 // -----------------------------------------------------------------------------
 //
-gint CallIPAdpt::GetAvailableOutputsL(gint& /*count*/, CBufFlat*& /*outputsbuffer*/)
+gint TMSCallIPAdpt::GetAvailableOutputsL(gint& /*count*/,
+        CBufFlat*& /*outputsbuffer*/)
     {
     return TMS_RESULT_FEATURE_NOT_SUPPORTED;
     }
 
 // -----------------------------------------------------------------------------
-// CallIPAdpt::NotifyClient
+// TMSCallIPAdpt::NotifyClient
 // -----------------------------------------------------------------------------
 //
-void CallIPAdpt::NotifyClient(const gint strmId, const TInt aCommand,
+void TMSCallIPAdpt::NotifyClient(const gint strmId, const TInt aCommand,
         const TInt aStatus, const TInt64 /*aInt64*/)
     {
     iMsgBuffer.iRequest = aCommand;
--- a/mmserv/tms/tmscallserver/src/csdownlink.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/csdownlink.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -28,9 +28,9 @@
 // Static constructor
 // -----------------------------------------------------------------------------
 //
-CSDownlink* CSDownlink::NewL(MCSPDevSoundObserver& aObserver)
+TMSCSDownlink* TMSCSDownlink::NewL(TMSCSPDevSoundObserver& aObserver)
     {
-    CSDownlink* self = new (ELeave) CSDownlink(aObserver);
+    TMSCSDownlink* self = new (ELeave) TMSCSDownlink(aObserver);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -41,7 +41,7 @@
 // Destructor.
 // -----------------------------------------------------------------------------
 //
-CSDownlink::~CSDownlink()
+TMSCSDownlink::~TMSCSDownlink()
     {
     }
 
@@ -49,7 +49,7 @@
 // Sets volume
 // -----------------------------------------------------------------------------
 //
-void CSDownlink::SetVolume(gint aVolume)
+void TMSCSDownlink::SetVolume(gint aVolume)
     {
     if (iDevSound)
         {
@@ -64,7 +64,7 @@
 // Gives volume
 // -----------------------------------------------------------------------------
 //
-gint CSDownlink::Volume()
+gint TMSCSDownlink::Volume()
     {
     gint vol = 0;
     if (iDevSound)
@@ -78,7 +78,7 @@
 // Gives max volume
 // -----------------------------------------------------------------------------
 //
-gint CSDownlink::MaxVolume()
+gint TMSCSDownlink::MaxVolume()
     {
     gint vol = 0;
     if (iDevSound)
@@ -93,9 +93,9 @@
 // Downlink stream has been activated successfully.
 // -----------------------------------------------------------------------------
 //
-void CSDownlink::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
+void TMSCSDownlink::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
     {
-    //CSPLOGSTRING( CSPINT, "CSDownlink:: activated" );
+    //CSPLOGSTRING( CSPINT, "TMSCSDownlink:: activated" );
     // We dont react to devsound messages unless we are activating.
     if (IsActivationOngoing())
         {
@@ -110,14 +110,14 @@
 // Downlink stream activation failed
 // -----------------------------------------------------------------------------
 //
-void CSDownlink::PlayError(TInt aError)
+void TMSCSDownlink::PlayError(TInt aError)
     {
-    //CSPLOGSTRING( CSPINT, "CSDownlink::PlayError" );
+    //CSPLOGSTRING( CSPINT, "TMSCSDownlink::PlayError" );
 
     // We dont react to devsound messages unless we are activating.
     if (IsActivationOngoing())
         {
-        //CSPLOGSTRING( CSPINT, "CSDownlink::PlayError activation failed" );
+        //CSPLOGSTRING( CSPINT, "TMSCSDownlink::PlayError activation failed" );
         if (aError == KErrAccessDenied)
             {
             iActivationOngoing = EFalse;
@@ -131,7 +131,7 @@
 // Tries to activate Downlink stream.
 // -----------------------------------------------------------------------------
 //
-void CSDownlink::DoActivateL()
+void TMSCSDownlink::DoActivateL()
     {
     if (iDevSound)
         {
@@ -143,8 +143,8 @@
 // Constructor
 // -----------------------------------------------------------------------------
 //
-CSDownlink::CSDownlink(MCSPDevSoundObserver& aObserver) :
-    CSPDevSound(aObserver)
+TMSCSDownlink::TMSCSDownlink(TMSCSPDevSoundObserver& aObserver) :
+    TMSCSPDevSound(aObserver)
     {
     }
 
@@ -152,9 +152,9 @@
 // Second phase constructor
 // -----------------------------------------------------------------------------
 //
-void CSDownlink::ConstructL()
+void TMSCSDownlink::ConstructL()
     {
-    CSPDevSound::ConstructL(EMMFStatePlaying, KAudioPrefCSCallDownlink,
+    TMSCSPDevSound::ConstructL(EMMFStatePlaying, KAudioPrefCSCallDownlink,
             KAudioPriorityCSCallDownlink);
 
     if (iDevSound)
--- a/mmserv/tms/tmscallserver/src/cspdevsound.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/cspdevsound.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -23,20 +23,20 @@
 
 using namespace TMS;
 
-// ---------------------------------------------------------------------------
-// CSPDevSound
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// TMSCSPDevSound
+// -----------------------------------------------------------------------------
 //
-CSPDevSound::CSPDevSound(MCSPDevSoundObserver& aObserver) :
+TMSCSPDevSound::TMSCSPDevSound(TMSCSPDevSoundObserver& aObserver) :
     iObserver(aObserver)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // ConstructL
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ConstructL(TMMFState aMode, gint aAudioPreference,
+void TMSCSPDevSound::ConstructL(TMMFState aMode, gint aAudioPreference,
         gint aAudioPriority)
     {
     TMMFPrioritySettings audioPriority;
@@ -58,21 +58,21 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CSPDevSound::~CSPDevSound()
+TMSCSPDevSound::~TMSCSPDevSound()
     {
     delete iDevSound;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Tries to activate the audio stream if not active or activating
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::Activate()
+void TMSCSPDevSound::Activate()
     {
     if (!IsActive() && !IsActivationOngoing())
         {
@@ -82,11 +82,11 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Deactivates the audio device.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::Deactivate()
+void TMSCSPDevSound::Deactivate()
     {
     if (iDevSound && (IsActive() || IsActivationOngoing()))
         {
@@ -96,39 +96,39 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // ActivationOngoing
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TBool CSPDevSound::IsActivationOngoing() const
+TBool TMSCSPDevSound::IsActivationOngoing() const
     {
     return iActivationOngoing;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // IsActive
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TBool CSPDevSound::IsActive() const
+TBool TMSCSPDevSound::IsActive() const
     {
     return iActive;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // DevSound
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CMMFDevSound& CSPDevSound::DevSound()
+CMMFDevSound& TMSCSPDevSound::DevSound()
     {
     return *iDevSound;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::InitializeComplete(TInt aError)
+void TMSCSPDevSound::InitializeComplete(TInt aError)
     {
     if (iStreamType == KAudioPrefCSCallDownlink)
         {
@@ -140,66 +140,67 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
+void TMSCSPDevSound::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::PlayError(TInt /*aError*/)
+void TMSCSPDevSound::PlayError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ToneFinished(TInt /*aError*/)
+void TMSCSPDevSound::ToneFinished(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
+void TMSCSPDevSound::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::RecordError(TInt /*aError*/)
+void TMSCSPDevSound::RecordError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ConvertError(TInt /*aError*/)
+void TMSCSPDevSound::ConvertError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::DeviceMessage(TUid /*aMessageType*/, const TDesC8& /*aMsg*/)
+void TMSCSPDevSound::DeviceMessage(TUid /*aMessageType*/,
+        const TDesC8& /*aMsg*/)
     {
     }
 
--- a/mmserv/tms/tmscallserver/src/csuplink.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/csuplink.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -24,32 +24,32 @@
 // Mute value
 const gint KSetMuteToDevSound = 0;
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Static constructor.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CSUplink* CSUplink::NewL(MCSPDevSoundObserver& aObserver)
+TMSCSUplink* TMSCSUplink::NewL(TMSCSPDevSoundObserver& aObserver)
     {
-    CSUplink* self = new (ELeave) CSUplink(aObserver);
+    TMSCSUplink* self = new (ELeave) TMSCSUplink(aObserver);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
     return self;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Destructor
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CSUplink::~CSUplink()
+TMSCSUplink::~TMSCSUplink()
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Gives mic mute state
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TBool CSUplink::IsMuted()
+TBool TMSCSUplink::IsMuted()
     {
     TBool isMuted = EFalse;
     gint gain = 0;
@@ -62,15 +62,15 @@
         // Mute is on
         isMuted = ETrue;
         }
-    //   CSPLOGSTRING( CSPINT, "CSUplink::IsMuted" );
+    //   CSPLOGSTRING( CSPINT, "TMSCSUplink::IsMuted" );
     return isMuted;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Set mic muted.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::SetMuted()
+void TMSCSUplink::SetMuted()
     {
     if (iDevSound)
         {
@@ -78,11 +78,11 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Set mic unmuted
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::SetUnmuted()
+void TMSCSUplink::SetUnmuted()
     {
     if (iDevSound)
         {
@@ -90,11 +90,11 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Sets gain
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::SetGain(gint aGain)
+void TMSCSUplink::SetGain(gint aGain)
     {
     if (iDevSound)
         {
@@ -102,11 +102,11 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Gives volume
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-gint CSUplink::Gain()
+gint TMSCSUplink::Gain()
     {
     gint gain = 0;
     if (iDevSound)
@@ -116,11 +116,11 @@
     return gain;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Gives max gain
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-gint CSUplink::MaxGain()
+gint TMSCSUplink::MaxGain()
     {
     gint gain = 0;
     if (iDevSound)
@@ -130,14 +130,14 @@
     return gain;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Activation was successfull.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
+void TMSCSUplink::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
     {
-    //  CSPLOGSTRING( CSPINT, "CSUplink::BufferToBeEmptied" );
+    //  CSPLOGSTRING( CSPINT, "TMSCSUplink::BufferToBeEmptied" );
 
     // We dont react to devsound messages unless we are activating.
     if (IsActivationOngoing())
@@ -148,14 +148,14 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Activation feiled
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::RecordError(TInt aError)
+void TMSCSUplink::RecordError(TInt aError)
     {
-    //  CSPLOGSTRING( CSPINT, "CSUplink::RecordError" );
+    //  CSPLOGSTRING( CSPINT, "TMSCSUplink::RecordError" );
 
     // We dont react to devsound messages unless we are activating.
     if (IsActivationOngoing())
@@ -168,13 +168,13 @@
         }
     }
 
-// ---------------------------------------------------------------------------
-// From class CSPDevSound
+// -----------------------------------------------------------------------------
+// From class TMSCSPDevSound
 // Tries to activate mic stream. Stream becomes active when BufferToBeFilled
 // gets called.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::DoActivateL()
+void TMSCSUplink::DoActivateL()
     {
     if (iDevSound)
         {
@@ -182,22 +182,22 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Constructor
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CSUplink::CSUplink(MCSPDevSoundObserver& aObserver) :
-    CSPDevSound(aObserver)
+TMSCSUplink::TMSCSUplink(TMSCSPDevSoundObserver& aObserver) :
+    TMSCSPDevSound(aObserver)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Second phase constructor
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSUplink::ConstructL()
+void TMSCSUplink::ConstructL()
     {
-    CSPDevSound::ConstructL(EMMFStateRecording, KAudioPrefCSCallUplink,
+    TMSCSPDevSound::ConstructL(EMMFStateRecording, KAudioPrefCSCallUplink,
             KAudioPriorityCSCallUplink);
     }
 
--- a/mmserv/tms/tmscallserver/src/delaytimer.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/delaytimer.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -87,6 +87,7 @@
     TRACE_PRN_FN_ENT;
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         SetActive();
         iShutDownTimer.After(iStatus, aDelay);
         }
--- a/mmserv/tms/tmscallserver/src/ipcalldownlink.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/ipcalldownlink.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -28,7 +28,7 @@
 
 using namespace TMS;
 
-static TMSVoIPDownlink* iSelfDn;
+static TMSIPDownlink* iSelfDn;
 #ifdef _DEBUG
 static TInt iHeap;
 #endif //_DEBUG
@@ -41,10 +41,10 @@
 #endif
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::cb_raw_playback_handoff
+// TMSIPDownlink::cb_raw_playback_handoff
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::cb_raw_playback_handoff(GstElement* /*appsrc*/,
+void TMSIPDownlink::cb_raw_playback_handoff(GstElement* /*appsrc*/,
         guint size)
     {
     TRACE_PRN_N(_L("TMS->DNL: cb_raw_playback_handoff"));
@@ -63,10 +63,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::bus_call
+// TMSIPDownlink::bus_call
 // -----------------------------------------------------------------------------
 //
-gboolean TMSVoIPDownlink::bus_call(GstBus* /*bus*/, GstMessage* msg,
+gboolean TMSIPDownlink::bus_call(GstBus* /*bus*/, GstMessage* msg,
         gpointer /*data*/)
     {
     switch (GST_MESSAGE_TYPE(msg))
@@ -97,10 +97,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::gst_initialize_play
+// TMSIPDownlink::gst_initialize_play
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::gst_initialize_play()
+gint TMSIPDownlink::gst_initialize_play()
     {
     TRACE_PRN_FN_ENT;
 
@@ -119,7 +119,7 @@
         }
 
     iBusPlay = gst_pipeline_get_bus(GST_PIPELINE(iPipelinePlay));
-    gst_bus_add_watch(iBusPlay, TMSVoIPDownlink::bus_call, NULL);
+    gst_bus_add_watch(iBusPlay, TMSIPDownlink::bus_call, NULL);
     gst_object_unref(iBusPlay);
 
     iMaxBufLen = ConfigureMedia(iCodecID);
@@ -160,10 +160,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::gst_play_raw
+// TMSIPDownlink::gst_play_raw
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::gst_play_raw()
+gint TMSIPDownlink::gst_play_raw()
     {
     TRACE_PRN_FN_ENT;
 
@@ -179,21 +179,21 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::TMSVoIPDownlink
+// TMSIPDownlink::TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::TMSVoIPDownlink()
+TMSIPDownlink::TMSIPDownlink()
     {
     iSelfDn = this;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::~TMSVoIPDownlink
+// TMSIPDownlink::~TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::~TMSVoIPDownlink()
+TMSIPDownlink::~TMSIPDownlink()
     {
     TRACE_PRN_FN_ENT;
 
@@ -216,14 +216,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::NewL
+// TMSIPDownlink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink* TMSVoIPDownlink::NewL(const guint32 codecID,
+TMSIPDownlink* TMSIPDownlink::NewL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
-    TMSVoIPDownlink* self = new (ELeave) TMSVoIPDownlink();
+    TMSIPDownlink* self = new (ELeave) TMSIPDownlink();
     CleanupStack::PushL(self);
     self->ConstructL(codecID, priority);
     CleanupStack::Pop(self);
@@ -231,11 +231,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConstructL
+// TMSIPDownlink::ConstructL
 // Part two of Symbian two phase construction
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::ConstructL(const guint32 codecID,
+void TMSIPDownlink::ConstructL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -279,11 +279,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Start
+// TMSIPDownlink::Start
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Start()
+void TMSIPDownlink::Start()
     {
     TRACE_PRN_FN_ENT;
 
@@ -294,11 +294,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Stop
+// TMSIPDownlink::Stop
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Stop()
+void TMSIPDownlink::Stop()
     {
     TRACE_PRN_FN_ENT;
 
@@ -322,10 +322,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferToBeFilled
+// TMSIPDownlink::BufferToBeFilled
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferToBeFilled()
+void TMSIPDownlink::BufferToBeFilled()
     {
     TRACE_PRN_N1(_L("TMS->DNL->BTBF: requestBufLen[%d]"), requestBufLen);
 
@@ -366,11 +366,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferFilled
+// TMSIPDownlink::BufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferFilled(const guint buflen)
+void TMSIPDownlink::BufferFilled(const guint buflen)
     {
 #ifndef __PLAY_WAV_FROM_FILE__
     gstDnlBuffer = gst_buffer_new();
@@ -418,22 +418,22 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCi
+// TMSIPDownlink::SetCodecCi
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCodecCi()
+gint TMSIPDownlink::SetCodecCi()
     {
     TRAPD(err, SetCodecCiL());
     return err;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCiL
+// TMSIPDownlink::SetCodecCiL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::SetCodecCiL()
+void TMSIPDownlink::SetCodecCiL()
     {
     TRACE_PRN_FN_ENT;
 
@@ -489,11 +489,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetVolume
+// TMSIPDownlink::SetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetVolume(const guint volume)
+gint TMSIPDownlink::SetVolume(const guint volume)
     {
     g_object_set(G_OBJECT(iSink), "volume", volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: SetVolume [%d]"), volume);
@@ -501,11 +501,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetVolume
+// TMSIPDownlink::GetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetVolume(guint& volume)
+gint TMSIPDownlink::GetVolume(guint& volume)
     {
     g_object_get(G_OBJECT(iSink), "volume", &volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: GetVolume [%d]"), volume);
@@ -513,11 +513,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetMaxVolume
+// TMSIPDownlink::GetMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetMaxVolume(guint& volume)
+gint TMSIPDownlink::GetMaxVolume(guint& volume)
     {
     g_object_get(G_OBJECT(iSink), "maxvolume", &volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: MaxVolume [%d]"), volume);
@@ -525,11 +525,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetDataXferChunkHndl
+// TMSIPDownlink::GetDataXferChunkHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
+gint TMSIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
     {
     gint status = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -553,11 +553,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetIlbcCodecMode
+// TMSIPDownlink::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetIlbcCodecMode(gint mode)
+gint TMSIPDownlink::SetIlbcCodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -585,11 +585,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetIlbcCodecMode
+// TMSIPDownlink::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetIlbcCodecMode(gint& mode)
+gint TMSIPDownlink::GetIlbcCodecMode(gint& mode)
     {
     // not available through CIs -> return cashed value
     mode = iILBCDecodeMode;
@@ -598,11 +598,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetG711CodecMode
+// TMSIPDownlink::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetG711CodecMode(gint mode)
+gint TMSIPDownlink::SetG711CodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -630,11 +630,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetG711CodecMode
+// TMSIPDownlink::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetG711CodecMode(gint& mode)
+gint TMSIPDownlink::GetG711CodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iG711DecodeMode;
@@ -643,11 +643,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::FrameModeRqrdForEC
+// TMSIPDownlink::FrameModeRqrdForEC
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
+gint TMSIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -665,11 +665,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetFrameMode
+// TMSIPDownlink::SetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetFrameMode(const gboolean frmode)
+gint TMSIPDownlink::SetFrameMode(const gboolean frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -689,11 +689,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetFrameMode
+// TMSIPDownlink::GetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetFrameMode(gboolean& frmode)
+gint TMSIPDownlink::GetFrameMode(gboolean& frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -710,11 +710,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConcealErrorForNextBuffer
+// TMSIPDownlink::ConcealErrorForNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::ConcealErrorForNextBuffer()
+gint TMSIPDownlink::ConcealErrorForNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -729,11 +729,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCng
+// TMSIPDownlink::SetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
+gint TMSIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -756,11 +756,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetCng
+// TMSIPDownlink::GetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
+gint TMSIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -783,11 +783,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetPlc
+// TMSIPDownlink::SetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
+gint TMSIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -806,11 +806,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetPlc
+// TMSIPDownlink::GetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
+gint TMSIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -827,11 +827,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BadLsfNextBuffer
+// TMSIPDownlink::BadLsfNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::BadLsfNextBuffer()
+gint TMSIPDownlink::BadLsfNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -849,10 +849,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetAudioDeviceL
+// TMSIPDownlink::SetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
-void TMSVoIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
+void TMSIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
     {
     gint outputDev;
 
@@ -877,11 +877,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetAudioDeviceL
+// TMSIPDownlink::GetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
+void TMSIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
     {
     TRACE_PRN_FN_ENT;
 
--- a/mmserv/tms/tmscallserver/src/ipcalldownlinkds.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/ipcalldownlinkds.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -28,20 +28,20 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::TMSVoIPDownlink
+// TMSIPDownlink::TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::TMSVoIPDownlink()
+TMSIPDownlink::TMSIPDownlink()
     {
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::~TMSVoIPDownlink
+// TMSIPDownlink::~TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::~TMSVoIPDownlink()
+TMSIPDownlink::~TMSIPDownlink()
     {
     TRACE_PRN_FN_ENT;
 
@@ -57,14 +57,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::NewL
+// TMSIPDownlink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink* TMSVoIPDownlink::NewL(const guint32 codecID,
+TMSIPDownlink* TMSIPDownlink::NewL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
-    TMSVoIPDownlink* self = new (ELeave) TMSVoIPDownlink();
+    TMSIPDownlink* self = new (ELeave) TMSIPDownlink();
     CleanupStack::PushL(self);
     self->ConstructL(codecID, priority);
     CleanupStack::Pop(self);
@@ -72,11 +72,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConstructL
+// TMSIPDownlink::ConstructL
 // Part two of Symbian two phase construction
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::ConstructL(const guint32 codecID,
+void TMSIPDownlink::ConstructL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -100,11 +100,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Start
+// TMSIPDownlink::Start
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Start()
+void TMSIPDownlink::Start()
     {
     TRACE_PRN_FN_ENT;
 
@@ -128,11 +128,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Stop
+// TMSIPDownlink::Stop
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Stop()
+void TMSIPDownlink::Stop()
     {
     TRACE_PRN_FN_ENT;
 
@@ -146,14 +146,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferToBeFilled
+// TMSIPDownlink::BufferToBeFilled
 // A reference to the buffer delivered from the DevSound is stored locally
 // for later use. It will be filled with the data passed from the client
 // when it calls BufferFilled.
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferToBeFilled(CMMFBuffer* aBuffer)
+void TMSIPDownlink::BufferToBeFilled(CMMFBuffer* aBuffer)
     {
     // Store pointer to the received buffer
     iDevSoundBufPtr = static_cast<CMMFDataBuffer*> (aBuffer);
@@ -200,11 +200,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferFilled
+// TMSIPDownlink::BufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferFilled(const guint buflen)
+void TMSIPDownlink::BufferFilled(const guint buflen)
     {
     TRACE_PRN_N1(_L("TMS->DNL->BF: LEN[%d]"), buflen);
 
@@ -230,22 +230,22 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCi
+// TMSIPDownlink::SetCodecCi
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCodecCi()
+gint TMSIPDownlink::SetCodecCi()
     {
     TRAPD(err, SetCodecCiL());
     return err;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCiL
+// TMSIPDownlink::SetCodecCiL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::SetCodecCiL()
+void TMSIPDownlink::SetCodecCiL()
     {
     TRACE_PRN_FN_ENT;
 
@@ -296,11 +296,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetVolume
+// TMSIPDownlink::SetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetVolume(const guint volume)
+gint TMSIPDownlink::SetVolume(const guint volume)
     {
     gint ret(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -313,11 +313,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetVolume
+// TMSIPDownlink::GetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetVolume(guint& volume)
+gint TMSIPDownlink::GetVolume(guint& volume)
     {
     gint ret(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -330,11 +330,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetMaxVolume
+// TMSIPDownlink::GetMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetMaxVolume(guint& volume)
+gint TMSIPDownlink::GetMaxVolume(guint& volume)
     {
     gint ret(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -347,11 +347,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetDataXferChunkHndl
+// TMSIPDownlink::GetDataXferChunkHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
+gint TMSIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
     {
     gint status = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -375,11 +375,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetIlbcCodecMode
+// TMSIPDownlink::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetIlbcCodecMode(gint mode)
+gint TMSIPDownlink::SetIlbcCodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -409,11 +409,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetIlbcCodecMode
+// TMSIPDownlink::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetIlbcCodecMode(gint& mode)
+gint TMSIPDownlink::GetIlbcCodecMode(gint& mode)
     {
     // not available through CIs -> return cashed value
     mode = iILBCDecodeMode;
@@ -422,11 +422,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetG711CodecMode
+// TMSIPDownlink::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetG711CodecMode(gint mode)
+gint TMSIPDownlink::SetG711CodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -456,11 +456,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetG711CodecMode
+// TMSIPDownlink::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetG711CodecMode(gint& mode)
+gint TMSIPDownlink::GetG711CodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iG711DecodeMode;
@@ -469,11 +469,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::FrameModeRqrdForEC
+// TMSIPDownlink::FrameModeRqrdForEC
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
+gint TMSIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -491,11 +491,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetFrameMode
+// TMSIPDownlink::SetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetFrameMode(const gboolean frmode)
+gint TMSIPDownlink::SetFrameMode(const gboolean frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -515,11 +515,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetFrameMode
+// TMSIPDownlink::GetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetFrameMode(gboolean& frmode)
+gint TMSIPDownlink::GetFrameMode(gboolean& frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -536,11 +536,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConcealErrorForNextBuffer
+// TMSIPDownlink::ConcealErrorForNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::ConcealErrorForNextBuffer()
+gint TMSIPDownlink::ConcealErrorForNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -555,11 +555,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCng
+// TMSIPDownlink::SetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
+gint TMSIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -582,11 +582,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetCng
+// TMSIPDownlink::GetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
+gint TMSIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -609,11 +609,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetPlc
+// TMSIPDownlink::SetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
+gint TMSIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -632,11 +632,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetPlc
+// TMSIPDownlink::GetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
+gint TMSIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -653,11 +653,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BadLsfNextBuffer
+// TMSIPDownlink::BadLsfNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::BadLsfNextBuffer()
+gint TMSIPDownlink::BadLsfNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -675,10 +675,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetAudioDeviceL
+// TMSIPDownlink::SetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
-void TMSVoIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
+void TMSIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
     {
     TRACE_PRN_FN_ENT;
 
@@ -715,11 +715,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetAudioDeviceL
+// TMSIPDownlink::GetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
+void TMSIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
     {
     TRACE_PRN_FN_ENT;
 
@@ -756,14 +756,14 @@
 // CALLBACKS
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::InitializeComplete
+// TMSIPDownlink::InitializeComplete
 // A callback from the DevSound indicating completion of the initialization.
 // It will send config data to the D/S and configure the encoder via CI.
 // If everything goes well, the state of the thread is set EReady.
 // The initialization completion message is sent back to the main thread.
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::InitializeComplete(TInt aError)
+void TMSIPDownlink::InitializeComplete(TInt aError)
     {
     TRACE_PRN_FN_ENT;
 
@@ -801,13 +801,13 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::PlayError
+// TMSIPDownlink::PlayError
 // From MDevSoundObserver
 // Record error is send to client over comm channel.
 // The state of recorder is rolled back to EReady.
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::PlayError(TInt /*aError*/)
+void TMSIPDownlink::PlayError(TInt /*aError*/)
     {
     //TRACE_PRN_IF_ERR(aError);
 
--- a/mmserv/tms/tmscallserver/src/ipcallstreambase.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/ipcallstreambase.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -24,11 +24,11 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// IPCallStreamBase::~IPCallStreamBase
+// TMSIPCallStreamBase::~TMSIPCallStreamBase
 // Destructor
 // -----------------------------------------------------------------------------
 //
-IPCallStreamBase::~IPCallStreamBase()
+TMSIPCallStreamBase::~TMSIPCallStreamBase()
     {
     TRACE_PRN_FN_ENT;
 
@@ -45,11 +45,11 @@
 
 #ifndef __USE_GSTREAMER__
 // -----------------------------------------------------------------------------
-// IPCallStreamBase::InitDevSoundL
+// TMSIPCallStreamBase::InitDevSoundL
 //
 // -----------------------------------------------------------------------------
 //
-void IPCallStreamBase::InitDevSoundL(const TMMFState aDevSoundState,
+void TMSIPCallStreamBase::InitDevSoundL(const TMMFState aDevSoundState,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -69,21 +69,21 @@
 #endif //__USE_GSTREAMER__
 
 // -----------------------------------------------------------------------------
-// IPCallStreamBase::SetMsgQueue
+// TMSIPCallStreamBase::SetMsgQueue
 //
 // -----------------------------------------------------------------------------
 //
-void IPCallStreamBase::SetMsgQueue(const RMsgQueue<TmsMsgBuf> aMsgQueue)
+void TMSIPCallStreamBase::SetMsgQueue(const RMsgQueue<TmsMsgBuf> aMsgQueue)
     {
     iMsgQueue = aMsgQueue;
     }
 
 // -----------------------------------------------------------------------------
-// IPCallStreamBase::ConfigureMedia
+// TMSIPCallStreamBase::ConfigureMedia
 //
 // -----------------------------------------------------------------------------
 //
-gint IPCallStreamBase::ConfigureMedia(const guint32 aCodecID)
+gint TMSIPCallStreamBase::ConfigureMedia(const guint32 aCodecID)
     {
     gint framelen = 0;
 
@@ -130,11 +130,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// IPCallStreamBase::DoChunk
+// TMSIPCallStreamBase::DoChunk
 // Checks, adjusts and creates global RChunk.
 // -----------------------------------------------------------------------------
 //
-gint IPCallStreamBase::DoChunk(const gint aDataLen, TmsMsgBuf& aMsgBuffer)
+gint TMSIPCallStreamBase::DoChunk(const gint aDataLen, TmsMsgBuf& aMsgBuffer)
     {
     gint status(KErrNone);
 
--- a/mmserv/tms/tmscallserver/src/ipcalluplink.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/ipcalluplink.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -23,17 +23,17 @@
 
 using namespace TMS;
 
-static TMSVoIPUplink* iSelfUp;
+static TMSIPUplink* iSelfUp;
 GstBuffer* gstUplBuffer;
 #ifdef _DEBUG
 //static TInt iHeapUp;
 #endif //_DEBUG
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::cb_record_raw_handoff
+// TMSIPUplink::cb_record_raw_handoff
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::cb_record_raw_handoff(GstElement *sink)
+void TMSIPUplink::cb_record_raw_handoff(GstElement *sink)
     {
     TRACE_PRN_N(_L("TMS->UPL: cb_record_raw_handoff Enter"));
 
@@ -51,10 +51,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::bus_call
+// TMSIPUplink::bus_call
 // -----------------------------------------------------------------------------
 //
-gboolean TMSVoIPUplink::bus_call(GstBus* /*bus*/, GstMessage* msg,
+gboolean TMSIPUplink::bus_call(GstBus* /*bus*/, GstMessage* msg,
         gpointer /*data*/)
     {
     switch (GST_MESSAGE_TYPE(msg))
@@ -84,10 +84,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::gst_initialize_record
+// TMSIPUplink::gst_initialize_record
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::gst_initialize_record()
+gint TMSIPUplink::gst_initialize_record()
     {
     TRACE_PRN_FN_ENT;
 
@@ -117,7 +117,7 @@
                                         NULL);
 
     iBusRec = gst_pipeline_get_bus(GST_PIPELINE(iPipelineRec));
-    gst_bus_add_watch(iBusRec, (TMSVoIPUplink::bus_call), NULL);
+    gst_bus_add_watch(iBusRec, (TMSIPUplink::bus_call), NULL);
     gst_object_unref(iBusRec);
 
     // add objects to the main iPipelineRec
@@ -161,10 +161,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::gst_record_raw
+// TMSIPUplink::gst_record_raw
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::gst_record_raw()
+gint TMSIPUplink::gst_record_raw()
     {
     // start recording
     gst_element_set_state(iPipelineRec, GST_STATE_PLAYING);
@@ -172,21 +172,21 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::TMSVoIPUplink
+// TMSIPUplink::TMSIPUplink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink::TMSVoIPUplink()
+TMSIPUplink::TMSIPUplink()
     {
     iSelfUp = this;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::~TMSVoIPUplink
+// TMSIPUplink::~TMSIPUplink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink::~TMSVoIPUplink()
+TMSIPUplink::~TMSIPUplink()
     {
     TRACE_PRN_FN_ENT;
 
@@ -203,14 +203,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::NewL
+// TMSIPUplink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink* TMSVoIPUplink::NewL(const guint32 codecID,
+TMSIPUplink* TMSIPUplink::NewL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
-    TMSVoIPUplink* self = new (ELeave) TMSVoIPUplink();
+    TMSIPUplink* self = new (ELeave) TMSIPUplink();
     CleanupStack::PushL(self);
     self->ConstructL(codecID, priority);
     CleanupStack::Pop(self);
@@ -218,11 +218,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::ConstructL
+// TMSIPUplink::ConstructL
 // Part two of Symbian two phase construction
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::ConstructL(const guint32 codecID,
+void TMSIPUplink::ConstructL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -248,11 +248,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::Start
+// TMSIPUplink::Start
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::Start()
+void TMSIPUplink::Start()
     {
     TRACE_PRN_FN_ENT;
 
@@ -263,11 +263,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::Stop
+// TMSIPUplink::Stop
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::Stop()
+void TMSIPUplink::Stop()
     {
     TRACE_PRN_FN_ENT;
 
@@ -296,11 +296,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::BufferToBeEmptied
+// TMSIPUplink::BufferToBeEmptied
 // From MDevSoundObserver
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::BufferToBeEmptied()
+void TMSIPUplink::BufferToBeEmptied()
     {
     TInt buflen = GST_BUFFER_SIZE(gstUplBuffer);
     TRACE_PRN_N1(_L("TMS->UPL: BTBE->LEN [%d]"), buflen);
@@ -345,32 +345,32 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::BufferEmptied
+// TMSIPUplink::BufferEmptied
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::BufferEmptied()
+void TMSIPUplink::BufferEmptied()
     {
     //TRACE_PRN_N(_L("TMS->UPL->BE"));
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetCodecCi
+// TMSIPUplink::SetCodecCi
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetCodecCi()
+gint TMSIPUplink::SetCodecCi()
     {
     TRAPD(err, SetCodecCiL());
     return err;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetCodecCiL
+// TMSIPUplink::SetCodecCiL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::SetCodecCiL()
+void TMSIPUplink::SetCodecCiL()
     {
     TRACE_PRN_FN_ENT;
 
@@ -420,11 +420,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetGain
+// TMSIPUplink::SetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetGain(const guint gain)
+gint TMSIPUplink::SetGain(const guint gain)
     {
     g_object_set(G_OBJECT(iSource), "gain", gain, NULL);
     TRACE_PRN_N1(_L("TMS->UPL: SetGain [%d]"), gain);
@@ -432,11 +432,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetGain
+// TMSIPUplink::GetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetGain(guint& gain)
+gint TMSIPUplink::GetGain(guint& gain)
     {
     g_object_get(G_OBJECT(iSource), "gain", &gain, NULL);
     TRACE_PRN_N1(_L("TMS->UPL: GetGain [%d]"), gain);
@@ -444,11 +444,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetMaxGain
+// TMSIPUplink::GetMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetMaxGain(guint& gain)
+gint TMSIPUplink::GetMaxGain(guint& gain)
     {
     g_object_get(G_OBJECT(iSource), "maxgain", &gain, NULL);
     TRACE_PRN_N1(_L("TMS->UPL: MaxGain [%d]"), gain);
@@ -456,11 +456,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetDataXferChunkHndl
+// TMSIPUplink::GetDataXferChunkHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
+gint TMSIPUplink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
     {
     gint status = TMS_RESULT_SUCCESS;
 
@@ -482,11 +482,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetIlbcCodecMode
+// TMSIPUplink::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetIlbcCodecMode(const gint mode)
+gint TMSIPUplink::SetIlbcCodecMode(const gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -514,11 +514,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetIlbcCodecMode
+// TMSIPUplink::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetIlbcCodecMode(gint& mode)
+gint TMSIPUplink::GetIlbcCodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iILBCEncodeMode;
@@ -527,11 +527,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetG711CodecMode
+// TMSIPUplink::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetG711CodecMode(const gint mode)
+gint TMSIPUplink::SetG711CodecMode(const gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -559,11 +559,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetG711CodecMode
+// TMSIPUplink::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetG711CodecMode(gint& mode)
+gint TMSIPUplink::GetG711CodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iG711EncodeMode;
@@ -572,11 +572,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetSupportedBitrates
+// TMSIPUplink::GetSupportedBitrates
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetSupportedBitrates(RArray<guint>& bitrates)
+gint TMSIPUplink::GetSupportedBitrates(RArray<guint>& bitrates)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
     bitrates.Reset();
@@ -604,11 +604,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetBitrate
+// TMSIPUplink::SetBitrate
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetBitrate(guint bitrate)
+gint TMSIPUplink::SetBitrate(guint bitrate)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -623,11 +623,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetBitrate
+// TMSIPUplink::GetBitrate
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetBitrate(guint& bitrate)
+gint TMSIPUplink::GetBitrate(guint& bitrate)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -642,11 +642,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetVad
+// TMSIPUplink::SetVad
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetVad(const TMSFormatType fmttype, const gboolean vad)
+gint TMSIPUplink::SetVad(const TMSFormatType fmttype, const gboolean vad)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -699,11 +699,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetVad
+// TMSIPUplink::GetVad
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetVad(const TMSFormatType fmttype, gboolean& vad)
+gint TMSIPUplink::GetVad(const TMSFormatType fmttype, gboolean& vad)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
--- a/mmserv/tms/tmscallserver/src/ipcalluplinkds.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/ipcalluplinkds.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -27,20 +27,20 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::TMSVoIPUplink
+// TMSIPUplink::TMSIPUplink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink::TMSVoIPUplink()
+TMSIPUplink::TMSIPUplink()
     {
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::~TMSVoIPUplink
+// TMSIPUplink::~TMSIPUplink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink::~TMSVoIPUplink()
+TMSIPUplink::~TMSIPUplink()
     {
     TRACE_PRN_FN_ENT;
 
@@ -55,14 +55,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::NewL
+// TMSIPUplink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPUplink* TMSVoIPUplink::NewL(const guint32 codecID,
+TMSIPUplink* TMSIPUplink::NewL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
-    TMSVoIPUplink* self = new (ELeave) TMSVoIPUplink();
+    TMSIPUplink* self = new (ELeave) TMSIPUplink();
     CleanupStack::PushL(self);
     self->ConstructL(codecID, priority);
     CleanupStack::Pop(self);
@@ -70,11 +70,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::ConstructL
+// TMSIPUplink::ConstructL
 // Part two of Symbian two phase construction
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::ConstructL(const guint32 codecID,
+void TMSIPUplink::ConstructL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -98,11 +98,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::Start
+// TMSIPUplink::Start
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::Start()
+void TMSIPUplink::Start()
     {
     TRACE_PRN_FN_ENT;
 
@@ -131,11 +131,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::Stop
+// TMSIPUplink::Stop
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::Stop()
+void TMSIPUplink::Stop()
     {
     TRACE_PRN_FN_ENT;
 
@@ -152,11 +152,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::BufferToBeEmptied
+// TMSIPUplink::BufferToBeEmptied
 // From MDevSoundObserver
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::BufferToBeEmptied(CMMFBuffer* aBuffer)
+void TMSIPUplink::BufferToBeEmptied(CMMFBuffer* aBuffer)
     {
     iDevSoundBufPtr = static_cast<CMMFDataBuffer*> (aBuffer);
     TDes8& data = iDevSoundBufPtr->Data();
@@ -201,11 +201,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::BufferEmptied
+// TMSIPUplink::BufferEmptied
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::BufferEmptied()
+void TMSIPUplink::BufferEmptied()
     {
     //TRACE_PRN_N(_L("TMS->UPL->BE"));
     if (iDevSound)
@@ -215,22 +215,22 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetCodecCi
+// TMSIPUplink::SetCodecCi
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetCodecCi()
+gint TMSIPUplink::SetCodecCi()
     {
     TRAPD(err, SetCodecCiL());
     return err;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetCodecCiL
+// TMSIPUplink::SetCodecCiL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::SetCodecCiL()
+void TMSIPUplink::SetCodecCiL()
     {
     TRACE_PRN_FN_ENT;
 
@@ -281,11 +281,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetGain
+// TMSIPUplink::SetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetGain(const guint gain)
+gint TMSIPUplink::SetGain(const guint gain)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -298,11 +298,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetGain
+// TMSIPUplink::GetGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetGain(guint& gain)
+gint TMSIPUplink::GetGain(guint& gain)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -315,11 +315,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetMaxGain
+// TMSIPUplink::GetMaxGain
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetMaxGain(guint& gain)
+gint TMSIPUplink::GetMaxGain(guint& gain)
     {
     gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
     if (iDevSound)
@@ -332,11 +332,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetDataXferChunkHndl
+// TMSIPUplink::GetDataXferChunkHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
+gint TMSIPUplink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
     {
     gint status = TMS_RESULT_SUCCESS;
 
@@ -358,11 +358,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetIlbcCodecMode
+// TMSIPUplink::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetIlbcCodecMode(const gint mode)
+gint TMSIPUplink::SetIlbcCodecMode(const gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -392,11 +392,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetIlbcCodecMode
+// TMSIPUplink::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetIlbcCodecMode(gint& mode)
+gint TMSIPUplink::GetIlbcCodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iILBCEncodeMode;
@@ -405,11 +405,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetG711CodecMode
+// TMSIPUplink::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetG711CodecMode(const gint mode)
+gint TMSIPUplink::SetG711CodecMode(const gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -439,11 +439,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetG711CodecMode
+// TMSIPUplink::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetG711CodecMode(gint& mode)
+gint TMSIPUplink::GetG711CodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iG711EncodeMode;
@@ -452,11 +452,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetSupportedBitrates
+// TMSIPUplink::GetSupportedBitrates
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetSupportedBitrates(RArray<guint>& bitrates)
+gint TMSIPUplink::GetSupportedBitrates(RArray<guint>& bitrates)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
     bitrates.Reset();
@@ -471,11 +471,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetBitrate
+// TMSIPUplink::SetBitrate
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetBitrate(guint bitrate)
+gint TMSIPUplink::SetBitrate(guint bitrate)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -490,11 +490,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetBitrate
+// TMSIPUplink::GetBitrate
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetBitrate(guint& bitrate)
+gint TMSIPUplink::GetBitrate(guint& bitrate)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -509,11 +509,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::SetVad
+// TMSIPUplink::SetVad
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::SetVad(const TMSFormatType fmttype, const gboolean vad)
+gint TMSIPUplink::SetVad(const TMSFormatType fmttype, const gboolean vad)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -566,11 +566,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::GetVad
+// TMSIPUplink::GetVad
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPUplink::GetVad(const TMSFormatType fmttype, gboolean& vad)
+gint TMSIPUplink::GetVad(const TMSFormatType fmttype, gboolean& vad)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -623,14 +623,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::InitializeComplete
+// TMSIPUplink::InitializeComplete
 // A callback from the DevSound indicating completion of the initialization.
 // It will send config data to the D/S and configure the encoder via CI.
 // If everything goes well, the state of the thread is set EReady.
 // The initialization completion message is sent back to the main thread.
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::InitializeComplete(TInt aError)
+void TMSIPUplink::InitializeComplete(TInt aError)
     {
     TRACE_PRN_FN_ENT;
 
@@ -668,13 +668,13 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPUplink::RecordError
+// TMSIPUplink::RecordError
 // From MDevSoundObserver
 // Recording error is send to the main thread.
 // The state of recorder is rolled back to EReady.
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPUplink::RecordError(TInt /*aError*/)
+void TMSIPUplink::RecordError(TInt /*aError*/)
     {
     //TRACE_PRN_IF_ERR(aError);
 
--- a/mmserv/tms/tmscallserver/src/tarsettings.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/tarsettings.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -27,21 +27,21 @@
 _LIT_SECURITY_POLICY_C1(KTMSServerWritePolicy, ECapabilityWriteUserData);
 
 // -----------------------------------------------------------------------------
-// TarSettings::TarSettings
+// TMSTarSettings::TMSTarSettings
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-TarSettings::TarSettings()
+TMSTarSettings::TMSTarSettings()
     {
     }
 
 // -----------------------------------------------------------------------------
-// TarSettings::ConstructL
+// TMSTarSettings::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void TarSettings::ConstructL()
+void TMSTarSettings::ConstructL()
     {
     TRACE_PRN_FN_ENT;
     TInt err = RProperty::Define(ERoutingPs, RProperty::EByteArray,
@@ -56,13 +56,13 @@
     }
 
 // -----------------------------------------------------------------------------
-// TarSettings::NewL
+// TMSTarSettings::NewL
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-TarSettings* TarSettings::NewL()
+TMSTarSettings* TMSTarSettings::NewL()
     {
-    TarSettings* self = new (ELeave) TarSettings();
+    TMSTarSettings* self = new (ELeave) TMSTarSettings();
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -70,19 +70,19 @@
     }
 
 // Destructor
-TarSettings::~TarSettings()
+TMSTarSettings::~TMSTarSettings()
     {
     TRACE_PRN_FN_ENT;
     TInt err = RProperty::Delete(KTMSPropertyCategory, ERoutingPs);
-    TRACE_PRN_N1(_L("TarSetting::~TarSettings err:%d"),err);
+    TRACE_PRN_N1(_L("TarSetting::~TMSTarSettings err:%d"),err);
     TRACE_PRN_FN_ENT;
     }
 
 // -----------------------------------------------------------------------------
-// TarSettings::SetVolume
+// TMSTarSettings::SetVolume
 // -----------------------------------------------------------------------------
 //
-void TarSettings::SetTar(TRoutingMsgBufPckg rountingpckg, TBool aPublish)
+void TMSTarSettings::SetTar(TRoutingMsgBufPckg rountingpckg, TBool aPublish)
     {
     TRACE_PRN_FN_ENT;
     //    TInt err(KErrNone);
--- a/mmserv/tms/tmscallserver/src/tmscallsession.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmscallserver/src/tmscallsession.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -244,7 +244,7 @@
         {
         // Get Call type
         gint callType = aMessage.Int0();
-        status = CallAdpt::CreateCallL(callType, iCallAdpt);
+        status = TMSCallAdpt::CreateCallL(callType, iCallAdpt);
         }
     aMessage.Complete(status);
     TRACE_PRN_FN_EXT;
--- a/mmserv/tms/tmsimpl/inc/tmsstreambodyimpl.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/inc/tmsstreambodyimpl.h	Sun Mar 14 13:11:51 2010 +0000
@@ -83,7 +83,7 @@
 
     gint CreateQueue(const gint aNumSlots);
     void ReceiveMsgQHandlerEventsL();
-    
+
     gint ValidateStream();
     gint ValidateSource(TMSSource* source);
     gint ValidateSink(TMSSink* sink);
@@ -102,7 +102,7 @@
 
     // Message queue and the handler
     RMsgQueue<TmsMsgBuf> iMsgQueue;
-    CQueueHandler* iMsgQHandler;
+    TMSQueueHandler* iMsgQHandler;
 
     // Need to make this a list
     TMSStreamObserver* iObserver;
--- a/mmserv/tms/tmsimpl/src/tmsamrbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsamrbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -74,7 +74,7 @@
         iProxy = context->CallProxy;
         iStreamType = context->StreamType;
         TMSFormatBodyImpl::SetProxy(iProxy, queuehandler);
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_AMR);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_AMR);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsclientsinkbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsclientsinkbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -120,7 +120,7 @@
     iProxy = aProxy;
     if (queuehandler)
         {
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_CLIENT);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_CLIENT);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsclientsourcebodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsclientsourcebodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -161,7 +161,7 @@
     {
     iProxy = aProxy;
     iStreamId = strmid;
-    ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_CLIENT);
+    ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_CLIENT);
     }
 
 void TMSClientSourceBodyImpl::QueueEvent(TInt aEventType, TInt aError,
--- a/mmserv/tms/tmsimpl/src/tmsformatbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsformatbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -77,7 +77,7 @@
 void TMSFormatBodyImpl::SetProxy(TMSCallProxy* aProxy, gpointer /*queuehandler*/)
     {
     iProxy = aProxy;
-    //  ((CQueueHandler*)queuehandler)->AddObserver(*this,TMS_FORMAT_TYPE);
+    //  ((TMSQueueHandler*)queuehandler)->AddObserver(*this,TMS_FORMAT_TYPE);
     }
 
 // End of file
--- a/mmserv/tms/tmsimpl/src/tmsg711bodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsg711bodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -154,7 +154,7 @@
         iProxy = context->CallProxy;
         iStreamType = context->StreamType;
         TMSFormatBodyImpl::SetProxy(iProxy, queuehandler);
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_G711);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_G711);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsg729bodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsg729bodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -94,7 +94,7 @@
         iProxy = context->CallProxy;
         iStreamType = context->StreamType;
         TMSFormatBodyImpl::SetProxy(iProxy, queuehandler);
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_G729);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_G729);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsgaineffectbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsgaineffectbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -163,7 +163,7 @@
         gpointer queuehandler)
     {
     iProxy = aProxy;
-    ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_EFFECT_GAIN);
+    ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_EFFECT_GAIN);
     }
 
 void TMSGainEffectBodyImpl::QueueEvent(TInt aEventType, TInt aError,
--- a/mmserv/tms/tmsimpl/src/tmsilbcbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsilbcbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -134,7 +134,7 @@
         iProxy = context->CallProxy;
         iStreamType = context->StreamType;
         TMSFormatBodyImpl::SetProxy(iProxy, queuehandler);
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_ILBC);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_ILBC);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsmicsourcebodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsmicsourcebodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -64,7 +64,7 @@
         gpointer /*queuehandler*/)
     {
     iProxy = aProxy;
-    //((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_MIC);
+    //((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_MIC);
     }
 
 // End of file
--- a/mmserv/tms/tmsimpl/src/tmsmodemsinkbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsmodemsinkbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -64,7 +64,7 @@
         gpointer /*queuehandler*/)
     {
     iProxy = aProxy;
-    //((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_MODEM);
+    //((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_MODEM);
     }
 
 // End of file
--- a/mmserv/tms/tmsimpl/src/tmsmodemsourcebodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsmodemsourcebodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -64,7 +64,7 @@
         gpointer /*queuehandler*/)
     {
     iProxy = aProxy;
-    //((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_MODEM);
+    //((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SOURCE_MODEM);
     }
 
 // End of file
--- a/mmserv/tms/tmsimpl/src/tmspcmbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmspcmbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -74,7 +74,7 @@
         iProxy = context->CallProxy;
         iStreamType = context->StreamType;
         TMSFormatBodyImpl::SetProxy(iProxy, queuehandler);
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_PCM);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_FORMAT_PCM);
         }
     }
 
--- a/mmserv/tms/tmsimpl/src/tmsqueuehandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsqueuehandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -26,36 +26,36 @@
 
 using namespace TMS;
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::NewL
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::NewL
 // Symbian constructor
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CQueueHandler* CQueueHandler::NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+TMSQueueHandler* TMSQueueHandler::NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
         TMSGlobalContext* glblCtx)
     {
-    CQueueHandler* self = new (ELeave) CQueueHandler(aMsgQueue, glblCtx);
+    TMSQueueHandler* self = new (ELeave) TMSQueueHandler(aMsgQueue, glblCtx);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
     return self;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::ConstructL
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::ConstructL
 // Second phase constructor.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::ConstructL()
+void TMSQueueHandler::ConstructL()
     {
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::~CQueueHandler
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::~TMSQueueHandler
 // Destructor.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CQueueHandler::~CQueueHandler()
+TMSQueueHandler::~TMSQueueHandler()
     {
     Cancel();
     iObserversList.Reset();
@@ -64,12 +64,12 @@
     delete iBuffer;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::CQueueHandler
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::TMSQueueHandler
 // Constructor.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CQueueHandler::CQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+TMSQueueHandler::TMSQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
         TMSGlobalContext* glblCtx) :
     CActive(CActive::EPriorityStandard),
     iMsgQueue(aMsgQueue),
@@ -79,25 +79,31 @@
     iTMSGlobalContext = glblCtx;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::Start
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::Start
 // Start listening for events on queue 0.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::Start()
+void TMSQueueHandler::Start()
     {
     if (!IsActive() && iMsgQueue)
         {
+        iStatus = KRequestPending;
         iMsgQueue->NotifyDataAvailable(iStatus);
         SetActive();
         }
     }
 
-TInt CQueueHandler::AddObserver(MQueueHandlerObserver& aObserver,
-        TInt aClientId)
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::AddObserver
+//
+// -----------------------------------------------------------------------------
+//
+gint TMSQueueHandler::AddObserver(MQueueHandlerObserver& aObserver,
+        gint aClientId)
     {
     // Add to list if observer is not already added
-    TInt status = iObserversList.Find(&aObserver);
+    gint status = iObserversList.Find(&aObserver);
     if (status == KErrNotFound)
         {
         status = iObserversList.Append(&aObserver);
@@ -105,37 +111,41 @@
         }
     else
         {
-        status = KErrAlreadyExists;
+        status = TMS_RESULT_ALREADY_EXIST;
         }
     return status;
     }
 
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::RemoveObserver
 // Marks observer as inactive in the list
-TInt CQueueHandler::RemoveObserver(MQueueHandlerObserver& aObserver)
+// -----------------------------------------------------------------------------
+//
+gint TMSQueueHandler::RemoveObserver(MQueueHandlerObserver& aObserver)
     {
-    TInt status(KErrNone);
-    TInt index = iObserversList.Find(&aObserver);
+    gint status(TMS_RESULT_SUCCESS);
+    gint index = iObserversList.Find(&aObserver);
     // If found status has index to observer in the array
     // else it would contain KErrNotFound
     if (index >= 0)
         {
         iObserversList.Remove(index);
         iClientList.Remove(index);
-        status = KErrNone;
+        status = TMS_RESULT_SUCCESS;
         }
     else
         {
-        status = KErrNotFound;
+        status = TMS_RESULT_DOES_NOT_EXIST;
         }
     return status;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::DoCancel
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::DoCancel
 // Cancel outstanding request
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::DoCancel()
+void TMSQueueHandler::DoCancel()
     {
     if (iMsgQueue)
         {
@@ -143,15 +153,15 @@
         }
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::RunL
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::RunL
 // Process requests.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::RunL()
+void TMSQueueHandler::RunL()
     {
     TmsMsgBuf msgBuf;
-    TInt err = KErrNone;
+    gint err = TMS_RESULT_SUCCESS;
 
     if (iMsgQueue)
         {
@@ -159,14 +169,14 @@
         }
     else
         {
-        err = KErrGeneral;
+        err = TMS_RESULT_INVALID_STATE;
         }
 
-    // Start monitoring for more events before calling the observer as client
-    // may decide to destroy us before this RunL completes executing.
+    // Start monitoring for more events before calling the observer in case
+    // client decides to destroy us before this RunL completes executing.
     Start();
 
-    if (err == KErrNone)
+    if (err == TMS_RESULT_SUCCESS)
         {
         switch (msgBuf.iRequest)
             {
@@ -179,7 +189,7 @@
             case ECmdDownlinkPaused:
             case ECmdUplinkPaused:
                 {
-                TInt index = FindStreamInList();
+                gint index = FindStreamInList();
                 if (index != KErrNotFound)
                     {
                     TMSStreamState streamstate = ConvertToStreamState(
@@ -190,7 +200,7 @@
                 else
                     {
                     // This should never happen
-                    err = KErrNotFound;
+                    err = TMS_RESULT_DOES_NOT_EXIST;
                     }
                 break;
                 }
@@ -226,21 +236,22 @@
                 }
             case ECmdSetGain:
                 {
-                TInt index = FindGainEffectInList();
+                gint index = FindGainEffectInList();
                 if (index != KErrNotFound)
                     {
-                    iObserversList[index]->QueueEvent(TMS_EVENT_EFFECT_GAIN_CHANGED,
-                            msgBuf.iStatus, NULL);
+                    iObserversList[index]->QueueEvent(
+                            TMS_EVENT_EFFECT_GAIN_CHANGED, msgBuf.iStatus,
+                            NULL);
                     }
                 }
                 break;
             case ECmdSetVolume:
                 {
-                TInt index = FindVolEffectInList();
+                gint index = FindVolEffectInList();
                 if (index != KErrNotFound)
                     {
-                    iObserversList[index]->QueueEvent(TMS_EVENT_EFFECT_VOL_CHANGED,
-                            msgBuf.iStatus, NULL);
+                    iObserversList[index]->QueueEvent(
+                            TMS_EVENT_EFFECT_VOL_CHANGED, msgBuf.iStatus, NULL);
                     }
                 }
                 break;
@@ -250,15 +261,15 @@
         }
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::DoFillBuffer
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::DoFillBuffer
 //
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::DoFillBuffer(TInt aBufLen, TInt aStatus,
-        TBool aOpenChunk, TUint32 key)
+void TMSQueueHandler::DoFillBuffer(gint aBufLen, gint aStatus,
+        gboolean aOpenChunk, guint32 key)
     {
-    TInt err = KErrNone;
+    gint err = TMS_RESULT_SUCCESS;
 
     // See if chunk needs to be opened
     if (aOpenChunk)
@@ -271,8 +282,8 @@
         iBuffer = NULL;
 
         // Get handle to chunk from proxy
-        TInt hndl(0);
-        err = KErrNotReady;
+        gint hndl(0);
+        err = TMS_RESULT_NULL_ARGUMENT;
         if (iTMSGlobalContext->CallProxy)
             {
             hndl = (iTMSGlobalContext->CallProxy)->GetDataXferChunkHandle(
@@ -284,7 +295,7 @@
             }
         }
 
-    if (err == KErrNone)
+    if (err == TMS_RESULT_SUCCESS)
         {
         iChunkDataPtr.Set(iChunk.Base(), 0, aBufLen);
         if (!iBuffer)
@@ -294,7 +305,7 @@
             }
         iBuffer->SetDataSize(aBufLen);
 
-        TInt index = iClientList.Find(TMS_SOURCE_CLIENT);
+        gint index = iClientList.Find(TMS_SOURCE_CLIENT);
         if (index != KErrNotFound)
             {
             iObserversList[index]->QueueEvent(
@@ -302,7 +313,7 @@
             }
         else
             {
-            err = KErrNotFound;
+            err = TMS_RESULT_DOES_NOT_EXIST;
             }
         }
     else
@@ -311,15 +322,15 @@
         }
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::DoEmptyBuffer
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::DoEmptyBuffer
 //
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CQueueHandler::DoEmptyBuffer(TInt aBufLen, TInt aStatus,
-        TBool aOpenChunk, TUint32 key)
+void TMSQueueHandler::DoEmptyBuffer(gint aBufLen, gint aStatus,
+        gboolean aOpenChunk, guint32 key)
     {
-    TInt err(KErrNone);
+    gint err(TMS_RESULT_SUCCESS);
 
     // See if chunk needs to be opened
     if (aOpenChunk)
@@ -330,8 +341,8 @@
             }
 
         // Get handle to chunk from proxy
-        TInt hndl(0);
-        err = KErrNotReady;
+        gint hndl(0);
+        err = TMS_RESULT_NULL_ARGUMENT;
         if (iTMSGlobalContext->CallProxy)
             {
             hndl = (iTMSGlobalContext->CallProxy)->GetDataXferChunkHandle(
@@ -346,7 +357,7 @@
         iBuffer = NULL;
         }
 
-    if (err == KErrNone)
+    if (err == TMS_RESULT_SUCCESS)
         {
         iChunkDataPtr.Set(iChunk.Base(), aBufLen, aBufLen);
         if (!iBuffer)
@@ -355,7 +366,7 @@
                     const_cast<guint8*> (iChunkDataPtr.Ptr()), iBuffer);
             }
         iBuffer->SetDataSize(aBufLen);
-        TInt index = iClientList.Find(TMS_SINK_CLIENT);
+        gint index = iClientList.Find(TMS_SINK_CLIENT);
         if (index != KErrNotFound)
             {
             iObserversList[index]->QueueEvent(
@@ -363,7 +374,7 @@
             }
         else
             {
-            err = KErrNotFound;
+            err = TMS_RESULT_DOES_NOT_EXIST;
             }
         }
     else
@@ -372,12 +383,12 @@
         }
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::ConvertToStreamState
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::ConvertToStreamState
 //
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TMSStreamState CQueueHandler::ConvertToStreamState(TInt request)
+TMSStreamState TMSQueueHandler::ConvertToStreamState(gint request)
     {
     TMSStreamState state = TMS_STREAM_UNINITIALIZED;
     switch (request)
@@ -404,62 +415,61 @@
     return state;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::RunError
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::RunError
 // Process requests.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TInt CQueueHandler::RunError(TInt /*aError*/)
+TInt TMSQueueHandler::RunError(TInt /*aError*/)
     {
     // Current implementation of RunL does not leave
-    return 0;
+    return TMS_RESULT_SUCCESS;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::Status
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::Status
 // Return request status.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TRequestStatus* CQueueHandler::Status()
+TRequestStatus* TMSQueueHandler::Status()
     {
     return &iStatus;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::FindStreamInList
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::FindStreamInList
 // Return stream index.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TInt CQueueHandler::FindStreamInList()
+gint TMSQueueHandler::FindStreamInList()
     {
     gint index(-1);
     index = iClientList.Find(TMS_STREAM_UPLINK);
     if (index == KErrNotFound)
         {
         index = iClientList.Find(TMS_STREAM_DOWNLINK);
-        return index;
         }
     return index;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::FindGainEffectInList
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::FindGainEffectInList
 // Return effect index.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TInt CQueueHandler::FindGainEffectInList()
+gint TMSQueueHandler::FindGainEffectInList()
     {
     gint index(-1);
     index = iClientList.Find(TMS_EFFECT_GAIN);
     return index;
     }
 
-// ----------------------------------------------------------------------------
-// CQueueHandler::FindVolEffectInList
+// -----------------------------------------------------------------------------
+// TMSQueueHandler::FindVolEffectInList
 // Return effect index.
-// ----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TInt CQueueHandler::FindVolEffectInList()
+gint TMSQueueHandler::FindVolEffectInList()
     {
     gint index(-1);
     index = iClientList.Find(TMS_EFFECT_VOLUME);
--- a/mmserv/tms/tmsimpl/src/tmsspeakersinkbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsspeakersinkbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -64,7 +64,7 @@
         gpointer /*queuehandler*/)
     {
     iProxy = aProxy;
-    //((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_SPEAKER);
+    //((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_SINK_SPEAKER);
     }
 
 // End of file
--- a/mmserv/tms/tmsimpl/src/tmsstreambodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsstreambodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -705,7 +705,7 @@
         }
     else
         {
-        iMsgQHandler = CQueueHandler::NewL(&iMsgQueue, &iContext);
+        iMsgQHandler = TMSQueueHandler::NewL(&iMsgQueue, &iContext);
         iMsgQHandler->AddObserver(*this, iContext.StreamType);
         }
 
--- a/mmserv/tms/tmsimpl/src/tmsvolumeeffectbodyimpl.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsimpl/src/tmsvolumeeffectbodyimpl.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -150,7 +150,7 @@
     iProxy = aProxy;
     if (queuehandler)
         {
-        ((CQueueHandler*) queuehandler)->AddObserver(*this, TMS_EFFECT_VOLUME);
+        ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_EFFECT_VOLUME);
         }
     }
 
--- a/mmserv/tms/tmsproxy/src/tmsproxy.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsproxy/src/tmsproxy.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -165,8 +165,8 @@
 //
 EXPORT_C TVersion TMSProxy::Version() const
     {
-    return (TVersion(KTMSServMajorVersionNumber,
-            KTMSServMinorVersionNumber, KTMSServBuildVersionNumber));
+    return (TVersion(KTMSServMajorVersionNumber, KTMSServMinorVersionNumber,
+            KTMSServBuildVersionNumber));
     }
 
 // -----------------------------------------------------------------------------
@@ -442,11 +442,11 @@
         case EMsgQueueGlobalVolumeType:
         case EMsgQueueGlobalGainType:
             status = AddGlobalEffectObserver((*(TMSEffectObserver*) obsrv),
-                    (*(TMSEffect*)parent), clientid);
+                    (*(TMSEffect*) parent), clientid);
             break;
         case EMsgQueueGlobalRoutingType:
             status = AddRoutingObserver((*(TMSGlobalRoutingObserver*) obsrv),
-                    (*(TMSGlobalRouting*)parent), clientid);
+                    (*(TMSGlobalRouting*) parent), clientid);
             break;
         default:
             status = TMS_RESULT_INVALID_ARGUMENT;
@@ -612,7 +612,7 @@
         }
     else
         {
-        iMsgQHandler = CQueueHandler::NewL(&iMsgQueue, NULL);
+        iMsgQHandler = TMSQueueHandler::NewL(&iMsgQueue, NULL);
         iMsgQHandler->AddObserver(*this, -1);
         }
     iMsgQHandler->Start();
@@ -653,8 +653,8 @@
                 }
             for (gint i = 0; i < iRoutingObsrvrList.Count(); i++)
                 {
-                iRoutingObsrvrList[i]->GlobalRoutingEvent(iRoutingParentList[i],
-                        event, output);
+                iRoutingObsrvrList[i]->GlobalRoutingEvent(
+                        iRoutingParentList[i], event, output);
                 }
             break;
             }
--- a/mmserv/tms/tmsproxy/src/tmsqueuehandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsproxy/src/tmsqueuehandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -27,14 +27,14 @@
 using namespace TMS;
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::NewL
+// TMSQueueHandler::NewL
 // Symbian constructor
 // ----------------------------------------------------------------------------
 //
-CQueueHandler* CQueueHandler::NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+TMSQueueHandler* TMSQueueHandler::NewL(RMsgQueue<TmsMsgBuf>* aMsgQueue,
         TMSGlobalContext* glblCtx)
     {
-    CQueueHandler* self = new (ELeave) CQueueHandler(aMsgQueue, glblCtx);
+    TMSQueueHandler* self = new (ELeave) TMSQueueHandler(aMsgQueue, glblCtx);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -42,21 +42,21 @@
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::ConstructL
+// TMSQueueHandler::ConstructL
 // Second phase constructor.
 // ----------------------------------------------------------------------------
 //
-void CQueueHandler::ConstructL()
+void TMSQueueHandler::ConstructL()
     {
     iObserver = NULL;
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::~CQueueHandler
+// TMSQueueHandler::~TMSQueueHandler
 // Destructor.
 // ----------------------------------------------------------------------------
 //
-CQueueHandler::~CQueueHandler()
+TMSQueueHandler::~TMSQueueHandler()
     {
     Cancel();
     if (iMsgQueue->Handle() > 0)
@@ -71,11 +71,11 @@
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::CQueueHandler
+// TMSQueueHandler::TMSQueueHandler
 // Constructor.
 // ----------------------------------------------------------------------------
 //
-CQueueHandler::CQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
+TMSQueueHandler::TMSQueueHandler(RMsgQueue<TmsMsgBuf>* aMsgQueue,
         TMSGlobalContext* glblCtx) :
     CActive(CActive::EPriorityStandard),
     iMsgQueue(aMsgQueue),
@@ -86,28 +86,29 @@
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::Start
+// TMSQueueHandler::Start
 // Start listening for events on queue 0.
 // ----------------------------------------------------------------------------
 //
-void CQueueHandler::Start()
+void TMSQueueHandler::Start()
     {
-    if (!IsActive())
+    if (!IsActive() && iMsgQueue)
         {
+        iStatus = KRequestPending;
         iMsgQueue->NotifyDataAvailable(iStatus);
         SetActive();
         }
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::AddObserver
+// TMSQueueHandler::AddObserver
 //
 // ----------------------------------------------------------------------------
 //
-TInt CQueueHandler::AddObserver(MQueueHandlerObserver& aObserver,
-        TInt /*aClientId*/)
+gint TMSQueueHandler::AddObserver(MQueueHandlerObserver& aObserver,
+        gint /*aClientId*/)
     {
-    TInt status = KErrNone;
+    gint status = TMS_RESULT_SUCCESS;
 
     if (iObserver == NULL)
         {
@@ -115,42 +116,54 @@
         }
     else
         {
-        status = KErrAlreadyExists;
+        status = TMS_RESULT_ALREADY_EXIST;
         }
     return status;
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::AddObserver
+// TMSQueueHandler::RemoveObserver
 // Marks observer as inactive in the list
 // ----------------------------------------------------------------------------
 //
-TInt CQueueHandler::RemoveObserver(MQueueHandlerObserver& /*aObserver*/)
+gint TMSQueueHandler::RemoveObserver(MQueueHandlerObserver& /*aObserver*/)
     {
     iObserver = NULL;
-    return KErrNone;
+    return TMS_RESULT_SUCCESS;
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::DoCancel
+// TMSQueueHandler::DoCancel
 // Cancel outstanding request
 // ----------------------------------------------------------------------------
 //
-void CQueueHandler::DoCancel()
+void TMSQueueHandler::DoCancel()
     {
-    iMsgQueue->CancelDataAvailable();
+    if (iMsgQueue)
+        {
+        iMsgQueue->CancelDataAvailable();
+        }
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::RunL
+// TMSQueueHandler::RunL
 // Process requests.
 // ----------------------------------------------------------------------------
 //
-void CQueueHandler::RunL()
+void TMSQueueHandler::RunL()
     {
     TmsMsgBuf msgBuf;
-    TInt err = iMsgQueue->Receive(msgBuf);
+    gint err = TMS_RESULT_SUCCESS;
 
+    if (iMsgQueue)
+        {
+        iMsgQueue->Receive(msgBuf);
+        }
+    else
+        {
+        err = TMS_RESULT_INVALID_STATE;
+        }
+        
     // Start monitoring for more events before calling the observer in case
     // client decides to destroy us before this RunL completes executing.
     Start();
@@ -160,7 +173,7 @@
         return;
         }
 
-    if (err == KErrNone)
+    if (err == TMS_RESULT_SUCCESS)
         {
         switch (msgBuf.iRequest)
             {
@@ -179,15 +192,6 @@
                 iObserver->QueueEvent(msgBuf.iInt, msgBuf.iStatus,
                         &msgBuf.iUint);
                 break;
-            case ECmdDTMFOpenDnlinkComplete:
-            case ECmdDTMFOpenUplinkComplete:
-                iObserver->QueueEvent(TMS_EVENT_DTMF_TONE_STARTED,
-                        msgBuf.iStatus, NULL);
-                break;
-            case ECmdDTMFTonePlayFinished:
-                iObserver->QueueEvent(TMS_EVENT_DTMF_TONE_STOPPED,
-                        msgBuf.iStatus, NULL);
-                break;
             default:
                 break;
             }
@@ -195,22 +199,22 @@
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::RunError
+// TMSQueueHandler::RunError
 // Process requests.
 // ----------------------------------------------------------------------------
 //
-TInt CQueueHandler::RunError(TInt /*aError*/)
+TInt TMSQueueHandler::RunError(TInt /*aError*/)
     {
     // Current implementation of RunL does not leave
-    return 0;
+    return TMS_RESULT_SUCCESS;
     }
 
 // ----------------------------------------------------------------------------
-// CQueueHandler::Status
+// TMSQueueHandler::Status
 // Return request status.
 // ----------------------------------------------------------------------------
 //
-TRequestStatus* CQueueHandler::Status()
+TRequestStatus* TMSQueueHandler::Status()
     {
     return &iStatus;
     }
Binary file mmserv/tms/tmsserver/conf/tmseffectscenrep.confml has changed
Binary file mmserv/tms/tmsserver/conf/tmseffectscenrep_10207c80.crml has changed
--- a/mmserv/tms/tmsserver/inc/cspaudiohandler.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/cspaudiohandler.h	Sun Mar 14 13:11:51 2010 +0000
@@ -11,30 +11,29 @@
  *
  * Contributors:
  *
- * Description:  Declarations for class CSPAudioHandler
+ * Description:  Declarations for class TMSCenRepAudioHandler
  *
  */
 
 #ifndef CSPAUDIOHANDLER_H
 #define CSPAUDIOHANDLER_H
 
-#include <e32base.h>
 #include <sounddevice.h>
 
 #include "mcspcenrepobserver.h"
 #include "tmsserver.h"
 
 namespace TMS {
-class CSPPubSubListener;
-class CSPCenRepListener;
-class CSPAudioStreams;
+
+class TMSCSPPubSubListener;
+class TMSCenRepListener;
+class TMSCSPAudioStreams;
 
 /**
  * Handles call adding from calls not done by the plugin.
  *
  */
-class CSPAudioHandler : public CBase,
-                        public MCSPCenRepObserver
+class TMSCenRepAudioHandler : public MCSPCenRepObserver
     {
 public:
     //Constructors and descructor
@@ -46,12 +45,12 @@
      * @param aLine the line to monitor
      * @param aLineId line identifier
      */
-    static CSPAudioHandler* NewL(TMSServer* aServer);
+    static TMSCenRepAudioHandler* NewL(TMSServer* aServer);
 
     /**
      * C++ default destructor
      */
-    virtual ~CSPAudioHandler();
+    virtual ~TMSCenRepAudioHandler();
 
     void SetLoudSpeakerVol(TInt vol);
     void SetEarPieceVol(TInt vol);
@@ -72,7 +71,7 @@
      * @param aUid uid of setting
      * @param aVal value
      */
-    virtual void CSPAudioHandler::HandleNotifyCenRepL(const TUid aUid,
+    virtual void TMSCenRepAudioHandler::HandleNotifyCenRepL(const TUid aUid,
             const TUint32 aKey, TInt aVal);
 
     // from base class MDevSoundObserver
@@ -109,7 +108,7 @@
      * @param aLine the line associated with the call
      * @param aLineId line identifier
      */
-    CSPAudioHandler(TMSServer* aServer);
+    TMSCenRepAudioHandler(TMSServer* aServer);
 
     /**
      * Constructs the monitor in the second phase.
@@ -122,17 +121,17 @@
     /**
      * Mute listening from Publish&Subscribe.
      */
-    CSPPubSubListener* iMuteListener;
+    TMSCSPPubSubListener* iMuteListener;
 
     /**
      * Incall loudspeaker listening from Central Repository.
      */
-    CSPCenRepListener* iIncallLoudspeakerVolumeListener;
+    TMSCenRepListener* iIncallLoudspeakerVolumeListener;
 
     /**
      * Incall ear volume listening from Central Repository.
      */
-    CSPCenRepListener* iIncallEarVolumeListener;
+    TMSCenRepListener* iIncallEarVolumeListener;
 
     /**
      * Audio streams handler.
--- a/mmserv/tms/tmsserver/inc/cspcenreplistener.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/cspcenreplistener.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 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"
@@ -19,102 +19,97 @@
 #define CSPCENREPLISTENER_H
 
 // INCLUDE FILES
+#include <glib.h>
 #include <e32base.h>
 #include <centralrepository.h>
 
 namespace TMS {
 
 // Forward declarations
-//class CRepository;
-class MCSPCenRepObserver;    
-   
-    // BASE CLASS
+class MCSPCenRepObserver;
+
+/**
+ *   TMSCenRepListener manages getting notification on CenRep key changes.
+ */
+class TMSCenRepListener : public CActive
+    {
+public:
 
-    // CLASS DECLARATION
+    /**
+     * Two-phased construction.
+     *
+     * @param aUid cenrep Uid
+     * @param aKey key to be listened
+     * @param aObserver observer for key change.
+     * @return instance of the class
+     */
+    static TMSCenRepListener* NewL(TUid aUid, TUint32 aKey,
+            MCSPCenRepObserver* aObserver);
+
+    /**
+     * Destructor.
+     */
+    virtual ~TMSCenRepListener();
+
+public:
 
     /**
-     *   CSPCenRepListener manages getting notification on CenRep key changes.
+     * Gets the current value of the monitored setting
+     * @param aValue the current value of the monitored setting
+     * @return gint Symbian OS error code from central repository
      */
-class CSPCenRepListener : public CActive
-        {
-    public:
+    gint Get(gint& aValue);
 
-        /**
-         * Two-phased construction.
-         *
-         * @param aUid cenrep Uid
-         * @param aKey key to be listened
-         * @param aObserver observer for key change.
-         * @return instance of the class
-         */
-        static CSPCenRepListener* NewL(TUid aUid, TUint32 aKey,
-                MCSPCenRepObserver* aObserver);
+    gint Set(gint aValue);
 
-        /**
-         * Destructor.
-         */
-        virtual ~CSPCenRepListener();
+protected:
+    // From CActive
+    void DoCancel();
+    gint RunError(TInt aError);
+    void RunL();
 
-    public:
+private:
 
-        /**
-         * Gets the current value of the monitored setting
-         * @param aValue the current value of the monitored setting
-         * @return TInt Symbian OS error code from central repository
-         */
-        TInt Get(TInt& aValue);
-        
-        TInt Set( TInt aValue );
-
-    protected:
-        // From CActive
-
-        void DoCancel();
-        TInt RunError(TInt aError);
-        void RunL();
+    /**
+     * Constructor
+     * @param aUid cenrep Uid
+     * @param aKey key to be listened
+     * @param aObserver observer for key change.
+     */
+    TMSCenRepListener(TUid aUid, TUint32 aKey, MCSPCenRepObserver* aObserver);
 
-    private:
+    /**
+     * Private constructing.
+     */
+    void ConstructL();
 
-        /**
-         * Constructor
-         * @param aUid cenrep Uid
-         * @param aKey key to be listened
-         * @param aObserver observer for key change.
-         */
-        CSPCenRepListener(TUid aUid, TUint32 aKey,
-                MCSPCenRepObserver* aObserver);
+    /**
+     * Submits a notification request
+     */
+    void SubmitNotifyRequestL();
 
-        /**
-         * Private constructing.
-         */
-        void ConstructL();
-
-        /**
-         * Submits a notification request
-         */
-        void SubmitNotifyRequestL();
+private:
+    // Owned by this object
 
-    private:
-        // Owned by this object
-
-        /**
-         * UID of CR key.
-         */
-        TUid iUid;
+    /**
+     * UID of CR key.
+     */
+    TUid iUid;
 
-        /**
-         * Repository access.
-         * Own.
-         */
-        CRepository* iRepository;
+    /**
+     * Repository access.
+     * Own.
+     */
+    CRepository* iRepository;
 
-        /**
-         * Identification number of the monitored setting.
-         */
-        TUint32 iMonitorSetting;
+    /**
+     * Identification number of the monitored setting.
+     */
+    TUint32 iMonitorSetting;
 
-        MCSPCenRepObserver* iObserver;
-        };
+    MCSPCenRepObserver* iObserver;
+    };
 
 } //namespace TMS
+
 #endif // CSPCENREPLISTENER_H
--- a/mmserv/tms/tmsserver/inc/globaleffectssettings.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/globaleffectssettings.h	Sun Mar 14 13:11:51 2010 +0000
@@ -19,7 +19,6 @@
 #define GLOBALEFFECTSSETTINGS_H
 
 //  INCLUDES
-#include <e32base.h>
 #include <e32property.h>
 #include <sounddevice.h>
 #include <centralrepository.h>
@@ -27,18 +26,18 @@
 namespace TMS {
 
 // CLASS DECLARATION
-class GlobalEffectsSettings : public CBase
+class TMSGlobalEffectsSettings
     {
 public:
     /**
      * Two-phased constructor.
      */
-    static GlobalEffectsSettings* NewL();
+    static TMSGlobalEffectsSettings* NewL();
 
     /**
      * Destructor.
      */
-    virtual ~GlobalEffectsSettings();
+    virtual ~TMSGlobalEffectsSettings();
 
 public:
     /**
@@ -96,7 +95,7 @@
     /**
      * C++ default constructor.
      */
-    GlobalEffectsSettings();
+    TMSGlobalEffectsSettings();
 
     /**
      * By default Symbian 2nd phase constructor is private.
--- a/mmserv/tms/tmsserver/inc/mcspcenrepobserver.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/mcspcenrepobserver.h	Sun Mar 14 13:11:51 2010 +0000
@@ -1,21 +1,19 @@
 /*
-* Copyright (c) 2007 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:  Declarations for class MCSPCenRepObserver
-*
-*/
-
-
+ * Copyright (c) 2007 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:  Declarations for class MCSPCenRepObserver
+ *
+ */
 
 #ifndef MCSPCENREPOBSERVER_H
 #define MCSPCENREPOBSERVER_H
@@ -28,26 +26,26 @@
 // CLASS DECLARATION
 
 /**
-*  Observer interface for indicating P&S changes
-*
-*/
+ *  Observer interface for indicating P&S changes
+ *
+ */
 class MCSPCenRepObserver
     {
-    public:  // New functions
+public:
+    // New functions
 
-        /**
-        * Handler for changed event.
-        * @param aUid uid of setting 
-        * @param aKey the changed key
-        * @param aVal value
-        */
-        virtual void HandleNotifyCenRepL( const TUid aUid, 
-                                          const TUint32 aKey, 
-                                          TInt aVal) = 0;
+    /**
+     * Handler for changed event.
+     * @param aUid uid of setting
+     * @param aKey the changed key
+     * @param aVal value
+     */
+    virtual void HandleNotifyCenRepL(const TUid aUid, const TUint32 aKey,
+            TInt aVal) = 0;
     };
 
 }//namespace TMS
 
-#endif      // MCSPCENREPOBSERVER_H   
+#endif      // MCSPCENREPOBSERVER_H
 
 // End of File
--- a/mmserv/tms/tmsserver/inc/tareventhandler.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/tareventhandler.h	Sun Mar 14 13:11:51 2010 +0000
@@ -26,18 +26,18 @@
 namespace TMS {
 
 // CLASS DECLARATION
-class CTarEventHandler : public CActive
+class TMSTarEventHandler : public CActive
     {
 public:
     /**
      * Two-phased constructor.
      */
-    static CTarEventHandler* NewL(TMSServer* aServer);
+    static TMSTarEventHandler* NewL(TMSServer* aServer);
 
     /**
      * Destructor.
      */
-    virtual ~CTarEventHandler();
+    virtual ~TMSTarEventHandler();
 
 private:
     /**
@@ -58,7 +58,7 @@
     /**
      * C++ default constructor.
      */
-    CTarEventHandler(TMSServer* aServer);
+    TMSTarEventHandler(TMSServer* aServer);
 
     /**
      * By default Symbian 2nd phase constructor is private.
--- a/mmserv/tms/tmsserver/inc/tmsserver.h	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/inc/tmsserver.h	Sun Mar 14 13:11:51 2010 +0000
@@ -28,12 +28,12 @@
 
 // FORWARD DECLARATIONS
 class TMSServerShutDown;
-class CStartAndMonitorTMSCallThread;
+class TMSStartAndMonitorTMSCallThread;
 class TMSCallProxyLocal;
-class GlobalEffectsSettings;
-class CTarEventHandler;
-class CSPCenRepListener;
-class CSPAudioHandler;
+class TMSGlobalEffectsSettings;
+class TMSTarEventHandler;
+class TMSCSPCenRepListener;
+class TMSCenRepAudioHandler;
 
 // -----------------------------------------------------------------------------
 // TMSServer class
@@ -96,10 +96,10 @@
     TBool iDnlinkSession;
     TBool iUplinkSession;
 
-    mutable RPointerArray<CStartAndMonitorTMSCallThread> iTMSCallServList;
-    GlobalEffectsSettings* iEffectSettings;
-    CTarEventHandler* iTarHandler;
-    CSPAudioHandler* iAudioCenRepHandler;
+    mutable RPointerArray<TMSStartAndMonitorTMSCallThread> iTMSCallServList;
+    TMSGlobalEffectsSettings* iEffectSettings;
+    TMSTarEventHandler* iTarHandler;
+    TMSCenRepAudioHandler* iAudioCenRepHandler;
     TMSAudioOutput iCurrentRouting;
 
     RArray<TFourCC> iDnlCodecs;
@@ -107,7 +107,7 @@
     };
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread class
+// TMSStartAndMonitorTMSCallThread class
 // -----------------------------------------------------------------------------
 //
 class TMSCallProxyLocal : public RSessionBase
@@ -121,19 +121,19 @@
     };
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread class
+// TMSStartAndMonitorTMSCallThread class
 // -----------------------------------------------------------------------------
 //
-class CStartAndMonitorTMSCallThread : public CActive
+class TMSStartAndMonitorTMSCallThread : public CActive
     {
 public:
-    static CStartAndMonitorTMSCallThread* NewL(TMSServer* aServer);
-    ~CStartAndMonitorTMSCallThread();
+    static TMSStartAndMonitorTMSCallThread* NewL(TMSServer* aServer);
+    ~TMSStartAndMonitorTMSCallThread();
     TInt StartTMSCallServer(TMSCallProxyLocal& aHandle);
 
 private:
     // Construct
-    CStartAndMonitorTMSCallThread(TMSServer* aServer);
+    TMSStartAndMonitorTMSCallThread(TMSServer* aServer);
     void ConstructL();
 
     // From CActive
--- a/mmserv/tms/tmsserver/src/cspaudiohandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/cspaudiohandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -11,7 +11,7 @@
  *
  * Contributors:
  *
- * Description:  Implements the class CSPAudioHandler
+ * Description:  Implements the class TMSCenRepAudioHandler
  *
  */
 
@@ -33,13 +33,13 @@
 
 using namespace TMS;
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::NewL.
+// TMSCenRepAudioHandler::NewL.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler* CSPAudioHandler::NewL(TMSServer* aServer)
+TMSCenRepAudioHandler* TMSCenRepAudioHandler::NewL(TMSServer* aServer)
     {
     TRACE_PRN_FN_ENT;
-    CSPAudioHandler* self = new (ELeave) CSPAudioHandler(aServer);
+    TMSCenRepAudioHandler* self = new (ELeave) TMSCenRepAudioHandler(aServer);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -51,7 +51,7 @@
 // Destructs the object by canceling first ongoing monitoring.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler::~CSPAudioHandler()
+TMSCenRepAudioHandler::~TMSCenRepAudioHandler()
     {
     TRACE_PRN_FN_ENT;
     delete iIncallLoudspeakerVolumeListener;
@@ -60,10 +60,10 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::SetLoudSpeakerVol
+// TMSCenRepAudioHandler::SetLoudSpeakerVol
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::SetLoudSpeakerVol(TInt vol)
+void TMSCenRepAudioHandler::SetLoudSpeakerVol(TInt vol)
     {
     if (iIncallLoudspeakerVolumeListener)
         {
@@ -72,10 +72,10 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSPAudioHandler::SetEarPieceVol
+// TMSCenRepAudioHandler::SetEarPieceVol
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::SetEarPieceVol(TInt vol)
+void TMSCenRepAudioHandler::SetEarPieceVol(TInt vol)
     {
     if (iIncallEarVolumeListener)
         {
@@ -85,10 +85,10 @@
 
 // ---------------------------------------------------------------------------
 // From MCSPCenRepObserver
-// CSPAudioHandler::HandleNotifyCenRepL
+// TMSCenRepAudioHandler::HandleNotifyCenRepL
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::HandleNotifyCenRepL(const TUid /*aUid*/,
+void TMSCenRepAudioHandler::HandleNotifyCenRepL(const TUid /*aUid*/,
         const TUint32 aKey, TInt aVal)
     {
     TRACE_PRN_FN_ENT;
@@ -107,7 +107,7 @@
 // Constructs the monitor.
 // ---------------------------------------------------------------------------
 //
-CSPAudioHandler::CSPAudioHandler(TMSServer* aServer) :
+TMSCenRepAudioHandler::TMSCenRepAudioHandler(TMSServer* aServer) :
     iTMSSer(aServer)
     {
     TRACE_PRN_FN_ENT;
@@ -119,14 +119,14 @@
 // Second phase construction.
 // ---------------------------------------------------------------------------
 //
-void CSPAudioHandler::ConstructL()
+void TMSCenRepAudioHandler::ConstructL()
     {
     TRACE_PRN_FN_ENT;
 
-    iIncallLoudspeakerVolumeListener = CSPCenRepListener::NewL(
+    iIncallLoudspeakerVolumeListener = TMSCenRepListener::NewL(
             KCRUidInCallVolume, KTelIncallLoudspeakerVolume, this);
 
-    iIncallEarVolumeListener = CSPCenRepListener::NewL(KCRUidInCallVolume,
+    iIncallEarVolumeListener = TMSCenRepListener::NewL(KCRUidInCallVolume,
             KTelIncallEarVolume, this);
 
     // Initialize audio volumes
--- a/mmserv/tms/tmsserver/src/cspcenreplistener.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/cspcenreplistener.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -23,16 +23,16 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::CSPCenRepListener
+// TMSCenRepListener::TMSCenRepListener
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-CSPCenRepListener* CSPCenRepListener::NewL(TUid aUid,
+TMSCenRepListener* TMSCenRepListener::NewL(TUid aUid,
         TUint32 aMonitorSetting, MCSPCenRepObserver* aObserver)
     {
     TRACE_PRN_FN_ENT;
-    CSPCenRepListener* self = new (ELeave) CSPCenRepListener(aUid,
+    TMSCenRepListener* self = new (ELeave) TMSCenRepListener(aUid,
             aMonitorSetting, aObserver);
     CleanupStack::PushL(self);
     self->ConstructL();
@@ -42,7 +42,7 @@
     }
 
 // Destructor
-CSPCenRepListener::~CSPCenRepListener()
+TMSCenRepListener::~TMSCenRepListener()
     {
     TRACE_PRN_FN_ENT;
     Cancel();
@@ -51,33 +51,34 @@
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::Get
+// TMSCenRepListener::Get
 // -----------------------------------------------------------------------------
 //
-TInt CSPCenRepListener::Get(TInt& aValue)
+gint TMSCenRepListener::Get(gint& aValue)
     {
     TRACE_PRN_FN_ENT;
+    gint status = iRepository->Get(iMonitorSetting, aValue);
     TRACE_PRN_FN_EXT;
-    return (iRepository->Get(iMonitorSetting, aValue));
-
+    return status;
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::Set
+// TMSCenRepListener::Set
 // -----------------------------------------------------------------------------
 //
-TInt CSPCenRepListener::Set(TInt aValue)
+gint TMSCenRepListener::Set(gint aValue)
     {
     TRACE_PRN_FN_ENT;
+    gint status = iRepository->Set(iMonitorSetting, aValue);
     TRACE_PRN_FN_EXT;
-    return (iRepository->Set(iMonitorSetting, aValue));
+    return status;
 
     }
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::DoCancel
+// TMSCenRepListener::DoCancel
 // -----------------------------------------------------------------------------
 //
-void CSPCenRepListener::DoCancel()
+void TMSCenRepListener::DoCancel()
     {
     TRACE_PRN_FN_ENT;
     iRepository->NotifyCancel(iMonitorSetting);
@@ -85,10 +86,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::RunError
+// TMSCenRepListener::RunError
 // -----------------------------------------------------------------------------
 //
-TInt CSPCenRepListener::RunError(
+gint TMSCenRepListener::RunError(
 #ifdef _DEBUG
         TInt aError // Log the leavecode from RunL
 #else
@@ -101,36 +102,37 @@
     TRACE_PRN_IF_ERR(aError);
 #endif
     TRACE_PRN_FN_EXT;
-    return ( KErrNone );
+    return KErrNone;
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::RunL
+// TMSCenRepListener::RunL
 // -----------------------------------------------------------------------------
 //
-void CSPCenRepListener::RunL()
+void TMSCenRepListener::RunL()
     {
     TRACE_PRN_FN_ENT;
     // Don't resubmit the request on error
     // Central repositry completes notifications with id of setting
     // so check only that value of iStatus is negative
-    User::LeaveIfError(iStatus.Int() < KErrNone);
-    SubmitNotifyRequestL();
+    if (iStatus.Int() == KErrNone)
+        {
+        SubmitNotifyRequestL();
+        }
 
-    TInt volume;
     // The loudspeaker volume has changed in repository.
     // Retrieve the current volume from repository.
-    User::LeaveIfError(Get(volume));
-
+    gint volume;
+    Get(volume);
     iObserver->HandleNotifyCenRepL(iUid, iMonitorSetting, volume);
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::CSPCenRepListener
+// TMSCenRepListener::TMSCenRepListener
 // -----------------------------------------------------------------------------
 //
-CSPCenRepListener::CSPCenRepListener(TUid aUid, TUint32 aMonitorSetting,
+TMSCenRepListener::TMSCenRepListener(TUid aUid, TUint32 aMonitorSetting,
         MCSPCenRepObserver* aObserver) :
     CActive(EPriorityStandard),
     iUid(aUid),
@@ -143,10 +145,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::ConstructL
+// TMSCenRepListener::ConstructL
 // -----------------------------------------------------------------------------
 //
-void CSPCenRepListener::ConstructL()
+void TMSCenRepListener::ConstructL()
     {
     TRACE_PRN_FN_ENT;
     // Create repository instance
@@ -157,12 +159,13 @@
     }
 
 // -----------------------------------------------------------------------------
-// CSPCenRepListener::SubmitNotifyRequestL
+// TMSCenRepListener::SubmitNotifyRequestL
 // -----------------------------------------------------------------------------
 //
-void CSPCenRepListener::SubmitNotifyRequestL()
+void TMSCenRepListener::SubmitNotifyRequestL()
     {
     TRACE_PRN_FN_ENT;
+    iStatus = KRequestPending;
     iRepository->NotifyRequest(iMonitorSetting, iStatus);
     SetActive();
     TRACE_PRN_FN_EXT;
--- a/mmserv/tms/tmsserver/src/globaleffectssettings.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/globaleffectssettings.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -31,12 +31,12 @@
 const TUint32 KTmsLoudSpkrVolume = 0x00000002;
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::GlobalEffectsSettings
+// TMSGlobalEffectsSettings::TMSGlobalEffectsSettings
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-GlobalEffectsSettings::GlobalEffectsSettings() :
+TMSGlobalEffectsSettings::TMSGlobalEffectsSettings() :
     iGain(KDefaultGain),
     iMaxVolume(KDefaultMaxVolume),
     iMaxGain(KDefaultMaxGain),
@@ -46,11 +46,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::ConstructL
+// TMSGlobalEffectsSettings::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::ConstructL()
+void TMSGlobalEffectsSettings::ConstructL()
     {
     // Create repository instance
     iRepository = CRepository::NewL(KCRUidTmseffects);
@@ -62,13 +62,13 @@
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::NewL
+// TMSGlobalEffectsSettings::NewL
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-GlobalEffectsSettings* GlobalEffectsSettings::NewL()
+TMSGlobalEffectsSettings* TMSGlobalEffectsSettings::NewL()
     {
-    GlobalEffectsSettings* self = new (ELeave) GlobalEffectsSettings();
+    TMSGlobalEffectsSettings* self = new (ELeave) TMSGlobalEffectsSettings();
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -76,16 +76,16 @@
     }
 
 // Destructor
-GlobalEffectsSettings::~GlobalEffectsSettings()
+TMSGlobalEffectsSettings::~TMSGlobalEffectsSettings()
     {
     delete iRepository;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::SetLoudSpkrVolume
+// TMSGlobalEffectsSettings::SetLoudSpkrVolume
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::SetLoudSpkrVolume(TInt aVolume)
+void TMSGlobalEffectsSettings::SetLoudSpkrVolume(TInt aVolume)
     {
     TInt status(KErrNone);
     if (iRepository)
@@ -99,10 +99,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::SetEarPieceVolume
+// TMSGlobalEffectsSettings::SetEarPieceVolume
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::SetEarPieceVolume(TInt aVolume)
+void TMSGlobalEffectsSettings::SetEarPieceVolume(TInt aVolume)
     {
     TInt status(KErrNone);
     if (iRepository)
@@ -116,55 +116,55 @@
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::GetLoudSpkrVolume
+// TMSGlobalEffectsSettings::GetLoudSpkrVolume
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::GetLoudSpkrVolume(TInt& aVolume)
+void TMSGlobalEffectsSettings::GetLoudSpkrVolume(TInt& aVolume)
     {
     aVolume = iLoudSpkrVolume;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::GetEarPieceVolume
+// TMSGlobalEffectsSettings::GetEarPieceVolume
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::GetEarPieceVolume(TInt& aVolume)
+void TMSGlobalEffectsSettings::GetEarPieceVolume(TInt& aVolume)
     {
     aVolume = iEarVolume;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::MaxVolume
+// TMSGlobalEffectsSettings::MaxVolume
 // -----------------------------------------------------------------------------
 //
-TInt GlobalEffectsSettings::MaxVolume() const
+TInt TMSGlobalEffectsSettings::MaxVolume() const
     {
     return iMaxVolume;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::SetGain
+// TMSGlobalEffectsSettings::SetGain
 // -----------------------------------------------------------------------------
 //
-void GlobalEffectsSettings::SetGain(TInt aGain)
+void TMSGlobalEffectsSettings::SetGain(TInt aGain)
     {
     iGain = aGain;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::Gain
+// TMSGlobalEffectsSettings::Gain
 // -----------------------------------------------------------------------------
 //
-TInt GlobalEffectsSettings::Gain() const
+TInt TMSGlobalEffectsSettings::Gain() const
     {
     return iGain;
     }
 
 // -----------------------------------------------------------------------------
-// GlobalEffectsSettings::MaxGain
+// TMSGlobalEffectsSettings::MaxGain
 // -----------------------------------------------------------------------------
 //
-TInt GlobalEffectsSettings::MaxGain() const
+TInt TMSGlobalEffectsSettings::MaxGain() const
     {
     return iMaxGain;
     }
--- a/mmserv/tms/tmsserver/src/tareventhandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/tareventhandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -23,40 +23,41 @@
 using namespace TMS;
 
 // -----------------------------------------------------------------------------
-// CTarEventHandler::CTarEventHandler
+// TMSTarEventHandler::TMSTarEventHandler
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-CTarEventHandler::CTarEventHandler(TMSServer* aServer) :
+TMSTarEventHandler::TMSTarEventHandler(TMSServer* aServer) :
     CActive(EPriorityStandard),
     iTMSSer(aServer)
     {
     }
 
 // -----------------------------------------------------------------------------
-// CTarEventHandler::ConstructL
+// TMSTarEventHandler::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void CTarEventHandler::ConstructL()
+void TMSTarEventHandler::ConstructL()
     {
     TRACE_PRN_FN_ENT;
     CActiveScheduler::Add(this);
     User::LeaveIfError(iProperty.Attach(KTMSPropertyCategory, ERoutingPs));
+    iStatus = KRequestPending;
     iProperty.Subscribe(iStatus);
     SetActive();
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CTarEventHandler::NewL
+// TMSTarEventHandler::NewL
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CTarEventHandler* CTarEventHandler::NewL(TMSServer* aServer)
+TMSTarEventHandler* TMSTarEventHandler::NewL(TMSServer* aServer)
     {
-    CTarEventHandler* self = new (ELeave) CTarEventHandler(aServer);
+    TMSTarEventHandler* self = new (ELeave) TMSTarEventHandler(aServer);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -64,7 +65,7 @@
     }
 
 // Destructor
-CTarEventHandler::~CTarEventHandler()
+TMSTarEventHandler::~TMSTarEventHandler()
     {
     TRACE_PRN_FN_ENT;
     if (IsActive())
@@ -76,10 +77,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// CTarEventHandler::DoCancel
+// TMSTarEventHandler::DoCancel
 // -----------------------------------------------------------------------------
 //
-void CTarEventHandler::DoCancel()
+void TMSTarEventHandler::DoCancel()
     {
     TRACE_PRN_FN_ENT;
     iProperty.Cancel();
@@ -87,16 +88,17 @@
     }
 
 // -----------------------------------------------------------------------------
-// CTarEventHandler::RunL
+// TMSTarEventHandler::RunL
 // -----------------------------------------------------------------------------
 //
-void CTarEventHandler::RunL()
+void TMSTarEventHandler::RunL()
     {
     TRACE_PRN_FN_ENT;
     // Subscribe immediately before analyzing the notification to ensure that we
     // don't miss further updates.
     if (iStatus.Int() == KErrNone)
         {
+        iStatus = KRequestPending;
         iProperty.Subscribe(iStatus);
         SetActive();
         TRoutingMsgBufPckg routingpckg;
--- a/mmserv/tms/tmsserver/src/tmsserver.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/tmsserver.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -100,8 +100,7 @@
         }
 
     const TVersion version(KTMSServMajorVersionNumber,
-                           KTMSServMinorVersionNumber,
-                           KTMSServBuildVersionNumber);
+            KTMSServMinorVersionNumber, KTMSServBuildVersionNumber);
 
     if (!User::QueryVersionSupported(version, aVersion))
         {
@@ -126,7 +125,7 @@
     iShutdownTimer = TMSServerShutDown::NewL();
     StartL(KTMSServerName);
     RThread().SetPriority(EPriorityRealTime);
-    iEffectSettings = GlobalEffectsSettings::NewL();
+    iEffectSettings = TMSGlobalEffectsSettings::NewL();
     iTarHandler = NULL;
     iAudioCenRepHandler = NULL;
     iCurrentRouting = TMS_AUDIO_OUTPUT_NONE;
@@ -229,7 +228,7 @@
     TInt i = 0;
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
         if (!callThread->IsActive())
             {
             iTMSCallServList.Remove(i);
@@ -258,9 +257,9 @@
     TRACE_PRN_FN_ENT;
     TInt status = KErrNone;
 
-    CStartAndMonitorTMSCallThread* callServerThread = NULL;
-    TRAP(status, callServerThread =
-    CStartAndMonitorTMSCallThread::NewL(const_cast<TMSServer*>(this)));
+    TMSStartAndMonitorTMSCallThread* callServerThread = NULL;
+    TRAP(status, callServerThread =TMSStartAndMonitorTMSCallThread::NewL(
+            const_cast<TMSServer*>(this)));
     if (status != KErrNone)
         {
         delete callServerThread;
@@ -315,7 +314,7 @@
     {
     if (!iTarHandler)
         {
-        iTarHandler = CTarEventHandler::NewL((const_cast<TMSServer*> (this)));
+        iTarHandler = TMSTarEventHandler::NewL((const_cast<TMSServer*> (this)));
         }
     }
 
@@ -392,7 +391,7 @@
     TInt status(KErrNone);
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
 
         if (callThread)
             {
@@ -425,7 +424,7 @@
     TInt status(KErrNone);
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
 
         if (callThread)
             {
@@ -478,7 +477,7 @@
 
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
 
         if (callThread)
             {
@@ -723,7 +722,7 @@
     TInt i = 0;
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
 
         if (callThread)
             {
@@ -758,7 +757,7 @@
     TInt i = 0;
     while (i < iTMSCallServList.Count())
         {
-        CStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+        TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
 
         if (callThread)
             {
@@ -834,11 +833,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::CStartAndMonitorTMSCallThread
+// TMSStartAndMonitorTMSCallThread::TMSStartAndMonitorTMSCallThread
 // Perhaps we need to move this to a .cpp?
 // -----------------------------------------------------------------------------
 //
-CStartAndMonitorTMSCallThread::CStartAndMonitorTMSCallThread(
+TMSStartAndMonitorTMSCallThread::TMSStartAndMonitorTMSCallThread(
         TMSServer* aServer) :
     CActive(EPriorityStandard),
     iTMSServer(aServer)
@@ -849,11 +848,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::~CStartAndMonitorTMSCallThread
+// TMSStartAndMonitorTMSCallThread::~TMSStartAndMonitorTMSCallThread
 //
 // -----------------------------------------------------------------------------
 //
-CStartAndMonitorTMSCallThread::~CStartAndMonitorTMSCallThread()
+TMSStartAndMonitorTMSCallThread::~TMSStartAndMonitorTMSCallThread()
     {
     TRACE_PRN_FN_ENT;
     Cancel();
@@ -861,16 +860,16 @@
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::NewL
+// TMSStartAndMonitorTMSCallThread::NewL
 //
 // -----------------------------------------------------------------------------
 //
-CStartAndMonitorTMSCallThread* CStartAndMonitorTMSCallThread::NewL(
+TMSStartAndMonitorTMSCallThread* TMSStartAndMonitorTMSCallThread::NewL(
         TMSServer* aServer)
     {
     TRACE_PRN_FN_ENT;
-    CStartAndMonitorTMSCallThread* self =
-            new (ELeave) CStartAndMonitorTMSCallThread(aServer);
+    TMSStartAndMonitorTMSCallThread* self =
+            new (ELeave) TMSStartAndMonitorTMSCallThread(aServer);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
@@ -879,22 +878,23 @@
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::ConstructL
+// TMSStartAndMonitorTMSCallThread::ConstructL
 //
 // -----------------------------------------------------------------------------
 //
-void CStartAndMonitorTMSCallThread::ConstructL()
+void TMSStartAndMonitorTMSCallThread::ConstructL()
     {
     TRACE_PRN_FN_ENT;
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::StartTMSCallServer
+// TMSStartAndMonitorTMSCallThread::StartTMSCallServer
 //
 // -----------------------------------------------------------------------------
 //
-TInt CStartAndMonitorTMSCallThread::StartTMSCallServer(TMSCallProxyLocal& aHndl)
+TInt TMSStartAndMonitorTMSCallThread::StartTMSCallServer(
+        TMSCallProxyLocal& aHndl)
     {
     TRACE_PRN_FN_ENT;
 
@@ -950,6 +950,7 @@
         return status;
         }
     aHndl.ShareProtected();
+    iStatus = KRequestPending;
     iServerThread.Logon(iStatus);
     SetActive();
 
@@ -958,28 +959,32 @@
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::RunL
+// TMSStartAndMonitorTMSCallThread::RunL
 // From CActive
 // -----------------------------------------------------------------------------
 //
-void CStartAndMonitorTMSCallThread::RunL()
+void TMSStartAndMonitorTMSCallThread::RunL()
     {
     TRACE_PRN_FN_ENT;
     iServerThread.Close();
-    //NOTE: This is causing a panic when closing down tms server.
+    //NOTE: This is causing a panic when closing down TMS server.
     //iCallSrvrHndl.Close();
     TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
-// CStartAndMonitorTMSCallThread::DoCancel
+// TMSStartAndMonitorTMSCallThread::DoCancel
 // From CActive
 // -----------------------------------------------------------------------------
 //
-void CStartAndMonitorTMSCallThread::DoCancel()
+void TMSStartAndMonitorTMSCallThread::DoCancel()
     {
     TRACE_PRN_FN_ENT;
-    iServerThread.LogonCancel(iStatus);
+    if (iServerThread.Handle())
+        {
+        iServerThread.LogonCancel(iStatus);
+        User::WaitForRequest(iStatus);
+        }
     TRACE_PRN_FN_EXT;
     }
 
--- a/mmserv/tms/tmsserver/src/tmsserversession.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/tmsserversession.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -315,13 +315,6 @@
                 err = KErrNotSupported;
                 }
 
-#ifdef __WINSCW__
-            // Support for adaptation stubs
-            codecs->Append(KMccFourCCIdG711);
-            codecs->Append(KMccFourCCIdG729);
-            codecs->Append(KMccFourCCIdILBC);
-            codecs->Append(KMccFourCCIdAMRNB);
-#endif
             codecsCount = codecs->Count();
             }
 
--- a/mmserv/tms/tmsserver/src/tmsservershutdown.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/tms/tmsserver/src/tmsservershutdown.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -82,6 +82,7 @@
 
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         iShutDownTimer.After(iStatus, aDelay);
         }
 
--- a/mmserv/voipaudioservices/JitterBufferUtility/group/JitterBuffer.mmp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/JitterBufferUtility/group/JitterBuffer.mmp	Sun Mar 14 13:11:51 2010 +0000
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:  VOIP AUdio Services
+* Description:  VOIP Audio Services
 *
 */
 
@@ -28,6 +28,7 @@
 USERINCLUDE     ../../inc
 
 MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/mmf/common
 
 SOURCEPATH      ../src
--- a/mmserv/voipaudioservices/JitterBufferUtility/src/JitterBuffer.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/JitterBufferUtility/src/JitterBuffer.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008 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"
@@ -234,7 +234,7 @@
         TRACE_PRN_N(_L("CVoIPJitterBuffer::FillBufferL NORMAL"));
 
         TUint32 emptyBufferDelay = 0;
-        
+
         if (iCodec != KMccFourCCIdG729)
             {
             // This can cause JB overflow on G729 (it does in the loopback)
@@ -385,6 +385,7 @@
 
     if (aStateChangeDelay)
         {
+        iStatus = KRequestPending;
         iTimer.After(iStatus, TTimeIntervalMicroSeconds32(aStateChangeDelay));
         }
     else
--- a/mmserv/voipaudioservices/VoIPIntfc/src/VoIPQueueHandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPIntfc/src/VoIPQueueHandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2007-2008 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:  VOIP Audio Services  CMsgQueueHandler class implementation.
-*
-*/
-
+ * Copyright (c) 2007-2008 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:  VOIP Audio Services  CMsgQueueHandler class implementation.
+ *
+ */
 
 #include <voipaudiocommon.h>
 #include <voipuplinkstream.h>
@@ -26,15 +25,13 @@
 #include "VoIPDataBufferImpl.h"
 #include "VoIPQueueHandler.h"
 
-
 // ----------------------------------------------------------------------------
 // CQueueHandler::NewL
 // Symbian constructor
 // ----------------------------------------------------------------------------
 //
 CQueueHandler* CQueueHandler::NewL(MQueueHandlerObserver* aObserver,
-                                   RMsgQueue<TVoIPMsgBuf>* aMsgQueue,
-                                   TInt aBufferLen)
+        RMsgQueue<TVoIPMsgBuf>* aMsgQueue, TInt aBufferLen)
     {
     CQueueHandler* self = new (ELeave) CQueueHandler(aMsgQueue);
     CleanupStack::PushL(self);
@@ -49,7 +46,7 @@
 // ----------------------------------------------------------------------------
 //
 void CQueueHandler::ConstructL(MQueueHandlerObserver* aObserver,
-                               TInt aBufferLen)
+        TInt aBufferLen)
     {
     iObserver = aObserver;
 
@@ -79,9 +76,8 @@
 //
 CQueueHandler::CQueueHandler(RMsgQueue<TVoIPMsgBuf>* aMsgQueue) :
     CActive(CActive::EPriorityStandard),
-//  CActive(CActive::EPriorityHigh),
     iMsgQueue(aMsgQueue),
-    iChunkDataPtr(0,0,0)
+    iChunkDataPtr(0, 0, 0)
     {
     CActiveScheduler::Add(this);
     }
@@ -95,6 +91,7 @@
     {
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         iMsgQueue->NotifyDataAvailable(iStatus);
         SetActive();
         }
@@ -131,13 +128,13 @@
             case ECmdDownlinkInitComplete:
                 {
                 iObserver->Event(MVoIPDownlinkObserver::KOpenComplete,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdUplinkInitComplete:
                 {
                 iObserver->Event(MVoIPUplinkObserver::KOpenComplete,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdFillBuffer:
@@ -154,51 +151,51 @@
                 {
                 iChunk.Close();
                 iObserver->Event(MVoIPDownlinkObserver::KDownlinkClosed,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdUplinkThreadClosed:
                 {
                 iChunk.Close();
                 iObserver->Event(MVoIPUplinkObserver::KUplinkClosed,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdRingToneOpenComplete:
                 {
                 iObserver->Event(MRingToneObserver::KOpenComplete,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdRingTonePlayComplete:
                 {
                 iObserver->Event(MRingToneObserver::KPlaybackComplete,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdDnLinkError:
             case ECmdDnLinkJBError:
                 {
                 iObserver->Event(MVoIPDownlinkObserver::KDownlinkError,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdUpLinkError:
                 {
                 iObserver->Event(MVoIPUplinkObserver::KUplinkError,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdDTMFOpenDnlinkComplete:
                 {
                 iObserver->Event(MDTMFToneObserver::KOpenCompleteDNL,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdDTMFOpenUplinkComplete:
                 {
                 iObserver->Event(MDTMFToneObserver::KOpenCompleteUPL,
-                                 msgBuf.iStatus);
+                        msgBuf.iStatus);
                 break;
                 }
             case ECmdDTMFTonePlayFinished:
@@ -288,5 +285,4 @@
     return &iStatus;
     }
 
-
 // End of File
--- a/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPServer/group/VoIPAudioServer.mmp	Sun Mar 14 13:11:51 2010 +0000
@@ -42,6 +42,7 @@
 USERINCLUDE     ../../inc
 
 MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/mmf/server
 SYSTEMINCLUDE   /epoc32/include/mda/common
 SYSTEMINCLUDE   /epoc32/include/mmf/common
--- a/mmserv/voipaudioservices/VoIPServer/src/VoIPECallEventHandler.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPServer/src/VoIPECallEventHandler.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -43,6 +43,7 @@
     CActiveScheduler::Add(this);
     User::LeaveIfError(iProperty.Attach(KPSUidCtsyEmergencyCallInfo,
             KCTSYEmergencyCallInfo));
+    iStatus = KRequestPending;
     iProperty.Subscribe(iStatus);
     SetActive();
     TRACE_PRN_FN_EXT;
@@ -98,6 +99,7 @@
     // don't miss further updates.
     if (iStatus.Int() == KErrNone)
         {
+        iStatus = KRequestPending;
         iProperty.Subscribe(iStatus);
         SetActive();
 
--- a/mmserv/voipaudioservices/VoIPServer/src/VoIPQueueHandlerSrv.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPServer/src/VoIPQueueHandlerSrv.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -62,7 +62,6 @@
 //
 CQueueHandlerSrv::CQueueHandlerSrv(RMsgQueue<TVoIPMsgBuf>* aMsgQueue) :
     CActive(CActive::EPriorityStandard),
-    //  CActive(CActive::EPriorityHigh),
     iMsgQueue(aMsgQueue)
     {
     CActiveScheduler::Add(this);
@@ -77,6 +76,7 @@
     {
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         iMsgQueue->NotifyDataAvailable(iStatus);
         SetActive();
         }
@@ -118,7 +118,7 @@
 TInt CQueueHandlerSrv::RunError(TInt aError)
     {
     // RunL can actually leave if any iObserver->Event leave is not trapped
-    //    iObserver->Event(ECmdGeneralError, aError);
+    // iObserver->Event(ECmdGeneralError, aError);
     return aError;
     }
 
--- a/mmserv/voipaudioservices/VoIPServer/src/VoIPServerAO.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPServer/src/VoIPServerAO.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -57,8 +57,8 @@
     {
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         SetActive();
-        iStatus = KRequestPending;
         }
     }
 
--- a/mmserv/voipaudioservices/VoIPServer/src/VoIPServerShutdown.cpp	Mon Mar 08 21:44:05 2010 +0000
+++ b/mmserv/voipaudioservices/VoIPServer/src/VoIPServerShutdown.cpp	Sun Mar 14 13:11:51 2010 +0000
@@ -80,6 +80,7 @@
 
     if (!IsActive())
         {
+        iStatus = KRequestPending;
         iShutDownTimer.After(iStatus, aDelay);
         }
 
--- a/package_definition.xml	Mon Mar 08 21:44:05 2010 +0000
+++ b/package_definition.xml	Sun Mar 14 13:11:51 2010 +0000
@@ -1,120 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
-    <collection id="radioutility" name="Radio Utility" level="generic">
-      <component id="radioserver" filter="s60" name="Radio Server">
-        <unit bldFile="radioutility/radioserver/group"/>
-        <!-- <unit bldFile="radioutility/radioserver/server/group"/> -->
-        <!-- <unit bldFile="radioutility/radioserver/session/group"/> -->
-      </component>
-      <component id="radio_utility" filter="s60" name="Radio Utility">
-        <unit bldFile="radioutility/radio_utility/group"/>
-      </component>
-      <component id="fmpresetutility" filter="s60" name="FM Preset Utility">
-        <unit bldFile="radioutility/fmpresetutility/group"/>
-      </component>
-      <component id="radioutility_build" filter="s60" name="Radio Utility Build">
-          <!-- should remove included bld.infs from here -->
-        <unit bldFile="radioutility/group"/>
-      </component>
-    </collection>
-    <collection id="audioeffectsui" name="Audio Effects UI" level="specific">
-      <component id="equalizer" filter="s60" name="Equalizer">
-        <unit bldFile="audioeffectsui/equalizer/group"/>
-      </component>
-    </collection>
-    <collection id="audioenhancements" name="Audio Enhancements" level="generic">
-      <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
-        <unit bldFile="audioenhancements/enhancedaudioplayerutility/group"/>
-        <!-- should the rest of the bld.infs be #included? -->
-        <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
-        <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
-        <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
-        <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
-        <!-- <unit bldFile="audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
-      </component>
-      <component id="progressivedownload" filter="s60" name="Progressive Download">
-        <unit bldFile="audioenhancements/progressivedownload/group"/>
-        <!-- <unit bldFile="audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
-        <!-- <unit bldFile="audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
-      </component>
-      <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
-        <unit bldFile="audioenhancements/enhancedmediaclient/group"/>
-      </component>
-      <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
-        <unit bldFile="audioenhancements/profilesettingsmonitor/group"/>
-      </component>
-      <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
-        <unit bldFile="audioenhancements/voipaudioservices/group"/>
-      </component>
-      <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
-        <unit bldFile="audioenhancements/configurationcomponentsfactory/group"/>
+  	<collection id="mmfenh" name="MMF Enhancements" level="generic">
+      <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+        <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
       </component>
       <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
-        <unit bldFile="audioenhancements/audiooutputcontrolutility/group"/>
+        <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
       </component>
-      <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
-        <unit bldFile="audioenhancements/callaudiocontrol/group"/>
+      <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+        <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
+      </component>
+      <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+        <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
       </component>
-    </collection>
-    <collection id="metadatautility" name="Metadata Utility" level="generic">
-      <component id="extparserlib3gp_stub" filter="s60" name="3GP Extension Parser Library">
-        <unit bldFile="metadatautility/3gpextparserlib_stub/group"/>
+      <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+        <unit bldFile="mmfenh/enhancedmediaclient/group"/>
       </component>
-      <component id="metadatautility_build" filter="s60" name="Metadata Utility Build">
-        <unit bldFile="metadatautility/group"/>
+      <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+        <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
+      </component>
+      <component id="progressivedownload" filter="s60" name="Progressive Download">
+        <unit bldFile="mmfenh/progressivedownload/group"/>
       </component>
     </collection>
-    <collection id="advancedaudiocontroller" name="Advanced Audio Controller" level="plugin">
-      <component id="audiocontrollerpluginsvariant" filter="s60" name="Audio Controller Plugins Variant" class="plugin">
-        <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
-                <!-- do the rest of these need to be #included? -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
-        <!-- <unit bldFile="advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
+    <collection id="mmfw" name="Multimedia Frameworks" level="framework">
+    </collection>
+    <collection id="mmserv" name="Multimedia Services" level="specific">
+      <component id="audioeffectsui="s60" name="Audio Effects UI">
+        <unit bldFile="mmserv/audioeffectsui/group"/>
+      </component>
+      <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+        <unit bldFile="mmserv/callaudiocontrol/group"/>
+      </component>
+      <component id="metadatautility" filter="s60" name="Metadata Utility">
+        <unit bldFile="mmserv/metadatautility/group"/>
       </component>
-      <component id="wavplaycontrollerplugin" filter="s60" name="WAV Play Controller Plugin" class="plugin">
-        <unit bldFile="advancedaudiocontroller/wavplaycontrollerplugin/group"/>
+      <component id="radioutility" filter="s60" name="Radio Utility">
+        <unit bldFile="mmserv/radioutility/group"/>
       </component>
-      <component id="advancedaudiocontroller_test" filter="s60" name="Advanced Audio Controller Test" purpose="development">
-        <!-- <unit bldFile="advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
+      <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+        <unit bldFile="mmserv/thumbnailengine/group"/>
       </component>
-    </collection>
-    <collection id="thumbnailengine" name="Thumbnail Engine" level="server">
-      <component id="tneengine" filter="s60" name="Thumbnail Engine Build" introduced="^2">
-        <unit bldFile="thumbnailengine/group"/>
+      <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+        <unit bldFile="mmserv/tms/group"/>
       </component>
-    </collection>
-    <collection id="mm_fw" name="Multimedia Framework" level="framework">
-      <component id="helix_stub" filter="s60" name="Helix Stub" introduced="^2">
-        <unit bldFile="mmfw/helix_stub/group"/>
+      <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+        <unit bldFile="mmserv/voipaudioservices/group"/>
       </component>
     </collection>
     <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
       <component id="mmmw_test" filter="s60" name="Multimedia Middleware Test" purpose="development">
-        <!-- <unit bldFile="tsrc/group"/> -->
+        <unit bldFile="tsrc/group"/>
       </component>
       <component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
-        <unit bldFile="mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
-        <unit bldFile="mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
-        <unit bldFile="mmmw_plat/call_audio_control_api/tsrc/group"/>
-        <unit bldFile="mmmw_plat/enhanced_media_client_api/tsrc/group"/>
         <unit bldFile="mmmw_plat/group"/>
-        <unit bldFile="mmmw_plat/radio_utilities_api/tsrc/group"/>
-        <unit bldFile="mmmw_plat/voip_audio_services_api/tsrc/group"/>
       </component>
       <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>