# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268984939 -7200
# Node ID 6c92a12abac0dc24e33683908d1be394b2967277
# Parent  bdf78597b41cf7262d8e17a1e6cde976257bc7e4
Revision: 201005
Kit: 201011

diff -r bdf78597b41c -r 6c92a12abac0 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Jan 26 12:55:56 2010 +0200
+++ b/layers.sysdef.xml	Fri Mar 19 09:48:59 2010 +0200
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/mw/videoutils" >
 ]>
 
-<SystemDefinition name="videoutils" schema="1.4.0">
+<SystemDefinition name="videoutils" schema="1.5.1">
   <systemModel>
     <layer name="mw_layer">
       <module name="videoutils">
@@ -12,12 +12,6 @@
     </layer>
 
 	<layer name="api_test_layer">
-		<module name="videoscheduler_api_tsrc">
-			<unit unitID="vado.videoscheduler_api_test" name="videoscheduler_api_tsrc" bldFile="&layer_real_source_path;/videoutils_plat/videoscheduler_api/tsrc/group" mrp=""/>
-		</module>
-		<module name="videoconnutility_apitsrc">
-			<unit unitID="vado.videoconnutility_api_test" name="videoconnutility_api_tsrc" bldFile="&layer_real_source_path;/videoutils_plat/videoconnutility_api/tsrc/group" mrp=""/>
-		</module>
 	</layer>    
     
   </systemModel>
diff -r bdf78597b41c -r 6c92a12abac0 videoconnutility/connutility/src/vcxconnutilimpl.cpp
--- a/videoconnutility/connutility/src/vcxconnutilimpl.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoconnutility/connutility/src/vcxconnutilimpl.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -22,12 +22,12 @@
 #include <bldvariant.hrh>
 #include <commdb.h>            // CMDBSession
 #include <commsdattypesv1_1.h> // CCDWAPIPBearerRecord
-#include <ConnectionUiUtilities.h> 
+#include <connectionuiutilities.h> 
 #include <cmdestination.h>
 #include <cdbcols.h>
 #include <commdbconnpref.h>
 #include <eikbtgrp.h>
-#include <WlanCdbCols.h>
+#include <wlancdbcols.h>
 #include <connpref.h>
 #include <extendedconnpref.h>
 #include <mpxlog.h>
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp
--- a/videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDES
-#include <ipvideo/CCseScheduledProgram.h>   // Header file for this class
+#include <ipvideo/ccsescheduledprogram.h>   // Header file for this class
 #include "CseDebug.h"               // Debug macros
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp
--- a/videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -17,10 +17,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/CCseSchedulerAPI.h>                   // Header file for this class
-#include <ipvideo/CCseScheduledProgram.h>               // Represent one schedule in database
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
-#include <ipvideo/RCseSchedulerClient.h>                // Client common methods (server start up etc)
+#include <ipvideo/ccseschedulerapi.h>                   // Header file for this class
+#include <ipvideo/ccsescheduledprogram.h>               // Represent one schedule in database
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
+#include <ipvideo/rcseschedulerclient.h>                // Client common methods (server start up etc)
 #include "CseDebug.h"                           // Debug macros
 #include <s32mem.h>
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -17,9 +17,9 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerClient.h>            // Header for this class
+#include <ipvideo/rcseschedulerclient.h>            // Header for this class
 #include "CseDebug.h"                       // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
 #include <e32math.h>
 #include <f32file.h>
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -19,10 +19,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerService.h>               // Header fo this class
-#include <ipvideo/CCseScheduledProgram.h>               // Represent one schedule in database
+#include <ipvideo/rcseschedulerservice.h>               // Header fo this class
+#include <ipvideo/ccsescheduledprogram.h>               // Represent one schedule in database
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Client common methods (server start up etc)
+#include <ipvideo/cseschedulerclientservercommon.h>     // Client common methods (server start up etc)
 #include <s32mem.h>
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -19,10 +19,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerServiceBase.h>       // Client common methods (open, close etc)
-#include <ipvideo/RCseSchedulerClient.h>            // Client common methods (server start up etc)
+#include <ipvideo/rcseschedulerservicebase.h>       // Client common methods (open, close etc)
+#include <ipvideo/rcseschedulerclient.h>            // Client common methods (server start up etc)
 #include "CseDebug.h"                       // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
 
 // EXTERNAL DATA STRUCTURES
 // None.
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/data/102750D5.rss
--- a/videoscheduler/SchedulerServer/data/102750D5.rss	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/data/102750D5.rss	Fri Mar 19 09:48:59 2010 +0200
@@ -18,7 +18,7 @@
 
 
 
-#include <StartupItem.rh>
+#include <startupitem.rh>
 
 RESOURCE STARTUP_ITEM_INFO CseSchedulerServer
 {
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h	Fri Mar 19 09:48:59 2010 +0200
@@ -22,8 +22,8 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <ipvideo/MCsePluginObserver.h>
-#include <ipvideo/MCseScheduleObserver.h>
+#include <ipvideo/mcsepluginobserver.h>
+#include <ipvideo/mcsescheduleobserver.h>
 #include "MCseSchedulerTimerObserver.h"
 #include "MCsePluginControllerObserver.h"
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h	Fri Mar 19 09:48:59 2010 +0200
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <ipvideo/MCsePluginObserver.h>
+#include <ipvideo/mcsepluginobserver.h>
 #include "MCseSemaphoreSignalObserver.h"
 
 // CONSTANTS
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h	Fri Mar 19 09:48:59 2010 +0200
@@ -21,7 +21,7 @@
 #define __CCSESCHEDULERSERVERENGINE_H
 
 //  INCLUDES
-#include <ipvideo/MCseScheduleObserver.h>   // Observer so that CCseSchedulerTimer can inform engine.
+#include <ipvideo/mcsescheduleobserver.h>   // Observer so that CCseSchedulerTimer can inform engine.
 #include "MCsePluginControllerObserver.h"   // Observer so that CCseSchedulerTimer can inform engine.
 #include "CseSchedulerServer.pan"   // Panic codes
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp
--- a/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "CCseScheduleDB.h"         // Header file for this class
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
 #include <bautils.h>
 #include "CseDebug.h"               // Debug macros
 #include <babackup.h>
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -19,9 +19,9 @@
 
 #include "CCseSchedulerLandLord.h"
 #include "CCseSchedulerPluginStarter.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerThreadPacket.h"
-#include <ipvideo/MCseScheduleObserver.h>   // Observer for informing engine
+#include <ipvideo/mcsescheduleobserver.h>   // Observer for informing engine
 #include <e32std.h>
 #include "CseDebug.h"               // Debug macros
 #include "CCseSemaphoreController.h"
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -23,7 +23,7 @@
 #include "CseDebug.h"                           // Debug macros
 #include "CCseSchedulerPluginStarter.h"
 #include "CCseSchedulerLandLord.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 #include "CCseSchedulerThreadPacket.h"
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include "CCseSchedulerPluginControllerBase.h"
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include "CCseSchedulerPluginStarter.h"
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
-#include <ipvideo/CCseSchedulerPluginIF.h>
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
+#include <ipvideo/ccseschedulerpluginif.h>
 #include "CCseSchedulerThreadPacket.h"
 #include "CCseSemaphoreController.h"
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -21,7 +21,7 @@
 #include "CCseSchedulerServer.h"                // Header file for this class
 #include "CCseSchedulerServerSession.h"         // Server session
 #include "CCseSchedulerServerEngine.h"          // Server intelligence aka engine
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
 #include "CseSchedulerServer.pan"               // Server panic codes
 #include "CseDebug.h"                           // Debug macros
 #include <e32svr.h>
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -23,12 +23,12 @@
 #include <e32def.h>
 #include <e32const.h>
 #include "CCseSchedulerServerEngine.h"      // Common methods for server
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
-#include <ipvideo/CCseScheduledProgram.h>           // Represent one schedule in database
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
+#include <ipvideo/ccsescheduledprogram.h>           // Represent one schedule in database
 #include "CseDebug.h"                       // Debug macros
 #include "CCseScheduleDB.h"                 // Schedule database
 #include "CCseSchedulerTimer.h"             // Schedule timer for determining schedule times
-#include <ipvideo/CCseSchedulerPluginIF.h>          // Scheduler plugin interface
+#include <ipvideo/ccseschedulerpluginif.h>          // Scheduler plugin interface
 #include "CCseSchedulerUniPluginController.h"
 #include "CCseSchedulerMultiPluginController.h"
 #include "CCseSchedulerServer.h"
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -22,7 +22,7 @@
 #include "CCseSchedulerServer.h"                // Common methods for server
 #include "CCseSchedulerServerEngine.h"          // Intelligence aka engine of server
 #include "CseSchedulerServer.pan"               // Server panic codes
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
 #include "CseDebug.h"                           // Debug macros
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "CCseSchedulerThreadPacket.h"
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
 #include <e32std.h>
 #include "CseDebug.h"               // Debug macros
 
diff -r bdf78597b41c -r 6c92a12abac0 videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -23,7 +23,7 @@
 #include "CseDebug.h"                           // Debug macros
 #include "CCseSchedulerPluginStarter.h"
 #include "CCseSchedulerLandLord.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 
diff -r bdf78597b41c -r 6c92a12abac0 videoutils.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videoutils.pro	Fri Mar 19 09:48:59 2010 +0200
@@ -0,0 +1,22 @@
+#
+# 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 the License "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:   Definitions for video type*
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+symbian: {
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoutils_plat/group/bld.inf\""
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoconnutility/group/bld.inf\""
+}
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/BWINS/VCXTestCommonu.def
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/BWINS/VCXTestCommonu.def	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/BWINS/VCXTestCommonu.def	Fri Mar 19 09:48:59 2010 +0200
@@ -145,7 +145,4 @@
 	?WriteVerifyData@CVCXTestCommon@@QAEHAAVTDesC16@@0@Z @ 144 NONAME ; int CVCXTestCommon::WriteVerifyData(class TDesC16 &, class TDesC16 &)
 	?WriteVerifyDataL@CIptvTestVerifyData@@QAEHAAVTDesC16@@0@Z @ 145 NONAME ; int CIptvTestVerifyData::WriteVerifyDataL(class TDesC16 &, class TDesC16 &)
 	?ListFilesProcessesAndThreadsL@CVCXTestCommon@@SAXAAVRFs@@@Z @ 146 NONAME ; void CVCXTestCommon::ListFilesProcessesAndThreadsL(class RFs &)
-	?GetDefaultIap@CIptvTestUtilALR@@QAEKXZ @ 147 NONAME ; unsigned long CIptvTestUtilALR::GetDefaultIap(void)
-	?SetDefaultIapCenRep@CIptvTestUtilALR@@QAEHXZ @ 148 NONAME ; int CIptvTestUtilALR::SetDefaultIapCenRep(void)
-	?GetDefaultIapCenRep@CIptvTestUtilALR@@QAEKXZ @ 149 NONAME ; unsigned long CIptvTestUtilALR::GetDefaultIapCenRep(void)
 
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/EABI/VCXTestCommonu.def
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/EABI/VCXTestCommonu.def	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/EABI/VCXTestCommonu.def	Fri Mar 19 09:48:59 2010 +0200
@@ -38,183 +38,180 @@
 	_ZN14CVCXTestCommon22EnableVerifyTimestampsEi @ 37 NONAME
 	_ZN14CVCXTestCommon24AdvanceSystemTimeMinutesEi @ 38 NONAME
 	_ZN14CVCXTestCommon24AdvanceSystemTimeSecondsEi @ 39 NONAME
-	_ZN14CVCXTestCommon29ListFilesProcessesAndThreadsLER3RFs @ 40 NONAME
-	_ZN14CVCXTestCommon4NewLEv @ 41 NONAME
-	_ZN14CVCXTestCommon7ListDirERK7TDesC16i @ 42 NONAME
-	_ZN14CVCXTestCommon9GetIapIdLERK7TDesC16Rm @ 43 NONAME
-	_ZN14CVCXTestCommon9PrintIapsEv @ 44 NONAME
-	_ZN16CIptvTestUtilALR11CopyMethodLER7TDesC16S1_S1_ @ 45 NONAME
-	_ZN16CIptvTestUtilALR13DeleteMethodLER7TDesC16S1_ @ 46 NONAME
-	_ZN16CIptvTestUtilALR13GetDefaultIapEv @ 47 NONAME
-	_ZN16CIptvTestUtilALR17GetDestinationIdLER7TDesC16 @ 48 NONAME
-	_ZN16CIptvTestUtilALR18CreateDestinationLER7TDesC16 @ 49 NONAME
-	_ZN16CIptvTestUtilALR18DeleteDestinationLER7TDesC16 @ 50 NONAME
-	_ZN16CIptvTestUtilALR18SetMethodPriorityLER7TDesC16S1_m @ 51 NONAME
-	_ZN16CIptvTestUtilALR19SetUsedDestinationLER7TDesC16 @ 52 NONAME
-	_ZN16CIptvTestUtilALR22SetMethodIntAttributeLER7TDesC16S1_ii @ 53 NONAME
-	_ZN16CIptvTestUtilALR23SetMethodBoolAttributeLER7TDesC16S1_ii @ 54 NONAME
-	_ZN16CIptvTestUtilALR25SetMethodStringAttributeLER7TDesC16S1_iS1_ @ 55 NONAME
-	_ZN16CIptvTestUtilALR28RemoveUsedDestinationCenRepLEv @ 56 NONAME
-	_ZN16CIptvTestUtilALR32TerminateDestinationConnectionsLER7TDesC16 @ 57 NONAME
-	_ZN16CIptvTestUtilALR4NewLEv @ 58 NONAME
-	_ZN16CIptvTestUtilALR5NewLCEv @ 59 NONAME
-	_ZN16CIptvTestUtilALRD0Ev @ 60 NONAME
-	_ZN16CIptvTestUtilALRD1Ev @ 61 NONAME
-	_ZN16CIptvTestUtilALRD2Ev @ 62 NONAME
-	_ZN17CVCXTestTimerWait10ConstructLEv @ 63 NONAME
-	_ZN17CVCXTestTimerWait4NewLEv @ 64 NONAME
-	_ZN17CVCXTestTimerWait5WaitLEm @ 65 NONAME
-	_ZN17CVCXTestTimerWaitD0Ev @ 66 NONAME
-	_ZN17CVCXTestTimerWaitD1Ev @ 67 NONAME
-	_ZN17CVCXTestTimerWaitD2Ev @ 68 NONAME
-	_ZN19CIptvTestActiveWait10ActiveWaitENS_22TIptvTestActiveWaitCmdE @ 69 NONAME
-	_ZN19CIptvTestActiveWait10ConstructLEv @ 70 NONAME
-	_ZN19CIptvTestActiveWait4NewLEv @ 71 NONAME
-	_ZN19CIptvTestActiveWait4StopEv @ 72 NONAME
-	_ZN19CIptvTestActiveWait5StartEv @ 73 NONAME
-	_ZN19CIptvTestActiveWait9IsWaitingEv @ 74 NONAME
-	_ZN19CIptvTestActiveWaitC1Ev @ 75 NONAME
-	_ZN19CIptvTestActiveWaitC2Ev @ 76 NONAME
-	_ZN19CIptvTestActiveWaitD0Ev @ 77 NONAME
-	_ZN19CIptvTestActiveWaitD1Ev @ 78 NONAME
-	_ZN19CIptvTestActiveWaitD2Ev @ 79 NONAME
-	_ZN19CIptvTestVerifyData11VerifyDataLER7TDesC16RNS_13TVerifyResultE @ 80 NONAME
-	_ZN19CIptvTestVerifyData16EnableTimestampsEi @ 81 NONAME
-	_ZN19CIptvTestVerifyData16WriteVerifyDataLER7TDesC16S1_ @ 82 NONAME
-	_ZN19CIptvTestVerifyData17CreateVerifyDataLER7TDesC16i @ 83 NONAME
-	_ZN19CIptvTestVerifyData4NewLEv @ 84 NONAME
-	_ZN19CIptvTestVerifyDataD0Ev @ 85 NONAME
-	_ZN19CIptvTestVerifyDataD1Ev @ 86 NONAME
-	_ZN19CIptvTestVerifyDataD2Ev @ 87 NONAME
-	_ZN19CTestUtilConnection20TerminateConnectionLEv @ 88 NONAME
-	_ZN19CTestUtilConnection24SetConnectionPreferencesEjm @ 89 NONAME
-	_ZN19CTestUtilConnection4NewLEP27MTestUtilConnectionObserver @ 90 NONAME
-	_ZN19CTestUtilConnection5NewLCEP27MTestUtilConnectionObserver @ 91 NONAME
-	_ZN19CTestUtilConnection7AttachLEv @ 92 NONAME
-	_ZN19CTestUtilConnection8ConnectLEv @ 93 NONAME
-	_ZN19CTestUtilConnectionD0Ev @ 94 NONAME
-	_ZN19CTestUtilConnectionD1Ev @ 95 NONAME
-	_ZN19CTestUtilConnectionD2Ev @ 96 NONAME
-	_ZN19CVCXTestMessageWait10AddMessageEl @ 97 NONAME
-	_ZN19CVCXTestMessageWait10ConstructLEv @ 98 NONAME
-	_ZN19CVCXTestMessageWait11WaitForAllLEii @ 99 NONAME
-	_ZN19CVCXTestMessageWait14ReceiveMessageEli @ 100 NONAME
-	_ZN19CVCXTestMessageWait15WaitForMessageLElii @ 101 NONAME
-	_ZN19CVCXTestMessageWait21ResetReceivedMessagesEv @ 102 NONAME
-	_ZN19CVCXTestMessageWait4NewLEP27MVCXTestMessageWaitObserver @ 103 NONAME
-	_ZN19CVCXTestMessageWait5ResetEv @ 104 NONAME
-	_ZN19CVCXTestMessageWait9CoolDownLEi @ 105 NONAME
-	_ZN19CVCXTestMessageWaitC1EP27MVCXTestMessageWaitObserver @ 106 NONAME
-	_ZN19CVCXTestMessageWaitC2EP27MVCXTestMessageWaitObserver @ 107 NONAME
-	_ZN19CVCXTestMessageWaitD0Ev @ 108 NONAME
-	_ZN19CVCXTestMessageWaitD1Ev @ 109 NONAME
-	_ZN19CVCXTestMessageWaitD2Ev @ 110 NONAME
-	_ZN19CVCXTestStatsKeeper10ActionEndLERK7TDesC16i @ 111 NONAME
-	_ZN19CVCXTestStatsKeeper10ActionEndLEli @ 112 NONAME
-	_ZN19CVCXTestStatsKeeper12ActionStartLERK7TDesC16S2_i @ 113 NONAME
-	_ZN19CVCXTestStatsKeeper12ActionStartLElRK7TDesC16 @ 114 NONAME
-	_ZN19CVCXTestStatsKeeper12ActionTraceLERK7TDesC16 @ 115 NONAME
-	_ZN19CVCXTestStatsKeeper15ActionProgressLERK7TDesC16S2_ @ 116 NONAME
-	_ZN19CVCXTestStatsKeeper15ActionProgressLElRK7TDesC16 @ 117 NONAME
-	_ZN19CVCXTestStatsKeeper18StartStatsKeepingLERK7TDesC16S2_ @ 118 NONAME
-	_ZN19CVCXTestStatsKeeper4NewLEv @ 119 NONAME
-	_ZN20CIptvTestEventWaiter13CheckTimeoutsEv @ 120 NONAME
-	_ZN20CIptvTestEventWaiter13EventHappenedEP14CIptvTestEventPS1_ @ 121 NONAME
-	_ZN20CIptvTestEventWaiter13GetEventCountEv @ 122 NONAME
-	_ZN20CIptvTestEventWaiter4NewLER28MIptvTestEventWaiterObserver @ 123 NONAME
-	_ZN20CIptvTestEventWaiter5ResetEv @ 124 NONAME
-	_ZN20CIptvTestEventWaiter8AddEventEP14CIptvTestEventi @ 125 NONAME
-	_ZN20CIptvTestEventWaiterD0Ev @ 126 NONAME
-	_ZN20CIptvTestEventWaiterD1Ev @ 127 NONAME
-	_ZN20CIptvTestEventWaiterD2Ev @ 128 NONAME
-	_ZN20CVCXTestPSSubscriber11WaitChangeLEv @ 129 NONAME
-	_ZN20CVCXTestPSSubscriber3GetER6TDes16 @ 130 NONAME
-	_ZN20CVCXTestPSSubscriber3GetERi @ 131 NONAME
-	_ZN20CVCXTestPSSubscriber3SetERK7TDesC16 @ 132 NONAME
-	_ZN20CVCXTestPSSubscriber3SetERi @ 133 NONAME
-	_ZN20CVCXTestPSSubscriber4NewLE4TUidmN9RProperty5TTypeEP18MVCXTestPSObserver @ 134 NONAME
-	_ZN20CVCXTestPSSubscriber5StartEv @ 135 NONAME
-	_ZN20CVCXTestPSSubscriber7EndWaitEv @ 136 NONAME
-	_ZN20CVCXTestPSSubscriber8DoCancelEv @ 137 NONAME
-	_ZN20CVCXTestPSSubscriberD0Ev @ 138 NONAME
-	_ZN20CVCXTestPSSubscriberD1Ev @ 139 NONAME
-	_ZN20CVCXTestPSSubscriberD2Ev @ 140 NONAME
-	_ZN21CIptvTestVideoCreator10ConstructLEv @ 141 NONAME
-	_ZN21CIptvTestVideoCreator12CreateVideoLENS_18TIptvTestVideoTypeER7TDesC16i @ 142 NONAME
-	_ZN21CIptvTestVideoCreator12GetVideoFileER6TDes16NS_18TIptvTestVideoTypeERK7TDesC16 @ 143 NONAME
-	_ZN21CIptvTestVideoCreator13CreateVideosLENS_18TIptvTestVideoTypeER7TDesC16iR13RPointerArrayI7HBufC16E @ 144 NONAME
-	_ZN21CIptvTestVideoCreator4NewLEv @ 145 NONAME
-	_ZN21CIptvTestVideoCreatorC1Ev @ 146 NONAME
-	_ZN21CIptvTestVideoCreatorC2Ev @ 147 NONAME
-	_ZN21CIptvTestVideoCreatorD0Ev @ 148 NONAME
-	_ZN21CIptvTestVideoCreatorD1Ev @ 149 NONAME
-	_ZN21CIptvTestVideoCreatorD2Ev @ 150 NONAME
-	_ZN24CIptvTestDownloadManager10ConstructLEv @ 151 NONAME
-	_ZN24CIptvTestDownloadManager4NewLEP25MTestUtilDownloadObserver @ 152 NONAME
-	_ZN24CIptvTestDownloadManager5NewLCEP25MTestUtilDownloadObserver @ 153 NONAME
-	_ZN24CIptvTestDownloadManager8GetErrorER13RHttpDownloadRl @ 154 NONAME
-	_ZN24CIptvTestDownloadManager9DownloadLER7TDesC16S1_S1_S1_li @ 155 NONAME
-	_ZN24CIptvTestDownloadManagerD0Ev @ 156 NONAME
-	_ZN24CIptvTestDownloadManagerD1Ev @ 157 NONAME
-	_ZN24CIptvTestDownloadManagerD2Ev @ 158 NONAME
-	_ZN25CTestUtilConnectionWaiter17WaitForConnectionEm @ 159 NONAME
-	_ZN25CTestUtilConnectionWaiter18IsConnectionActiveEm @ 160 NONAME
-	_ZN25CTestUtilConnectionWaiter27WaitUntilConnectionIsClosedEm @ 161 NONAME
-	_ZN25CTestUtilConnectionWaiter4NewLEP27MTestUtilConnectionObserver @ 162 NONAME
-	_ZN25CTestUtilConnectionWaiter5NewLCEP27MTestUtilConnectionObserver @ 163 NONAME
-	_ZN25CTestUtilConnectionWaiterC1EP27MTestUtilConnectionObserver @ 164 NONAME
-	_ZN25CTestUtilConnectionWaiterC2EP27MTestUtilConnectionObserver @ 165 NONAME
-	_ZN25CTestUtilConnectionWaiterD0Ev @ 166 NONAME
-	_ZN25CTestUtilConnectionWaiterD1Ev @ 167 NONAME
-	_ZN25CTestUtilConnectionWaiterD2Ev @ 168 NONAME
-	_ZN27CIptvTestMobilecrashWatcher16CheckNewCrashesLEv @ 169 NONAME
-	_ZN27CIptvTestMobilecrashWatcher16ReturnNewCrashesER13RPointerArrayI7HBufC16E @ 170 NONAME
-	_ZN27CIptvTestMobilecrashWatcher18ReadMobilecrashesLER13RPointerArrayI7HBufC16ERK7TDesC16 @ 171 NONAME
-	_ZN27CIptvTestMobilecrashWatcher21CompareMobilecrashesLER13RPointerArrayI7HBufC16ES3_ @ 172 NONAME
-	_ZN27CIptvTestMobilecrashWatcher22ReturnMobileCrashCountEv @ 173 NONAME
-	_ZN27CIptvTestMobilecrashWatcher4NewLEi @ 174 NONAME
-	_ZN27CIptvTestMobilecrashWatcher4NewLEv @ 175 NONAME
-	_ZN27CIptvTestMobilecrashWatcherD0Ev @ 176 NONAME
-	_ZN27CIptvTestMobilecrashWatcherD1Ev @ 177 NONAME
-	_ZN27CIptvTestMobilecrashWatcherD2Ev @ 178 NONAME
-	_ZTI11CVerifyFile @ 179 NONAME
-	_ZTI14CIptvTestEvent @ 180 NONAME
-	_ZTI14CIptvTestTimer @ 181 NONAME
-	_ZTI14CVCXTestCommon @ 182 NONAME
-	_ZTI16CIptvTestUtilALR @ 183 NONAME
-	_ZTI17CVCXTestStatsItem @ 184 NONAME
-	_ZTI17CVCXTestTimerWait @ 185 NONAME
-	_ZTI19CIptvTestActiveWait @ 186 NONAME
-	_ZTI19CIptvTestVerifyData @ 187 NONAME
-	_ZTI19CTestUtilConnection @ 188 NONAME
-	_ZTI19CVCXTestMessageWait @ 189 NONAME
-	_ZTI19CVCXTestStatsKeeper @ 190 NONAME
-	_ZTI20CIptvTestEventWaiter @ 191 NONAME
-	_ZTI20CVCXTestPSSubscriber @ 192 NONAME
-	_ZTI21CIptvTestVideoCreator @ 193 NONAME
-	_ZTI24CIptvTestDownloadManager @ 194 NONAME
-	_ZTI24CVCXTestStatsItemSummary @ 195 NONAME
-	_ZTI25CTestUtilConnectionWaiter @ 196 NONAME
-	_ZTI27CIptvTestMobilecrashWatcher @ 197 NONAME
-	_ZTV11CVerifyFile @ 198 NONAME
-	_ZTV14CIptvTestEvent @ 199 NONAME
-	_ZTV14CIptvTestTimer @ 200 NONAME
-	_ZTV14CVCXTestCommon @ 201 NONAME
-	_ZTV16CIptvTestUtilALR @ 202 NONAME
-	_ZTV17CVCXTestStatsItem @ 203 NONAME
-	_ZTV17CVCXTestTimerWait @ 204 NONAME
-	_ZTV19CIptvTestActiveWait @ 205 NONAME
-	_ZTV19CIptvTestVerifyData @ 206 NONAME
-	_ZTV19CTestUtilConnection @ 207 NONAME
-	_ZTV19CVCXTestMessageWait @ 208 NONAME
-	_ZTV19CVCXTestStatsKeeper @ 209 NONAME
-	_ZTV20CIptvTestEventWaiter @ 210 NONAME
-	_ZTV20CVCXTestPSSubscriber @ 211 NONAME
-	_ZTV21CIptvTestVideoCreator @ 212 NONAME
-	_ZTV24CIptvTestDownloadManager @ 213 NONAME
-	_ZTV24CVCXTestStatsItemSummary @ 214 NONAME
-	_ZTV25CTestUtilConnectionWaiter @ 215 NONAME
-	_ZTV27CIptvTestMobilecrashWatcher @ 216 NONAME
-	_ZN16CIptvTestUtilALR19GetDefaultIapCenRepEv @ 217 NONAME
-	_ZN16CIptvTestUtilALR19SetDefaultIapCenRepEv @ 218 NONAME
+	_ZN14CVCXTestCommon4NewLEv @ 40 NONAME
+	_ZN14CVCXTestCommon7ListDirERK7TDesC16i @ 41 NONAME
+	_ZN14CVCXTestCommon9GetIapIdLERK7TDesC16Rm @ 42 NONAME
+	_ZN14CVCXTestCommon9PrintIapsEv @ 43 NONAME
+	_ZN16CIptvTestUtilALR11CopyMethodLER7TDesC16S1_S1_ @ 44 NONAME
+	_ZN16CIptvTestUtilALR13DeleteMethodLER7TDesC16S1_ @ 45 NONAME
+	_ZN16CIptvTestUtilALR17GetDestinationIdLER7TDesC16 @ 46 NONAME
+	_ZN16CIptvTestUtilALR18CreateDestinationLER7TDesC16 @ 47 NONAME
+	_ZN16CIptvTestUtilALR18DeleteDestinationLER7TDesC16 @ 48 NONAME
+	_ZN16CIptvTestUtilALR18SetMethodPriorityLER7TDesC16S1_m @ 49 NONAME
+	_ZN16CIptvTestUtilALR19SetUsedDestinationLER7TDesC16 @ 50 NONAME
+	_ZN16CIptvTestUtilALR22SetMethodIntAttributeLER7TDesC16S1_ii @ 51 NONAME
+	_ZN16CIptvTestUtilALR23SetMethodBoolAttributeLER7TDesC16S1_ii @ 52 NONAME
+	_ZN16CIptvTestUtilALR25SetMethodStringAttributeLER7TDesC16S1_iS1_ @ 53 NONAME
+	_ZN16CIptvTestUtilALR28RemoveUsedDestinationCenRepLEv @ 54 NONAME
+	_ZN16CIptvTestUtilALR32TerminateDestinationConnectionsLER7TDesC16 @ 55 NONAME
+	_ZN16CIptvTestUtilALR4NewLEv @ 56 NONAME
+	_ZN16CIptvTestUtilALR5NewLCEv @ 57 NONAME
+	_ZN16CIptvTestUtilALRD0Ev @ 58 NONAME
+	_ZN16CIptvTestUtilALRD1Ev @ 59 NONAME
+	_ZN16CIptvTestUtilALRD2Ev @ 60 NONAME
+	_ZN17CVCXTestTimerWait10ConstructLEv @ 61 NONAME
+	_ZN17CVCXTestTimerWait4NewLEv @ 62 NONAME
+	_ZN17CVCXTestTimerWait5WaitLEm @ 63 NONAME
+	_ZN17CVCXTestTimerWaitD0Ev @ 64 NONAME
+	_ZN17CVCXTestTimerWaitD1Ev @ 65 NONAME
+	_ZN17CVCXTestTimerWaitD2Ev @ 66 NONAME
+	_ZN19CIptvTestActiveWait10ActiveWaitENS_22TIptvTestActiveWaitCmdE @ 67 NONAME
+	_ZN19CIptvTestActiveWait10ConstructLEv @ 68 NONAME
+	_ZN19CIptvTestActiveWait4NewLEv @ 69 NONAME
+	_ZN19CIptvTestActiveWait4StopEv @ 70 NONAME
+	_ZN19CIptvTestActiveWait5StartEv @ 71 NONAME
+	_ZN19CIptvTestActiveWait9IsWaitingEv @ 72 NONAME
+	_ZN19CIptvTestActiveWaitC1Ev @ 73 NONAME
+	_ZN19CIptvTestActiveWaitC2Ev @ 74 NONAME
+	_ZN19CIptvTestActiveWaitD0Ev @ 75 NONAME
+	_ZN19CIptvTestActiveWaitD1Ev @ 76 NONAME
+	_ZN19CIptvTestActiveWaitD2Ev @ 77 NONAME
+	_ZN19CIptvTestVerifyData11VerifyDataLER7TDesC16RNS_13TVerifyResultE @ 78 NONAME
+	_ZN19CIptvTestVerifyData16EnableTimestampsEi @ 79 NONAME
+	_ZN19CIptvTestVerifyData16WriteVerifyDataLER7TDesC16S1_ @ 80 NONAME
+	_ZN19CIptvTestVerifyData17CreateVerifyDataLER7TDesC16i @ 81 NONAME
+	_ZN19CIptvTestVerifyData4NewLEv @ 82 NONAME
+	_ZN19CIptvTestVerifyDataD0Ev @ 83 NONAME
+	_ZN19CIptvTestVerifyDataD1Ev @ 84 NONAME
+	_ZN19CIptvTestVerifyDataD2Ev @ 85 NONAME
+	_ZN19CTestUtilConnection20TerminateConnectionLEv @ 86 NONAME
+	_ZN19CTestUtilConnection24SetConnectionPreferencesEjm @ 87 NONAME
+	_ZN19CTestUtilConnection4NewLEP27MTestUtilConnectionObserver @ 88 NONAME
+	_ZN19CTestUtilConnection5NewLCEP27MTestUtilConnectionObserver @ 89 NONAME
+	_ZN19CTestUtilConnection7AttachLEv @ 90 NONAME
+	_ZN19CTestUtilConnection8ConnectLEv @ 91 NONAME
+	_ZN19CTestUtilConnectionD0Ev @ 92 NONAME
+	_ZN19CTestUtilConnectionD1Ev @ 93 NONAME
+	_ZN19CTestUtilConnectionD2Ev @ 94 NONAME
+	_ZN19CVCXTestMessageWait10AddMessageEl @ 95 NONAME
+	_ZN19CVCXTestMessageWait10ConstructLEv @ 96 NONAME
+	_ZN19CVCXTestMessageWait11WaitForAllLEii @ 97 NONAME
+	_ZN19CVCXTestMessageWait14ReceiveMessageEli @ 98 NONAME
+	_ZN19CVCXTestMessageWait15WaitForMessageLElii @ 99 NONAME
+	_ZN19CVCXTestMessageWait21ResetReceivedMessagesEv @ 100 NONAME
+	_ZN19CVCXTestMessageWait4NewLEP27MVCXTestMessageWaitObserver @ 101 NONAME
+	_ZN19CVCXTestMessageWait5ResetEv @ 102 NONAME
+	_ZN19CVCXTestMessageWait9CoolDownLEi @ 103 NONAME
+	_ZN19CVCXTestMessageWaitC1EP27MVCXTestMessageWaitObserver @ 104 NONAME
+	_ZN19CVCXTestMessageWaitC2EP27MVCXTestMessageWaitObserver @ 105 NONAME
+	_ZN19CVCXTestMessageWaitD0Ev @ 106 NONAME
+	_ZN19CVCXTestMessageWaitD1Ev @ 107 NONAME
+	_ZN19CVCXTestMessageWaitD2Ev @ 108 NONAME
+	_ZN19CVCXTestStatsKeeper10ActionEndLERK7TDesC16i @ 109 NONAME
+	_ZN19CVCXTestStatsKeeper10ActionEndLEli @ 110 NONAME
+	_ZN19CVCXTestStatsKeeper12ActionStartLERK7TDesC16S2_i @ 111 NONAME
+	_ZN19CVCXTestStatsKeeper12ActionStartLElRK7TDesC16 @ 112 NONAME
+	_ZN19CVCXTestStatsKeeper12ActionTraceLERK7TDesC16 @ 113 NONAME
+	_ZN19CVCXTestStatsKeeper15ActionProgressLERK7TDesC16S2_ @ 114 NONAME
+	_ZN19CVCXTestStatsKeeper15ActionProgressLElRK7TDesC16 @ 115 NONAME
+	_ZN19CVCXTestStatsKeeper18StartStatsKeepingLERK7TDesC16S2_ @ 116 NONAME
+	_ZN19CVCXTestStatsKeeper4NewLEv @ 117 NONAME
+	_ZN20CIptvTestEventWaiter13CheckTimeoutsEv @ 118 NONAME
+	_ZN20CIptvTestEventWaiter13EventHappenedEP14CIptvTestEventPS1_ @ 119 NONAME
+	_ZN20CIptvTestEventWaiter13GetEventCountEv @ 120 NONAME
+	_ZN20CIptvTestEventWaiter4NewLER28MIptvTestEventWaiterObserver @ 121 NONAME
+	_ZN20CIptvTestEventWaiter5ResetEv @ 122 NONAME
+	_ZN20CIptvTestEventWaiter8AddEventEP14CIptvTestEventi @ 123 NONAME
+	_ZN20CIptvTestEventWaiterD0Ev @ 124 NONAME
+	_ZN20CIptvTestEventWaiterD1Ev @ 125 NONAME
+	_ZN20CIptvTestEventWaiterD2Ev @ 126 NONAME
+	_ZN20CVCXTestPSSubscriber11WaitChangeLEv @ 127 NONAME
+	_ZN20CVCXTestPSSubscriber3GetER6TDes16 @ 128 NONAME
+	_ZN20CVCXTestPSSubscriber3GetERi @ 129 NONAME
+	_ZN20CVCXTestPSSubscriber3SetERK7TDesC16 @ 130 NONAME
+	_ZN20CVCXTestPSSubscriber3SetERi @ 131 NONAME
+	_ZN20CVCXTestPSSubscriber4NewLE4TUidmN9RProperty5TTypeEP18MVCXTestPSObserver @ 132 NONAME
+	_ZN20CVCXTestPSSubscriber5StartEv @ 133 NONAME
+	_ZN20CVCXTestPSSubscriber7EndWaitEv @ 134 NONAME
+	_ZN20CVCXTestPSSubscriber8DoCancelEv @ 135 NONAME
+	_ZN20CVCXTestPSSubscriberD0Ev @ 136 NONAME
+	_ZN20CVCXTestPSSubscriberD1Ev @ 137 NONAME
+	_ZN20CVCXTestPSSubscriberD2Ev @ 138 NONAME
+	_ZN21CIptvTestVideoCreator10ConstructLEv @ 139 NONAME
+	_ZN21CIptvTestVideoCreator12CreateVideoLENS_18TIptvTestVideoTypeER7TDesC16i @ 140 NONAME
+	_ZN21CIptvTestVideoCreator12GetVideoFileER6TDes16NS_18TIptvTestVideoTypeERK7TDesC16 @ 141 NONAME
+	_ZN21CIptvTestVideoCreator13CreateVideosLENS_18TIptvTestVideoTypeER7TDesC16iR13RPointerArrayI7HBufC16E @ 142 NONAME
+	_ZN21CIptvTestVideoCreator4NewLEv @ 143 NONAME
+	_ZN21CIptvTestVideoCreatorC1Ev @ 144 NONAME
+	_ZN21CIptvTestVideoCreatorC2Ev @ 145 NONAME
+	_ZN21CIptvTestVideoCreatorD0Ev @ 146 NONAME
+	_ZN21CIptvTestVideoCreatorD1Ev @ 147 NONAME
+	_ZN21CIptvTestVideoCreatorD2Ev @ 148 NONAME
+	_ZN24CIptvTestDownloadManager10ConstructLEv @ 149 NONAME
+	_ZN24CIptvTestDownloadManager4NewLEP25MTestUtilDownloadObserver @ 150 NONAME
+	_ZN24CIptvTestDownloadManager5NewLCEP25MTestUtilDownloadObserver @ 151 NONAME
+	_ZN24CIptvTestDownloadManager8GetErrorER13RHttpDownloadRl @ 152 NONAME
+	_ZN24CIptvTestDownloadManager9DownloadLER7TDesC16S1_S1_S1_li @ 153 NONAME
+	_ZN24CIptvTestDownloadManagerD0Ev @ 154 NONAME
+	_ZN24CIptvTestDownloadManagerD1Ev @ 155 NONAME
+	_ZN24CIptvTestDownloadManagerD2Ev @ 156 NONAME
+	_ZN25CTestUtilConnectionWaiter17WaitForConnectionEm @ 157 NONAME
+	_ZN25CTestUtilConnectionWaiter18IsConnectionActiveEm @ 158 NONAME
+	_ZN25CTestUtilConnectionWaiter27WaitUntilConnectionIsClosedEm @ 159 NONAME
+	_ZN25CTestUtilConnectionWaiter4NewLEP27MTestUtilConnectionObserver @ 160 NONAME
+	_ZN25CTestUtilConnectionWaiter5NewLCEP27MTestUtilConnectionObserver @ 161 NONAME
+	_ZN25CTestUtilConnectionWaiterC1EP27MTestUtilConnectionObserver @ 162 NONAME
+	_ZN25CTestUtilConnectionWaiterC2EP27MTestUtilConnectionObserver @ 163 NONAME
+	_ZN25CTestUtilConnectionWaiterD0Ev @ 164 NONAME
+	_ZN25CTestUtilConnectionWaiterD1Ev @ 165 NONAME
+	_ZN25CTestUtilConnectionWaiterD2Ev @ 166 NONAME
+	_ZN27CIptvTestMobilecrashWatcher16CheckNewCrashesLEv @ 167 NONAME
+	_ZN27CIptvTestMobilecrashWatcher16ReturnNewCrashesER13RPointerArrayI7HBufC16E @ 168 NONAME
+	_ZN27CIptvTestMobilecrashWatcher18ReadMobilecrashesLER13RPointerArrayI7HBufC16ERK7TDesC16 @ 169 NONAME
+	_ZN27CIptvTestMobilecrashWatcher21CompareMobilecrashesLER13RPointerArrayI7HBufC16ES3_ @ 170 NONAME
+	_ZN27CIptvTestMobilecrashWatcher22ReturnMobileCrashCountEv @ 171 NONAME
+	_ZN27CIptvTestMobilecrashWatcher4NewLEi @ 172 NONAME
+	_ZN27CIptvTestMobilecrashWatcher4NewLEv @ 173 NONAME
+	_ZN27CIptvTestMobilecrashWatcherD0Ev @ 174 NONAME
+	_ZN27CIptvTestMobilecrashWatcherD1Ev @ 175 NONAME
+	_ZN27CIptvTestMobilecrashWatcherD2Ev @ 176 NONAME
+	_ZTI11CVerifyFile @ 177 NONAME ; #<TI>#
+	_ZTI14CIptvTestEvent @ 178 NONAME ; #<TI>#
+	_ZTI14CIptvTestTimer @ 179 NONAME ; #<TI>#
+	_ZTI14CVCXTestCommon @ 180 NONAME ; #<TI>#
+	_ZTI16CIptvTestUtilALR @ 181 NONAME ; #<TI>#
+	_ZTI17CVCXTestStatsItem @ 182 NONAME ; #<TI>#
+	_ZTI17CVCXTestTimerWait @ 183 NONAME ; #<TI>#
+	_ZTI19CIptvTestActiveWait @ 184 NONAME ; #<TI>#
+	_ZTI19CIptvTestVerifyData @ 185 NONAME ; #<TI>#
+	_ZTI19CTestUtilConnection @ 186 NONAME ; #<TI>#
+	_ZTI19CVCXTestMessageWait @ 187 NONAME ; #<TI>#
+	_ZTI19CVCXTestStatsKeeper @ 188 NONAME ; #<TI>#
+	_ZTI20CIptvTestEventWaiter @ 189 NONAME ; #<TI>#
+	_ZTI20CVCXTestPSSubscriber @ 190 NONAME ; #<TI>#
+	_ZTI21CIptvTestVideoCreator @ 191 NONAME ; #<TI>#
+	_ZTI24CIptvTestDownloadManager @ 192 NONAME ; #<TI>#
+	_ZTI24CVCXTestStatsItemSummary @ 193 NONAME ; #<TI>#
+	_ZTI25CTestUtilConnectionWaiter @ 194 NONAME ; #<TI>#
+	_ZTI27CIptvTestMobilecrashWatcher @ 195 NONAME ; #<TI>#
+	_ZTV11CVerifyFile @ 196 NONAME ; #<VT>#
+	_ZTV14CIptvTestEvent @ 197 NONAME ; #<VT>#
+	_ZTV14CIptvTestTimer @ 198 NONAME ; #<VT>#
+	_ZTV14CVCXTestCommon @ 199 NONAME ; #<VT>#
+	_ZTV16CIptvTestUtilALR @ 200 NONAME ; #<VT>#
+	_ZTV17CVCXTestStatsItem @ 201 NONAME ; #<VT>#
+	_ZTV17CVCXTestTimerWait @ 202 NONAME ; #<VT>#
+	_ZTV19CIptvTestActiveWait @ 203 NONAME ; #<VT>#
+	_ZTV19CIptvTestVerifyData @ 204 NONAME ; #<VT>#
+	_ZTV19CTestUtilConnection @ 205 NONAME ; #<VT>#
+	_ZTV19CVCXTestMessageWait @ 206 NONAME ; #<VT>#
+	_ZTV19CVCXTestStatsKeeper @ 207 NONAME ; #<VT>#
+	_ZTV20CIptvTestEventWaiter @ 208 NONAME ; #<VT>#
+	_ZTV20CVCXTestPSSubscriber @ 209 NONAME ; #<VT>#
+	_ZTV21CIptvTestVideoCreator @ 210 NONAME ; #<VT>#
+	_ZTV24CIptvTestDownloadManager @ 211 NONAME ; #<VT>#
+	_ZTV24CVCXTestStatsItemSummary @ 212 NONAME ; #<VT>#
+	_ZTV25CTestUtilConnectionWaiter @ 213 NONAME ; #<VT>#
+	_ZTV27CIptvTestMobilecrashWatcher @ 214 NONAME ; #<VT>#
+	_ZN14CVCXTestCommon29ListFilesProcessesAndThreadsLER3RFs @ 215 NONAME
 
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h	Fri Mar 19 09:48:59 2010 +0200
@@ -36,7 +36,6 @@
 // Declared in CIptvUtil.h and vcxconnutilimpl.cpp
 const TUid VCXTEST_KIptvAlrCenRepUid = { 0x2000B438 };
 const TInt VCXTEST_KIptvCenRepUsedSnapIdKey   = 0x1;
-const TInt VCXTEST_KIptvCenRepDefaultIapIdKey   = 0x2;
 const TInt VCXTEST_KIptvCenRepAPModeAlwaysAsk = 0;
 
 // CLASS DECLARATION
@@ -137,18 +136,7 @@
      * Gets the default access point from connection manager
      */
     IMPORT_C TUint32 GetDefaultIap( void );
-    
-    /**
-     * Gets the default iap, saves it to cenrep
-     */
-    IMPORT_C TInt SetDefaultIapCenRep( void );
-    
-    /**
-     * Gets the default iap id from cenrep
-     */
-    IMPORT_C TUint32 GetDefaultIapCenRep( void );
 
-    
 private: // New functions
 
     /**
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -912,51 +912,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CIptvTestUtilALR::SetDefaultIapCenRep
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CIptvTestUtilALR::SetDefaultIapCenRep()
-    {
-    TUint32 iap( 0 );
-    iap = GetDefaultIap();
-    TInt err( 0 );
-    
-    if( iap != 0 )
-        {
-        VCXLOGLO1("CIptvTestUtilALR::SetDefaultIapCenRep Create cenrep.");
-        CRepository* cenRep = CRepository::NewLC( VCXTEST_KIptvAlrCenRepUid );
-        VCXLOGLO1("CIptvTestUtilALR::SetDefaultIapCenRep Set cenrep.");
-        User::LeaveIfError( cenRep->Set( VCXTEST_KIptvCenRepDefaultIapIdKey, (TInt)iap ) );
-        CleanupStack::PopAndDestroy( cenRep );
-        }
-    else
-        {
-        err = KErrNotFound;
-        }
-    
-    return err;   
-    }
-
-// ---------------------------------------------------------------------------
-// CIptvTestUtilALR::GetDefaultIap
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TUint32 CIptvTestUtilALR::GetDefaultIapCenRep()
-    {
-    TInt iap( 0 );
-    
-    VCXLOGLO1("CIptvTestUtilALR::GetDefaultIapCenRep Create cenrep.");
-    CRepository* cenRep = CRepository::NewLC( VCXTEST_KIptvAlrCenRepUid );
-    VCXLOGLO1("CIptvTestUtilALR::GetDefaultIapCenRep Set cenrep.");
-    User::LeaveIfError( cenRep->Get( VCXTEST_KIptvCenRepDefaultIapIdKey, iap) );
-    CleanupStack::PopAndDestroy( cenRep );
-    
-    TUint32 iapId( iap );
-    
-    return iapId;
-    }
-
-// ---------------------------------------------------------------------------
 // CIptvTestUtilALR::PrintDestinationL
 // ---------------------------------------------------------------------------
 //
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestCommon.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestCommon.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestCommon.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -24,7 +24,6 @@
 #include <mmf/common/mmfcontrollerpluginresolver.h>
 
 #include "VCXTestCommon.h"
-#include "IptvTestUtilALR.h"
 #include "CIptvTestVerifyData.h"
 #include "TestUtilConnectionWaiter.h"
 #include "VCXTestLog.h"
@@ -170,33 +169,7 @@
         return found;
         }
 #endif
-    
-    if( aIapName == _L("default") )
-        {
-        VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Searching default iap from cenrep");
-        CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC();
-        aIapId = util->GetDefaultIapCenRep();
-        CleanupStack::PopAndDestroy( util );
-        if( aIapId != 0 )
-            {
-            VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default from cenrep: %d", aIapId);
-            return ETrue;
-            }
-        }
-    
-    if( aIapName == _L("default") )
-        {
-        VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Getting default iap via ALR util");
-        CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC();
-        aIapId = util->GetDefaultIap();
-        CleanupStack::PopAndDestroy( util );
-        if( aIapId != 0 )
-            {
-            VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default: %d", aIapId);
-            return ETrue;
-            }
-        }
-    
+
     VCXLOGLO2("CVCXTestCommon:: Searching IAP: %S", &aIapName);
 
     found = GetIapIdByNameL(aIapName, aIapId);
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -205,8 +205,6 @@
         }
     else
         {
-        iWaitStarted = EFalse;
-        
         // Nothing to wait for.
         iTimeoutTimer->CancelTimer();
         
@@ -247,17 +245,10 @@
 //
 EXPORT_C void CVCXTestMessageWait::ReceiveMessage( TInt32 aMsg, TInt aError )
 	{
-    if( !iWaitStarted )
-        {
-        VCXLOGLO1("CVCXTestMessageWait::ReceiveMessage: Wait not active.");
-        return;
-        }
-
     VCXLOGLO1(">>>CVCXTestMessageWait::ReceiveMessage");
 
     if( aError != KErrNone )
         {
-        iWaitStarted = EFalse;
         if( iActiveWaitBlocking->IsWaiting() )
             {
             iError = aError;
@@ -300,7 +291,6 @@
         
         if( iWaitedMessages.Count() <= 0 )
             {
-            iWaitStarted = EFalse;
             // Stop wait.
             if( iActiveWaitBlocking->IsWaiting() )
                 {
@@ -337,7 +327,6 @@
         else
         if( iWaitedMessages.Count() > 0 )
             {
-            iWaitStarted = EFalse;
             VCXLOGLO2("CVCXTestMessageWait:: Timeout. Messages left: %d", iWaitedMessages.Count());
             if( iActiveWaitBlocking->IsWaiting() )
                 {
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestStatsKeeper.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestStatsKeeper.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestStatsKeeper.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -526,10 +526,7 @@
         return;
         }
 
-    if ( aFullReport )
-        {
-        VCXTESTSTATS_W2( aFileName, "CVCXTestStatsKeeper:: Data size for the report: %d kBs", DataSizeL() );
-        }
+    VCXTESTSTATS_W2( aFileName, "CVCXTestStatsKeeper:: Data size for the report: %d kBs", DataSizeL() );
 
     if( iReportName )
         {
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/inc/IptvTestUtilModule.h
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/inc/IptvTestUtilModule.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/inc/IptvTestUtilModule.h	Fri Mar 19 09:48:59 2010 +0200
@@ -293,11 +293,7 @@
         */
 		virtual TInt SetTimeZone(CStifItemParser& aItem );
 
-        /**
-        * Sets the default iap id value to cenrep.
-        */
-		virtual TInt SetDefaultIapCenRepL(CStifItemParser& aItem );
-		
+
         /**
         * Removes the used destination cenrep value.
         */
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/src/IptvTestUtilModuleBlocks.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/src/IptvTestUtilModuleBlocks.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestUtilModule/src/IptvTestUtilModuleBlocks.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -175,7 +175,6 @@
 		ENTRY( "CheckMobilecrashes", CIptvTestUtilModule::CheckMobilecrashesL ),
 		ENTRY( "CheckMobilecrashesZeroTolerance", CIptvTestUtilModule::CheckMobilecrashesZeroToleranceL ),
 
-		ENTRY( "SetDefaultIapCenrep", CIptvTestUtilModule::SetDefaultIapCenRepL ), 
 		ENTRY( "DeleteUsedDestinationCenRep", CIptvTestUtilModule::DeleteUsedDestinationCenRepL ),
 		ENTRY( "SetUsedDestination", CIptvTestUtilModule::SetUsedDestinationL ),
 		ENTRY( "CreateDestination", CIptvTestUtilModule::CreateDestinationL ),
@@ -1257,36 +1256,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CIptvTestUtilModule::SetDefaultIapCenRep
-// -----------------------------------------------------------------------------
-//
-TInt CIptvTestUtilModule::SetDefaultIapCenRepL(CStifItemParser& aItem )
-    {
-    VCXLOGLO1(">>>CIptvTestUtilModule::SetDefaultIapCenRep");
-    // Print to UI
-    _LIT( KIptvTestUtilConnect, "IptvTestUtilModule" );
-    _LIT( KWhere, "In SetDefaultIapCenRep" );
-    TestModuleIf().Printf( 0, KIptvTestUtilConnect, KWhere );
-    // Print to log file
-    iLog->Log( KWhere );
-
-    TInt ret( KErrNone );
-
-    if( !iTestUtilALR )
-        {
-        iTestUtilALR = CIptvTestUtilALR::NewL();
-        }
-
-    aItem.SetParsingType(CStifItemParser::EQuoteStyleParsing);
-
-    TRAP( ret, iTestUtilALR->SetDefaultIapCenRep() );
-
-    VCXLOGLO2("<<<CIptvTestUtilModule:: returning: %d", ret);
-    VCXLOGLO1("<<<CIptvTestUtilModule::SetDefaultIapCenRep");
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
 // CIptvTestUtilModule::SetUsedDestinationL
 // -----------------------------------------------------------------------------
 //
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Fri Mar 19 09:48:59 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 3 %
+// Version : %version: 4 %
 
 
 
@@ -48,6 +48,11 @@
 const TMPXAttributeData KMPXMediaVideoDrmProtected        = { KMPXMediaIdVideo, 0x200 };
 const TMPXAttributeData KMPXMediaVideoPausableStream      = { KMPXMediaIdVideo, 0x400 };
 const TMPXAttributeData KMPXMediaFourCCCode               = { KMPXMediaIdVideo, 0x800 };
+const TMPXAttributeData KMPXMediaVideoDescription         = { KMPXMediaIdVideo, 0x1000 };
+const TMPXAttributeData KMPXMediaVideoLocation            = { KMPXMediaIdVideo, 0x2000 };
+const TMPXAttributeData KMPXMediaVideoCopyright           = { KMPXMediaIdVideo, 0x4000 };
+const TMPXAttributeData KMPXMediaVideoLanguage            = { KMPXMediaIdVideo, 0x8000 };
+const TMPXAttributeData KMPXMediaVideoKeywords            = { KMPXMediaIdVideo, 0x10000 };
 
 const TMPXAttributeData KMPXMediaVideoAll                 = { KMPXMediaIdVideo, 0xffffffff };
 
diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Fri Mar 19 09:48:59 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: ou1cpsw#4 %
+// Version : %version: 6 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -138,27 +138,28 @@
 //  Content ID identifying video display window category of content provided
 //  in the media object and associated attributes.
 //
-const TInt KMPXMediaIdVideoDisplayMessage = 0x20024333;
+const TInt KMPXMediaIdVideoDisplaySyncMessage = 0x20024333;
 
 //
 //  TInt for Command Id
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplayMessage, 0x01 };
+const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplaySyncMessage, 0x01 };
 
 //
 //  TSurfaceId
 //
-const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplayMessage, 0x02 };
+const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplaySyncMessage, 0x02 };
 
 //
 //  TRect
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplayMessage, 0x04 };
+const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplaySyncMessage, 0x04 };
 
 //
 //  TVideoAspectRatio
 //
-const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplayMessage, 0x08 };
+const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplaySyncMessage, 0x08 };
+
 
 enum TMPXVideoDisplayCommand
 {