--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,25 @@
+/*
+* 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:    Telephony / videotelephony
+*
+*/
+
+
+
+#include "../vtprotocolplugins/group/bld.inf"
+#include "../vtengines/group/bld.inf"
+#include "../vtuis/group/bld.inf"
+#include "../videotelephony_plat/group/bld.inf"
+
+// End of File
\ No newline at end of file

--- a/layers.sysdef.xml	Tue Aug 31 15:16:10 2010 +0300
+++ b/layers.sysdef.xml	Wed Sep 01 12:29:12 2010 +0100
@@ -1,22 +1,21 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
   <!ENTITY layer_real_source_path "sf/app/videotelephony" >
 ]>
 
-<SystemDefinition name="videotelephony" schema="1.5.1">
+<SystemDefinition name="videotelephony" schema="1.4.0">
   <systemModel>
     <layer name="app_layer">
       <module name="videotelephony">
         <unit name="videotelephony_plat" unitID="tedo.videotelephony_plat" bldFile="&layer_real_source_path;/videotelephony_plat/group" mrp="" />
-        <unit name="PacketVideoEngine" unitID="tedo.PacketVideoEngine" bldFile="&layer_real_source_path;/packetvideoengine/group" mrp="" filter="!sf_build" /> 
+        <unit name="PacketVideoEngineBinaries" unitID="tedo.PacketVideoEngineBinaries" bldFile="&layer_real_source_path;/packetvideoengine/PacketVideoEngineBinaries/group" mrp="" filter="!sf_build" /> 
         <unit name="vtprotocolsstub" unitID="tedo.vtprotocolsstub" bldFile="&layer_real_source_path;/vtprotocolsstub/group" mrp="" filter="sf_build" />  
         <unit name="vtprotocols" unitID="tedo.vtprotocols" bldFile="&layer_real_source_path;/vtprotocols/group" mrp="" filter="!sf_build" />
-        <unit name="vtprotocolplugins" unitID="tedo.vtprotocolplugins" bldFile="&layer_real_source_path;/vtprotocolplugins/group" mrp="" /> 
-        <unit name="vtengines" unitID="tedo.vtengines" bldFile="&layer_real_source_path;/vtengines/Group" mrp="" />  
-        <unit name="lcvtplugin" unitID="tedo.lcvtplugin" bldFile="&layer_real_source_path;/vtuis/lcvtplugin/group" mrp="" /> 
-				<unit name="lcvtapp" unitID="tedo.lcvtapp" bldFile="&layer_real_source_path;/vtuis/lcvtapp" mrp="" proFile="lcvtapp.pro" />
-				<unit name="lcvtindicatorplugin" unitID="tedo.lcvtindicatorplugin" bldFile="&layer_real_source_path;/vtuis/lcvtindicatorplugin" mrp="" proFile="lcvtindicatorplugin.pro" />
-        <unit name="lcvtindicatorcontroller" unitID="tedo.lcvtindicatorcontroller" bldFile="&layer_real_source_path;/vtuis/lcvtindicatorcontroller" mrp="" proFile="lcvtindicatorcontroller.pro" />
+        <unit name="DisplaySink" unitID="tedo.DisplaySink" bldFile="&layer_real_source_path;/vtprotocolplugins/DisplaySink/group" mrp="" /> 
+        <unit name="VideoSource" unitID="tedo.VideoSource" bldFile="&layer_real_source_path;/vtprotocolplugins/VideoSource/group" mrp="" />
+        <unit name="videoteleng" unitID="tedo.videoteleng" bldFile="&layer_real_source_path;/vtengines/videoteleng/Group" mrp="" />  
+        <unit name="videotelui" unitID="tedo.videotelui" bldFile="&layer_real_source_path;/vtuis/videotelui/group" mrp="" /> 
+	<unit name="vtmediatorplugin" unitID="tedo.vtmediatorplugin" bldFile="&layer_real_source_path;/vtengines/vtmediatorplugin/group" mrp="" />
       </module>
     </layer>
   </systemModel>

--- a/lcvtplugin.pkg	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-; Languages
-;
-&EN
-
-; Header
-#{"lcvtplugin patch"}, (0xF0112235), 1, 0, 0, TYPE=PU
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\epoc32\release\armv5\udeb\lcvtengineplugin.dll"    - "!:\sys\bin\lcvtengineplugin.dll"
-"\epoc32\data\Z\Resource\Plugins\lcvtengineplugin.RSC"-"!:\resource\plugins\lcvtengineplugin.RSC"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_4_0.dtd	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,86 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  

--- a/sysdef_1_5_1.dtd	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  proFile CDATA #IMPLIED
-  qmakeArgs CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  

--- a/videosource.pkg	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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:
-;
-; Languages
-&EN
-
-; Header
-#{"videosource"}, (0x101F8692), 1, 0, 0, TYPE=PU
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\epoc32\release\armv5\udeb\videosource.dll"    - "!:\sys\bin\videosource.dll"

--- a/videoteleng.pkg	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-; Languages
-;
-&EN
-
-; Header
-#{"videoteleng patch"}, (0x101F867F), 1, 0, 0, TYPE=PU
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\epoc32\release\armv5\udeb\videoteleng.dll"    - "!:\sys\bin\videoteleng.dll"
-"\epoc32\release\armv5\urel\cscallctrl.dll"    - "!:\sys\bin\cscallctrl.dll"
-"\epoc32\release\armv5\urel\vtlogger.dll"    - "!:\sys\bin\vtlogger.dll"

--- a/videotelephony.pro	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:                                                        
-#                                                                     
-#
-
-TEMPLATE = subdirs
-CONFIG += ordered
-
-symbian: {  
-    //:BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"    
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"packetvideoengine/group/bld.inf\""
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"vtprotocols/group/bld.inf\""   
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"vtprotocolplugins/group/bld.inf\""
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"vtengines/group/bld.inf\""
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"vtuis/lcvtplugin/group/bld.inf\""
-    :BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videotelephony_plat/group/bld.inf\""
-}
-
-SUBDIRS += vtuis/lcvtindicatorplugin
-SUBDIRS += vtuis/lcvtindicatorcontroller
-SUBDIRS += vtuis/lcvtapp

--- a/videotelephony_plat/group/bld.inf	Tue Aug 31 15:16:10 2010 +0300
+++ b/videotelephony_plat/group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -18,4 +18,5 @@
 
 
 
+#include "../video_telephony_control_mediator_api/group/bld.inf"
 #include "../video_telephony_media_configuration_api/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videotelephony_plat/video_telephony_control_mediator_api/group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* 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:  File that exports the files belonging to 
+:                Video Telephony Control Mediator API
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/videotelcontrolmediatorapi.h     APP_LAYER_PLATFORM_EXPORT_PATH( videotelcontrolmediatorapi.h)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videotelephony_plat/video_telephony_control_mediator_api/inc/videotelcontrolmediatorapi.h	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,67 @@
+/*
+* 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:  Video Telephony specific message services sent from Phone
+*                Application to Video Telephony.
+*
+*/
+
+
+#ifndef VIDEOTELCONTROLMEDIATORAPI_H
+#define VIDEOTELCONTROLMEDIATORAPI_H
+
+// INCLUDES
+#include <e32base.h>
+
+/**  The category UID for the messages in this header file. */
+const TUid KCatPhoneToVideotelCommands = { 0x200159A1 };
+
+/**  Version number of this API */
+const TInt KPhoneToVideotelCmdVersionMajor( 1 );
+const TInt KPhoneToVideotelCmdVersionMinor( 0 );
+const TInt KPhoneToVideotelCmdVersionBuild( 0 );
+
+/** package for passing dataport name to Video Telephony */
+typedef TPckgBuf<TName> TDataPortPackage;
+
+/**  Video Telephony related commands. */
+enum TPhoneToVideotelCommands
+    {
+    /**
+     * Commands Video Telephony to enable microphone.
+     */
+    EVtCmdUnmute = 0,
+    
+    /**
+     * Commands Video Telephony to disable microphone.
+     */
+    EVtCmdMute,
+        
+    /**
+     * Commands Video Telephony to use dataport. Command paramemeter is
+     * TDataPortPackage. This should be called when dataport is loaned.
+     * When this is sent, dataport recovery is allowed only after
+     * 1) later issued EVtCmdShutdown response is received.
+     * 2) call is ended by network/peer (i.e. local phone doesn't do hangup)
+     * 3) EPhoneCmdEndActiveCall command is received (see Mediator Commands To 
+     *    Telephony API)
+     *  Otherwise H.245 (VT) signalling may fail if call is released in two
+     *  stage.
+     */
+    EVtCmdUseDataport,
+    
+    EVtCmdReleaseDataport
+    };
+
+#endif // VIDEOTELCONTROLMEDIATORAPI_H
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videotelephony_plat/video_telephony_control_mediator_api/video_telephony_control_mediator_api.metaxml	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<api id="216d6a20aad391ac9077f1a2e8d8477d" dataversion="2.0">
+  <name>Video Telephony Control Mediator API</name>
+  <description>An interface for exchanging video telephony related commands (e.g. call initiation and termination) and providing data synchronization (e.g. contact data and audio mute state) between Phone and Video Telephone applications.</description>
+  <type>c++</type>
+  <collection>vtengines</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/videotelui.pkg	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:
-;
-; Languages
-&EN
-
-; Header
-#{"videotelui"}, (0x101F8681), 1, 0, 0, TYPE=PU
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\epoc32\release\armv5\urel\videotelui.exe"    - "!:\sys\bin\videotelui.exe"
-"\epoc32\data\z\resource\apps\videotelui.rsc"-"!:\resource\apps\videotelui.rsc"
-"\epoc32\data\z\private\10003a3f\import\apps\videotelui_reg.rsc"-"!:\private\10003a3f\import\apps\videotelui_reg.rsc"

--- a/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h	Wed Sep 01 12:29:12 2010 +0100
@@ -31,7 +31,7 @@
 // new audio routing
 #include    "TelephonyAudioRouting.h"
 #include    "MTelephonyAudioRoutingObserver.h"
-#include    <rphcltserver.h>
+#include    <RPhCltServer.h>
 #include    <mmf/server/sounddevice.h>
 
 // FORWARD DECLARATIONS

--- a/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Wed Sep 01 12:29:12 2010 +0100
@@ -43,7 +43,7 @@
         
         /**
         * Two-phased constructor.
-        ? @return instance of CVtEngAccessoryHandler
+        ¨* @return instance of CVtEngAccessoryHandler
         */
         static CVtEngAccessoryHandler* NewL( );
         

--- a/vtengines/videoteleng/Inc/Extensions/CVtEngExtensions.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Extensions/CVtEngExtensions.h	Wed Sep 01 12:29:12 2010 +0100
@@ -113,4 +113,4 @@
         
     };
 
-#endif //CVTENGEXTENSIONS_H
\ No newline at end of file
+#endif //CVTENGEXTENSIONS_H

--- a/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Wed Sep 01 12:29:12 2010 +0100
@@ -243,16 +243,7 @@
         /**
         * Create surface implementation
         */        
-        void DoCreateSurfaceL();
-
-        /**
-        *clearing a surface buffer to given colour
-        */
-        void ClearSurfacebuffer( 
-            TUint8* aStartAddr, 
-            TInt aOffset, 
-            const RSurfaceManager::TSurfaceInfoV01 aInfo, 
-            TRgb &aColor );
+        void DoCreateSurfaceL();        
         
         static TInt SurfaceBuffer0Ready(TAny* aAny);
         

--- a/vtengines/videoteleng/Inc/Media/CVtEngLocalVideo.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/CVtEngLocalVideo.h	Wed Sep 01 12:29:12 2010 +0100
@@ -32,23 +32,11 @@
 #include "CVTEngPubSubsListener.h"
 #include "mvtengcamerapreferencesobserver.h"
 
-#include "graphics/surfacemanager.h"
-#include "graphics/surface.h"
-#include "graphics/surfaceupdateclient.h"
-
 // FORWARD DECLARATIONS
 class CVSDataProvider;
 class CVtEngMediaHandler;
 class CVtEngCameraPreferences;
 
-
-// LOCAL CONSTANTS
-// Default source width.
-static const TInt KVtEngLocalVideoDefaultWidth = 176;
-
-// Default source height.
-static const TInt KVtEngLocalVideoDefaultHeight = 144;
-
 // CLASS DECLARATION
 
 /**
@@ -189,13 +177,6 @@
         */
         void SetViewFinderParameters( const TVtEngRenderingOptionsDP& aDP );
 
-        
-        /**
-        * Sets NGA configuration for view finder.
-        * @param aNGA NGA configuration
-        */
-        void SetViewFinderParameters( const TVtEngRenderingOptionsNGA &aNGA );
-
         /**
         * Sets default still image.
         */
@@ -559,8 +540,6 @@
             ERefreshing
             };
 
-	private: // inner classes
-
         /**
         * Provider information.
         */
@@ -1031,81 +1010,6 @@
 
         };
 
-		// class for NGA rendering viewfinder bitmap.
-		NONSHARABLE_CLASS( CVtEngVFBitmapNGARender ) : public CActive
-			{
-			
-		public: // constructor and destructor
-		
-			/**
-            * Two-phased constructor.
-            * @param aObserver call back interface to Display Sink
-            * @return instance of CVtEngDrawDSA
-            */
-			static CVtEngVFBitmapNGARender * NewL();
-
-			// Destructor.
-			~CVtEngVFBitmapNGARender();
-
-		public: // New mothod
-		
-			// update the buffer for bitmap, also activate this AO
-			TInt UpdateBitmapL( CFbsBitmap& aFrame );
-
-			// Initialize surface and set it to the background
-			TInt AttachSurfaceL( RWsSession *aWs, RWindow *aWindow );
-
-		private: // constructors
-		
-			// C++ constructor.
-			CVtEngVFBitmapNGARender();
-
-            /**
-            * By default Symbian 2nd phase constructor is private.
-            */
-            void ConstructL( );
-
-		private: // From CActive.
-
-		    /*
-            * @see CActive::RunL
-            */
-            virtual void RunL();
-
-            /**
-            * @see CActive::DoCancel()
-            */
-            virtual void DoCancel();
-
-        private:  // enumerations
-
-            enum { EVtEngVFMaxBuffers = 1 };
-            
-        private:    // Data
-        
-            RSurfaceManager iSurfaceManager;
-            RSurfaceUpdateSession iSurfaceUpdateSession;
-
-            //Surface pixel format
-            const TUidPixelFormat iSurfaceFormat;
-    
-            RChunk* iSurfaceChunk;
-
-            TUint8* iBuffer;
-    
-            //NGA surface id
-            TSurfaceId iSurfaceId;
-            
-            RWsSession *iWs;
-            RWindow *iWindow;
-    
-            //NGA surface has created
-            TBool iSurfaceCreated;
-            
-            TTimeStamp iTimeStamp;
-            
-            };
-		
         private:
 
         /**
@@ -1564,10 +1468,6 @@
 
         // Number of cameras in the device
         TInt iNumSupportedCameras;
-
-		CVtEngVFBitmapNGARender *iNGARender; 
-		RWindow *iWindow;
-		RWsSession *iWs;
     };
 
 #endif      // CVTENGLOCALVIDEO_H

--- a/vtengines/videoteleng/Inc/Media/TVtEngRenderConfigNGA.inl	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/TVtEngRenderConfigNGA.inl	Wed Sep 01 12:29:12 2010 +0100
@@ -40,8 +40,8 @@
     iType = ENgaRender;
     iWsSession = &aOptions.iWs;
     //iWsSreenDevice = &aOptions.iWsSD;
-    //iWindow = &aOptions.iWindow;
-    //iObserver = aOptions.iObserver;
+   // iWindow = &aOptions.iWindow;
+    iObserver = aOptions.iObserver;
     //iRect = aOptions.iRect;
     //iClipRect = aOptions.iClipRect;
     //iOffset = aOptions.iOffset;

--- a/vtengines/videoteleng/Inc/Media/TVtEngRenderingNGA.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/TVtEngRenderingNGA.h	Wed Sep 01 12:29:12 2010 +0100
@@ -42,6 +42,7 @@
         * C++ constructor
         */
         inline TVtEngRenderingOptionsNGA(
+            MVtEngFrameObserver& aObserver,
             RWindow& aWindow, RWsSession& aWs );
 
         /**
@@ -59,6 +60,9 @@
         RWindow&    iWindow;
         
         RWsSession&      iWs;
+        
+        // Frame observer
+        MVtEngFrameObserver* iObserver;
     };
 
 #include <tvtengrenderingnga.inl>

--- a/vtengines/videoteleng/Inc/Media/TVtEngRenderingNGA.inl	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/TVtEngRenderingNGA.inl	Wed Sep 01 12:29:12 2010 +0100
@@ -24,9 +24,11 @@
 // -----------------------------------------------------------------------------
 //
 inline TVtEngRenderingOptionsNGA::TVtEngRenderingOptionsNGA(
+    MVtEngFrameObserver& aObserver,
     RWindow& aWindow, RWsSession& aWs) :
     iWindow( aWindow ),
-    iWs( aWs )
+    iWs( aWs ),
+    iObserver( &aObserver )
     {
     }
 
@@ -38,7 +40,8 @@
 inline TVtEngRenderingOptionsNGA::TVtEngRenderingOptionsNGA(
     const TVtEngRenderingOptionsNGA& aOptions )
     : iWindow( aOptions.iWindow ),
-      iWs( aOptions.iWs)
+      iWs( aOptions.iWs),
+      iObserver( aOptions.iObserver )
     {
     }
 // End of File

--- a/vtengines/videoteleng/Inc/Session/MVtEngSessionInfo.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Inc/Session/MVtEngSessionInfo.h	Wed Sep 01 12:29:12 2010 +0100
@@ -85,12 +85,8 @@
             };
         
         enum { KCallNameLength = 50 };
-        enum { KCallNumberLength = 50 };
         
         typedef TBuf<KCallNameLength> TCallName;
-        
-        typedef TBuf<KCallNumberLength> TCallNumber;
-        
         /**
         * CLI data related to a call
         */
@@ -103,8 +99,6 @@
             
             // indicates if voice call can be made to peer
             TBool iVoiceCallPossible;
-            
-            TCallNumber iCallNumber;
             };
         
         /**

--- a/vtengines/videoteleng/Logger/Group/bld.inf	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Logger/Group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -23,7 +23,7 @@
 
 PRJ_EXPORTS
 ../inc/cvtlogger.h      |../../../inc/cvtlogger.h
-../inc/vtlogger.hrh     |../../../inc/vtlogger.hrh
+../inc/VtLogger.hrh     |../../../inc/VtLogger.hrh
 
 PRJ_MMPFILES
 ../Group/vtlogger.mmp

--- a/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -33,7 +33,7 @@
 // CONSTANTS
 
 // For DevSound initialization
-//const TInt KVtEngUidControlHwDevice = 0x10206593;
+const TInt KVtEngUidControlHwDevice = 0x10206593;
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -55,7 +55,7 @@
 //
 void CVtEngAudioHandler::ConstructL()
     {
-    __VTPRINT( DEBUG_CONSTRUCT | DEBUG_AUDIO, "AH.ConstructL<" )
+    __VTPRINT( DEBUG_CONSTRUCT | DEBUG_AUDIO, "AH.ConstructL" )
 
     iAccHandler = &CVtEngUtility::AccessoryHandler();
     iAccHandler->RegisterObserverL( this );
@@ -67,7 +67,7 @@
     __VTPRINT2( DEBUG_AUDIO, "AH.iAccMode %d", ( TInt )iAccMode.iAccessoryMode )
 
     UpdateCurrentVolume();
-    __VTPRINT( DEBUG_CONSTRUCT | DEBUG_AUDIO, "AH.ConstructL>")
+    __VTPRINT( DEBUG_CONSTRUCT | DEBUG_AUDIO, "AH.ConstructL<")
     }
 
 // -----------------------------------------------------------------------------

--- a/vtengines/videoteleng/Src/Base/CVtEngDeviceLockMonitor.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/CVtEngDeviceLockMonitor.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -58,20 +58,20 @@
 
     TInt state = EAutolockStatusUninitialized;
 
-	// Get autolock state
-	TInt err = iAutolockListener->Get( state );
+    // Get autolock state
+    TInt err = iAutolockListener->Get( state );
 
-	__VTPRINT2( DEBUG_GEN, "LockMonitor Get err: %d", err );
-	__VTPRINT2( DEBUG_GEN, "LockMonitor state: %d", state );
-
-	if( err == KErrNone )
+    __VTPRINT2( DEBUG_GEN, "LockMonitor Get err: %d", err );
+    __VTPRINT2( DEBUG_GEN, "LockMonitor state: %d", state );
+      
+    // Recognize the uninitialized state as autolock on, or the VT will be wrongly shown when startup & lock is on.
+    if( err == KErrNone )
 		{
 		const TInt event =
-        ( state <= EAutolockOff ) ?
+        ( state == EAutolockOff ) ?
                 KVtEngDeviceLockOff : KVtEngDeviceLockOn;
-        CVtEngEventManager::NotifyEvent( event );
-        }		
-			
+    CVtEngEventManager::NotifyEvent( event );
+    }	
     __VTPRINTEXIT( "LockMonitor.NotifyState" )
     }
 

--- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -24,8 +24,8 @@
 #include    "VtEngUtils.h"
 #include    "VtEngPanic.h"
 #include    <telincallvolcntrlcrkeys.h>
-#include    <rphcltserver.h>
-#include    <cphcltimagehandler.h>
+#include    <RPhCltServer.h>
+#include    <CPhCltImageHandler.h>
 #include    <videotelephonyinternalcrkeys.h>
 #include    <LogsDomainCRKeys.h>
 #include    <settingsinternalcrkeys.h>
@@ -897,7 +897,6 @@
     iCLI.iName = aCLI.iName;
     iCLI.iVoiceCallPossible = aCLI.iVoiceCallPossible;
     iCLI.iValid = ETrue;
-    iCLI.iCallNumber = aCLI.iCallNumber;
     __VTPRINT2( DEBUG_GEN, "iVoiceCallPossible=%d,", iCLI.iVoiceCallPossible )
     __VTPRINTEXIT( "Settings.SetCLI" ) 
     }
@@ -912,7 +911,6 @@
     aCLI.iCallId = iCLI.iCallId;
     aCLI.iVoiceCallPossible = iCLI.iVoiceCallPossible;
     aCLI.iName = iCLI.iName;
-    aCLI.iCallNumber = iCLI.iCallNumber;
     return iCLI.iValid;
     }
 

--- a/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -160,7 +160,6 @@
             cli.iCallId = data.iCallId;
             cli.iName = data.iDisplayText.Left( cli.iName.MaxLength() );
             cli.iVoiceCallPossible = data.iVoiceCallPossible;
-            cli.iCallNumber = data.iPhoneNumText.Left( cli.iCallNumber.MaxLength() );
             settings.SetCLI( cli );
             
             // ready == call is answered (allows setting app to foreground)

--- a/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -110,10 +110,7 @@
             {
             iConfig.iRemoteWindow->RemoveBackgroundSurface(ETrue);
             iConfig.iWsSession->UnregisterSurface(0, iSurfaceId);
-            if ( iSurfaceChunk != NULL )
-                {
-                iSurfaceChunk->Close();
-                }
+            iSurfaceChunk->Close();
             delete iSurfaceChunk;
             iSurfaceChunk = NULL;
             iSurfaceManager->CloseSurface(iSurfaceId);
@@ -121,13 +118,10 @@
             iSurfaceUpdateSession.Close();
                        
              /* Close the surface manager handle */
-            if ( iSurfaceManager != NULL )
-                {
-                iSurfaceManager->Close();
-                }
+            iSurfaceManager->Close();
            
             delete iSurfaceManager;
-            iSurfaceManager = NULL;
+            iSurfaceManager = 0;
             }
            
         for ( TInt i = KVtEngMaxSurfaceBuffers-1; i >= 0 ; i-- )
@@ -146,7 +140,6 @@
         iSurfaceBuffer1.UnSet();
         }
     delete iBufferWaiter;   
-    iBufferWaiter = NULL;
     iWaitingBuffers.Reset();
     
     __VTPRINTEXIT( "RVD(NGA).~" )
@@ -440,12 +433,8 @@
     iSurfaceManager->GetBufferOffset(iSurfaceId, 1, offset);
     iSurfaceBuffer1.Set(iSurfaceChunk->Base() + offset, 1 );
     
-    iConfig.iWsSession->RegisterSurface(0, iSurfaceId);  
-    TSurfaceConfiguration surfaceConfig;
-    surfaceConfig.SetSurfaceId( iSurfaceId );
-    surfaceConfig.SetOrientation( CFbsBitGc::EGraphicsOrientationRotated270);
-    iConfig.iRemoteWindow->SetBackgroundSurface( surfaceConfig, ETrue );
-    //iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId);
+    iConfig.iWsSession->RegisterSurface(0, iSurfaceId);   
+    iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId);
     
     iCallBackTable[0] = new(ELeave) CActiveCallBack(
             TCallBack(SurfaceBuffer0Ready, this), 
@@ -750,35 +739,20 @@
         User::LeaveIfError(err);    
         
         // Get the info from the surfaceManager
-        RSurfaceManager::TInfoBuf infoBuf;
-        err = iSurfaceManager->SurfaceInfo( iSurfaceId, infoBuf );
-        User::LeaveIfError(err);
-        RSurfaceManager::TSurfaceInfoV01 info = infoBuf();
-
-        __VTPRINT2( DEBUG_MEDIA, "chunk size=%d", iSurfaceChunk->Size() )
-
-        TRgb color( 0, 0, 0 );
-
+        RSurfaceManager::TInfoBuf info;
+        err = iSurfaceManager->SurfaceInfo(iSurfaceId, info);
+        User::LeaveIfError(err);    
+        
         TInt offset;
-
-        iSurfaceManager->GetBufferOffset( iSurfaceId, 0, offset );
-        __VTPRINT2( DEBUG_MEDIA, "offset0=%d", offset )
-        ClearSurfacebuffer( iSurfaceChunk->Base(), offset, info, color );
+        iSurfaceManager->GetBufferOffset(iSurfaceId, 0, offset);
         iSurfaceBuffer0.Set(iSurfaceChunk->Base() + offset, 0 );
-        
-        iSurfaceManager->GetBufferOffset( iSurfaceId, 1, offset );
-        __VTPRINT2( DEBUG_MEDIA, "offset1=%d", offset )
-        ClearSurfacebuffer( iSurfaceChunk->Base(), offset, info, color );
+        iSurfaceManager->GetBufferOffset(iSurfaceId, 1, offset);
         iSurfaceBuffer1.Set(iSurfaceChunk->Base() + offset, 1 );
         }
     
     iConfig.iWsSession->RegisterSurface(0, iSurfaceId);   
-    TSurfaceConfiguration surfaceConfig;
-    surfaceConfig.SetSurfaceId( iSurfaceId );
-    surfaceConfig.SetOrientation( CFbsBitGc::EGraphicsOrientationRotated270);
-    iConfig.iRemoteWindow->SetBackgroundSurface( surfaceConfig, ETrue );
-    //iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId);
-
+    iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId);
+    
     iConfig.iRemoteWindow->BeginRedraw();
     iConfig.iRemoteWindow->EndRedraw();
     
@@ -797,54 +771,6 @@
     ClearFlag( EInitializePostingSurfaceCalled );
     __VTPRINTEXIT( "RVD(NGA).DoCreateSurfaceL" )
     }
-
-// -----------------------------------------------------------------------------
-// CVtEngDrawNGA::ClearSurface
-// clearing a surface buffer to given colour
-// -----------------------------------------------------------------------------
-//
-void CVtEngDrawNGA::ClearSurfacebuffer( 
-    TUint8* aStartAddr, 
-    TInt aOffset, 
-    const RSurfaceManager::TSurfaceInfoV01 aInfo, 
-    TRgb &aColor )
-{
-    TUint8 red   = aColor.Red();
-    TUint8 green = aColor.Green();
-    TUint8 blue  = aColor.Blue();
-
-    // formulae borrowed from http://msdn.microsoft.com/en-us/library/ms893078.aspx
-    TUint8 yval = ( (  66 * (TInt32)red + 129 * (TInt32)green +  25 * (TInt32)blue + 128) >> 8) +  16;
-    TUint8 uval = ( ( -38 * (TInt32)red -  74 * (TInt32)green + 112 * (TInt32)blue + 128) >> 8) + 128;
-    TUint8 vval = ( ( 112 * (TInt32)red -  94 * (TInt32)green -  18 * (TInt32)blue + 128) >> 8) + 128;
-
-    TInt i = 0;
-
-    aStartAddr += aOffset;
-
-    while ( i < (aInfo.iSize.iHeight*aInfo.iSize.iWidth) )
-    {
-    *aStartAddr = yval;
-    aStartAddr++;
-    i++;
-    }
-    i=0;
-
-    while ( i < ((aInfo.iSize.iHeight*aInfo.iSize.iWidth)>>2) )
-        {
-        *aStartAddr = uval;
-        aStartAddr++;
-        i++;
-        }
-    i=0;
-
-    while ( i < ((aInfo.iSize.iHeight*aInfo.iSize.iWidth)>>2) )
-        {
-        *aStartAddr = vval;
-        aStartAddr++;
-        i++;
-        }
-}
     
 // -----------------------------------------------------------------------------
 // CVtEngDrawNGA::DoUpdateSinkParamsL

--- a/vtengines/videoteleng/Src/Media/CVtEngLocalVideo.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngLocalVideo.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -33,10 +33,6 @@
 #include    <capivideosource.h>
 #include    <cvtlogger.h>
 #include    <mvtprotocolhandler.h>
-#include    <fbs.h> 
-#include    <w32std.h> 
-#include    <graphics/suerror.h>
-#include    <graphics/surfaceconfiguration.h> 
 
 #include    "CVtEngCameraPreferences.h"
 
@@ -98,8 +94,6 @@
     iAsyncCallBack = new ( ELeave ) CAsyncCallBack(
         TCallBack( CallBackFunc, this ), EPriorityStandard );
 
-    iNGARender = CVtEngVFBitmapNGARender::NewL();
-
     TInt indexMobile( KErrNotFound );
     iShareImage = CVtEngShareImage::NewL( *this );
     iSourceController = CVSController::NewL( this );
@@ -374,9 +368,6 @@
     delete iSourceController;
     DeleteAudioSource();
     delete iShareImage;
-
-    delete iNGARender;
-    
     __VTPRINTEXIT( "LocVid.~" )
     }
 
@@ -842,11 +833,8 @@
     if ( iActiveProvider &&
          iActiveProvider->iType != KVtEngProviderNone )
         {
-#if 0
         TRAP_IGNORE( iOptions.iObserver->vtHandleFrameL(
             MVtEngFrameObserver::ELocalVideoFrame, &aFrame ) );
-#endif
-        iNGARender->UpdateBitmapL( aFrame );
         }
     __VTPRINTEXIT( "LocVid.vsViewFinderFrameReady" )
     }
@@ -1122,34 +1110,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CVtEngLocalVideo::SetViewFinderParameters
-// Configures parameters for rendering with NGA.
-// -----------------------------------------------------------------------------
-//
-void CVtEngLocalVideo::SetViewFinderParameters(
-    const TVtEngRenderingOptionsNGA &aNGA )
-    {
-    __VTPRINTENTER( "LocVid.SetVFParamsNGA" )
-
-    // Before setting the params, stop VF
-    if( ViewFinderStarted() )
-        {
-        StopViewFinder();
-        }
-
-    iOptions.iSize.SetSize( KVtEngLocalVideoDefaultWidth, 
-                            KVtEngLocalVideoDefaultHeight );
-    
-    iWindow = &aNGA.iWindow;
-    iWs = &aNGA.iWs;
-    
-    iRenderingMethod = EWindowServer;
-
-    iNGARender->AttachSurfaceL( iWs, iWindow );
-    __VTPRINTEXIT( "LocVid.SetVFParamsNGA" )
-    }
-
-// -----------------------------------------------------------------------------
 // CVtEngLocalVideo::SetDefaultStillImageL
 // Sets default still image.
 // -----------------------------------------------------------------------------
@@ -1924,10 +1884,8 @@
          iActiveProvider->iProvider &&
          iActiveProvider->iProvider->ViewFinderActive() )
         {
-#if 0
         TRAP_IGNORE( iOptions.iObserver->vtHandleFrameL(
             MVtEngFrameObserver::ELocalVideoFrame, NULL ) );
-#endif
         iActiveProvider->iProvider->StopViewFinder();
         __VTPRINT( DEBUG_MEDIA, "LocVideo.stopVF Stopped" )
         if ( IsFlag( EFlagAutomaticSwitchCallback )  ||
@@ -4542,224 +4500,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::NewL
-// -----------------------------------------------------------------------------
-//
-CVtEngLocalVideo::CVtEngVFBitmapNGARender * 
-CVtEngLocalVideo::CVtEngVFBitmapNGARender::NewL()
-    {
-    CVtEngVFBitmapNGARender* self 
-        = new ( ELeave ) CVtEngVFBitmapNGARender();
-    CleanupStack::PushL( self );
-    self->ConstructL( );
-    CleanupStack::Pop();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::~CVtEngVFBitmapNGARender
-// -----------------------------------------------------------------------------
-//
-CVtEngLocalVideo::CVtEngVFBitmapNGARender::~CVtEngVFBitmapNGARender()
-    {
-    __VTPRINTENTER( "LocVid.NGARender.~" )
-    Cancel();
-    
-    if ( iSurfaceCreated )
-        {
-        iWindow->RemoveBackgroundSurface(ETrue);
-        iWs->UnregisterSurface(0, iSurfaceId);
-        
-        iSurfaceManager.CloseSurface(iSurfaceId);
-        iSurfaceChunk->Close();
-        delete iSurfaceChunk;
-        iSurfaceChunk = NULL;
-        
-        iSurfaceManager.Close();
-            
-        iSurfaceUpdateSession.CancelAllUpdateNotifications();
-        iSurfaceUpdateSession.Close();    
-        }
-    
-    __VTPRINTEXIT( "LocVid.NGARender.~" )
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::UpdateBitmap
-// -----------------------------------------------------------------------------
-//
-TInt CVtEngLocalVideo::CVtEngVFBitmapNGARender::UpdateBitmapL( CFbsBitmap& aFrame )
-    {
-    __VTPRINTENTER( "LocVid.NGARender.UpdateBitmapL" )
-    // do nothing if we're already active, the newer bitmap will be ignored.
-    if ( IsActive() )
-        {
-        __VTPRINTEXIT( "LocVid.NGARender.UpdateBitmapL 0" )
-        return KErrNone;
-        }
-    else
-        {
-        if ( !iSurfaceCreated )
-            {
-            User::Leave( KErrNotReady );
-            }
-        aFrame.BeginDataAccess();
-        __VTPRINT2( DEBUG_MEDIA, "LocVid.NGARender.bitmap size = %d", aFrame.DataSize() );
-#if 0
-        memcpy( iBuffer, aFrame.DataAddress(), aFrame.DataSize() );
-#else
-        TInt size = aFrame.DataSize();
-        TPtr8 ptrBuffer( iBuffer, size );
-        ptrBuffer.Copy( reinterpret_cast<TUint8*>(aFrame.DataAddress()), size );
-#endif
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.bitmap step 1" );
-        aFrame.EndDataAccess();
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.bitmap step 2" );
-        iStatus = KRequestPending;
-        SetActive();
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.bitmap step 3" );
-        iSurfaceUpdateSession.NotifyWhenDisplayed( iStatus, iTimeStamp );
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.bitmap step 4" );
-        iSurfaceUpdateSession.SubmitUpdate( KAllScreens, iSurfaceId, 0, NULL );
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.bitmap step 5" );
-
-        __VTPRINTEXIT( "LocVid.NGARender.UpdateBitmapL 1" )
-
-        return KErrNone;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::CreateSurfaceL
-// -----------------------------------------------------------------------------
-//
-TInt CVtEngLocalVideo::CVtEngVFBitmapNGARender::AttachSurfaceL( 
-        RWsSession *aWs, 
-        RWindow *aWindow )
-    {
-    __VTPRINTENTER( "LocVid.NGARender.AttachSurfaceL" )
-    
-    if ( aWs == NULL || aWindow == NULL )
-        {
-        User::Leave( KErrArgument );
-        }
-        
-        if(iSurfaceCreated)
-        	return KErrNone;
-    
-    if ( !iSurfaceCreated )
-        {    
-        TInt err;
-            
-        err = iSurfaceUpdateSession.Connect();    
-        User::LeaveIfError(err);
-            
-        err = iSurfaceManager.Open();
-        User::LeaveIfError(err);
-        
-        RSurfaceManager::TSurfaceCreationAttributesBuf attributes;
-        attributes().iPixelFormat           = iSurfaceFormat; 
-        attributes().iSize.SetSize( KVtEngLocalVideoDefaultWidth, 
-                                    KVtEngLocalVideoDefaultHeight );
-        attributes().iBuffers               = EVtEngVFMaxBuffers;
-        attributes().iStride                = attributes().iSize.iWidth*4;
-        attributes().iOffsetToFirstBuffer   = 0;
-        attributes().iAlignment             = 4;
-        attributes().iContiguous            = EFalse;
-        attributes().iMappable              = ETrue;
-    
-        err = iSurfaceManager.CreateSurface( attributes, iSurfaceId );
-        User::LeaveIfError( err );  
-        
-        // Map to chunk
-        iSurfaceChunk = new RChunk();
-        User::LeaveIfNull( iSurfaceChunk );    
-        err = iSurfaceManager.MapSurface( iSurfaceId, *iSurfaceChunk );
-        User::LeaveIfError( err );    
-    
-        // Get the info from the surfaceManager
-        RSurfaceManager::TInfoBuf info;
-        err = iSurfaceManager.SurfaceInfo( iSurfaceId, info );
-        User::LeaveIfError( err );    
-    
-        TInt offset;
-        iSurfaceManager.GetBufferOffset( iSurfaceId, 0, offset );
-        iBuffer = iSurfaceChunk->Base() + offset;
-        
-        iSurfaceCreated = ETrue;
-        }
-    else
-        {
-        if ( iWs == NULL || iWindow == NULL )
-            {
-            User::Leave( KErrGeneral );
-            }
-        
-        iWindow->RemoveBackgroundSurface(ETrue);
-        iWs->UnregisterSurface(0, iSurfaceId);
-        
-        __VTPRINT( DEBUG_MEDIA, "LocVid.NGARender.Surface exists, detach first!" )
-        }
-
-    iWs = aWs;
-    iWindow = aWindow;
-    iWs->RegisterSurface( 0, iSurfaceId );
-    
-    TSurfaceConfiguration surfaceConfig;
-    surfaceConfig.SetSurfaceId( iSurfaceId );
-    surfaceConfig.SetOrientation( CFbsBitGc::EGraphicsOrientationRotated270);
-    iWindow->SetBackgroundSurface( surfaceConfig, ETrue );
-    //iWindow->SetBackgroundSurface( iSurfaceId );
-    
-    __VTPRINTEXIT( "LocVid.NGARender.AttachSurfaceL" )
-    
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::~CVtEngVFBitmapNGARender
-// -----------------------------------------------------------------------------
-//
-CVtEngLocalVideo::CVtEngVFBitmapNGARender::CVtEngVFBitmapNGARender()
-    : CActive( CActive::EPriorityStandard ),
-      iSurfaceFormat( EUidPixelFormatXRGB_8888 )
-    {
-    iSurfaceCreated = EFalse;
-
-    CActiveScheduler::Add( this );        
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CVtEngLocalVideo::CVtEngVFBitmapNGARender::ConstructL( )
-    {
-    __VTPRINTENTER( "LocVid.NGARender.ConstructL" )  
-    __VTPRINTEXIT( "LocVid.NGARender.ConstructL" )
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::RunL
-// -----------------------------------------------------------------------------
-//
-void CVtEngLocalVideo::CVtEngVFBitmapNGARender::RunL()
-    {
-    __VTPRINTENTER( "LocVid.NGARender.RunL" )  
-    __VTPRINTEXIT( "LocVid.NGARender.RunL" )
-    }
-
-// -----------------------------------------------------------------------------
-// CVtEngLocalVideo::CVtEngVFBitmapNGARender::DoCancel
-// -----------------------------------------------------------------------------
-//
-void CVtEngLocalVideo::CVtEngVFBitmapNGARender::DoCancel()
-    {
-    __VTPRINTENTER( "LocVid.NGARender.DoCancel" )  
-    __VTPRINTEXIT( "LocVid.NGARender.DoCancel" )
-    }
-
-// -----------------------------------------------------------------------------
 // CVtEngLocalVideo::CreateCameraPreferencesL
 // -----------------------------------------------------------------------------
 //

--- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -82,7 +82,7 @@
 const TInt KVtEngCharacterEndLine( 10 );
 
 // Multiplex delay in milliseconds
-//const TInt KVtEngMultiplexingDelay = 150;
+const TInt KVtEngMultiplexingDelay = 150;
 
 // TradeOff values
 const TInt KVtEngTradeOffDetailMax = 9;
@@ -802,10 +802,10 @@
             break;
         case KVtEngPrepareViewFinder:
             {
-            const TPckgC<TVtEngRenderingOptionsNGA>& pckg =
-                static_cast< const TPckgC<TVtEngRenderingOptionsNGA>& >
+            const TPckgC<TVtEngRenderingOptions>& pckg =
+                static_cast< const TPckgC<TVtEngRenderingOptions>& >
                 ( *aOperation.Parameters() );
-            const TVtEngRenderingOptionsNGA &options = pckg();
+            const TVtEngRenderingOptions& options = pckg();
             iLocalVideo->SetViewFinderParameters( options );
             }
             break;
@@ -3891,19 +3891,21 @@
     const TVtCommandResponse& aResponse )
     {
     __VTPRINTENTER( "MH.EncExtCommandCompleted" )
-
-    __VTPRINT2( DEBUG_MEDIA, "MH.263 ComC type=%d", aResponse.iCmdType )
+    const TInt type( aResponse.iCmdType );
+    const TInt protoCmdId( aResponse.iCmdId );
+    const TInt protoResponse( aResponse.iCmdStatus );
+    __VTPRINT2( DEBUG_MEDIA, "MH.263 ComC type=%d", type )
     __VTPRINT3( DEBUG_MEDIA, "MH.263 ComC cmdId=%d,response=%d",
-      aResponse.iCmdId, aResponse.iCmdStatus )
+      protoCmdId, protoResponse )
 
     // Find correct entry in iPendingOps based on TOperation because there can
     // be several entries with same Protocol cmd id since each Protocol interface has their
     // own id allocation and ids may overlap.
     TInt index( KErrNotFound );
     TOperation completedOp = ENone;
-    if ( MatchResponseToPendingOps( aResponse.iCmdId, ESendIntraframe, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetIFrameInterval, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetVideoQuality, &index ) )
+    if ( MatchResponseToPendingOps( protoCmdId, ESendIntraframe, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetIFrameInterval, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetVideoQuality, &index ) )
         {
         // TOperation entries in are unique in the array...
         const TCmdOpPair pair = (*iPendingOps)[ index ];
@@ -3920,13 +3922,13 @@
         __VTPRINT( DEBUG_MEDIA, "MH.EECC ESetVideoQuality" )
         if( iPendingOp && ( iPendingOp->Command() == KVtEngSetVideoQuality ) )
             {
-            CompleteOp( aResponse.iCmdStatus );
+            CompleteOp( protoResponse );
             }
-        if( aResponse.iCmdStatus == KErrNone )
+        if( protoResponse == KErrNone )
             {
             TVtEngVideoQuality::TVQSParams vqp;
 
-            if ( iVideoQuality.SettingSucceeded( aResponse.iCmdId, vqp ) )
+            if ( iVideoQuality.SettingSucceeded( protoCmdId, vqp ) )
                 {
                 __VTPRINT( DEBUG_MEDIA, "MH.EECC sending vq indication" )
                 AddOperation( ESendVTSTO,
@@ -3942,7 +3944,7 @@
             }
         else
             {
-            iVideoQuality.SettingFailed( aResponse.iCmdId );
+            iVideoQuality.SettingFailed( protoCmdId );
             }
         }
     if ( iProtoState == MVtProtocolCommand::EIdle )
@@ -3959,7 +3961,8 @@
 void CVtEngMediaHandler::HandleVideoEncoderInformationalEventL(
     const TVtIndicationEvent& aEvent)
     {
-    __VTPRINT2( DEBUG_MEDIA, "MH.263 infoevent=%d", aEvent.iEventType )
+    const TInt type( aEvent.iEventType );
+    __VTPRINT2( DEBUG_MEDIA, "MH.263 infoevent=%d", type )
     }
 
 // -----------------------------------------------------------------------------
@@ -3971,17 +3974,20 @@
     const TVtCommandResponse& aResponse )
     {
 	__VTPRINTENTER( "MH.HandleH324MConfigCommandCompletedL" )
-
-	__VTPRINT2( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL type=%d", aResponse.iCmdType )
-    __VTPRINT3( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL cmdId=%d,response=%d", aResponse.iCmdId, aResponse.iCmdStatus )
+	const TInt protoCmdId( aResponse.iCmdId );
+	const TInt protoResponse( aResponse.iCmdStatus );
+	const TInt type( aResponse.iCmdType );
+
+	__VTPRINT2( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL type=%d", type )
+    __VTPRINT3( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL cmdId=%d,response=%d", protoCmdId, protoResponse )
     TInt index( KErrNotFound );
     // Find correct entry in iPendingOps based on TOperation because there can
     // be several entries with same Protocol cmd id since each Protocol interface has their
     // own id allocation and ids may overlap.
-    if ( MatchResponseToPendingOps( aResponse.iCmdId, ESetVendorId, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESendVTSTO, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetSupportedResolutions, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetFastCsupOptions, &index ) )
+    if ( MatchResponseToPendingOps( protoCmdId, ESetVendorId, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESendVTSTO, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetSupportedResolutions, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetFastCsupOptions, &index ) )
         {
         // TOperation entries in are unique in the array...
         const TCmdOpPair pair = (*iPendingOps)[ index ];
@@ -3996,10 +4002,10 @@
 
         	// Check does the received command ID match to command ID that was received
         	// from Protocol when DTMF was send.
-        	if( stateManager->Handlers().Dtmf().CheckCommandId( aResponse.iCmdId ) )
+        	if( stateManager->Handlers().Dtmf().CheckCommandId( protoCmdId ) )
         		{
         		__VTPRINT( DEBUG_MEDIA, "MH.Complete DTMF" )
-        		stateManager->Handlers().Dtmf().SendComplete( aResponse.iCmdStatus );
+        		stateManager->Handlers().Dtmf().SendComplete( protoResponse );
         		}
         	}
             break;

--- a/vtengines/vtmediatorplugin/inc/vtinternalmediatorapi.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/vtmediatorplugin/inc/vtinternalmediatorapi.h	Wed Sep 01 12:29:12 2010 +0100
@@ -41,8 +41,7 @@
 struct TVtVideoTelephonyCallInformation
 {   
     /** Max length of display text */
-    enum { TDisplayTextMaxLength = 100 }; 
-    enum { TPhoneNumMaxLength = 100 };
+    enum { TDisplayTextMaxLength = 100 };        
                                      
     /** Display text type definition */
     typedef TBuf<TDisplayTextMaxLength> TDisplayText;
@@ -68,12 +67,6 @@
         EDisplayTextValid = 0x01,
         EDataportValid    = 0x02
     };
-    
-    /** Display text type definition */
-    typedef TBuf<TPhoneNumMaxLength> TPhoneNumText;
-      
-    /** Remote end CLI identifier (name/number/call id) */
-    TPhoneNumText iPhoneNumText;
                                                
     /** Event data validity */
     TUint iEventDataValidity;

--- a/vtengines/vtmediatorplugin/src/cvtmediatorplugin.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/vtmediatorplugin/src/cvtmediatorplugin.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -620,7 +620,6 @@
         {
         iVtCallInfo.iVoiceCallPossible = ETrue;
         }
-    iVtCallInfo.iPhoneNumText = aData.iRemotePhoneNumber;
     iVtCallInfo.iEventDataValidity |= 
         TVtVideoTelephonyCallInformation::EDisplayTextValid;
     TRACE2("CVtMediatorPlugin.SaveCallData data saved=%d>",

--- a/vtprotocolplugins/DisplaySink/group/bld.inf	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/DisplaySink/group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -25,7 +25,7 @@
 
 PRJ_EXPORTS
 
-../inc/cvtimageconverter.h      |../../../inc/cvtimageconverter.h
+../inc/CVtImageConverter.h      |../../../inc/cvtimageconverter.h
 ../inc/cvtimageconverter.inl    |../../../inc/cvtimageconverter.inl
 ../inc/mdisplaysink.h           |../../../inc/mdisplaysink.h
 ../inc/TDisplaySinkParamsDSA.h  |../../../inc/tdisplaysinkparamsdsa.h

--- a/vtprotocolplugins/DisplaySink/src/CVtImageConverter.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/DisplaySink/src/CVtImageConverter.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -20,7 +20,7 @@
 
 #include <e32svr.h>
 #include <fbs.h>
-#include "cvtimageconverter.h"
+#include "CVtImageConverter.h"
 
 // LOCAL CONSTANTS AND MACROS
 

--- a/vtprotocolplugins/VideoSource/src/CVSOnboardCameraDataProvider.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/CVSOnboardCameraDataProvider.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -824,7 +824,7 @@
 	{
 	__IF_DEBUG(Print(_L("VideoSource [%d]: CVSOnboardCameraDataProvider::HandleEvent() event %d>>"),
     	RThread().Id().operator TUint(), aEvent.iEventType  ));
-    __IF_DEBUG(Print(_L("VideoSource [%d]: CVSOnboardCameraDataProvider::HandleEvent() iErrorCode %d>"),
+  __IF_DEBUG(Print(_L("VideoSource [%d]: CVSOnboardCameraDataProvider::HandleEvent() iErrorCode %d>"),
     	RThread().Id().operator TUint(), aEvent.iErrorCode  ));
   //Needs to handled first
   if( aEvent.iEventType == KUidECamEventCameraNoLongerReserved )

--- a/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -22,8 +22,8 @@
 #include <bautils.h>
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
-#include <rphcltserver.h>
-#include <cphcltimagehandler.h>
+#include <RPhCltServer.h>
+#include <CPhCltImageHandler.h>
 #include <w32std.h>
 
 #include "CVSStillImageDataProvider.h"
@@ -327,7 +327,7 @@
     iActiveWait = new (ELeave) CVSActiveWait< CVSStillImageDataProvider > ( this );
 
     //Create viewer
-    iViewer = CMultiframeProvider::NewL( this , iDisplayMode );
+    iViewer = CMultiframeProvider::NewL( this , EColor16MU/*iDisplayMode*/ );
     User::LeaveIfError( iFreezeCS.CreateLocal() );
 
     __IF_DEBUG(Print(_L("VideoSource [%d]: CVSStillImageDataProvider::CommonInitializeL() <<"), RThread().Id().operator TUint()));
@@ -805,7 +805,7 @@
     // SourceThreadLogoff() if a switch is pending
     if( iProtoTimer && ( iPSState == EPSPlaying ) )
         {
-        iProtoTimer->After( iProtoUpdateRate, &CVSStillImageDataProvider::ProtoTimer );
+        iProtoTimer->After( iProtoUpdateRate, &ProtoTimer );
         }
     __IF_DEBUG(Print(_L("VideoSource[%d]: CVSStillImageDataProvider::ProtoTimer() this %x <<"), RThread().Id().operator TUint(), this));
     }
@@ -894,8 +894,7 @@
     CWsScreenDevice* wsScreenDevice = new ( ELeave ) CWsScreenDevice( wsSession );
     CleanupStack::PushL( wsScreenDevice );
     User::LeaveIfError( wsScreenDevice->Construct() );
-    //iDisplayMode = wsScreenDevice->DisplayMode();/* = EColor16MU;*/
-    iDisplayMode = EColor16MU;
+    iDisplayMode = wsScreenDevice->DisplayMode();/* = EColor16MU;*/
     CleanupStack::PopAndDestroy( 2 ); // wsSession, wsScreenDevice
     __IF_DEBUG(Print(_L("VideoSource [%d]: CVSStillImageDataProvider::ConstructL() this %x <<"), RThread().Id().operator TUint(), this));
     }
@@ -1097,7 +1096,7 @@
     // has beed aquired and play state is on
     if ( ( iTargetSize == iVFBitmap->Size() ) && ( iVFState == EVFPlaying ) )
         {
-        iVFTimer->After( 1, &CVSStillImageDataProvider::VFTimer );
+        iVFTimer->After( 1, &VFTimer );
         }
     else
         {

--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -19,8 +19,8 @@
 // INCLUDE FILES
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
-#include <rphcltserver.h>
-#include <cphcltimagehandler.h>
+#include <RPhCltServer.h>
+#include <CPhCltImageHandler.h>
 #include <bautils.h>
 
 #include "cmultiframeprovider.h"
@@ -233,7 +233,7 @@
             }
         iGSImage = ETrue;
         iCount = 1;     
-		    iActiveWaitInit->InitializeWaiter( &CMultiframeProvider::ConversionFinished );
+		    iActiveWaitInit->InitializeWaiter( &ConversionFinished );
         iActiveWaitInit->Signal( KErrNone );
         }
     else
@@ -275,7 +275,7 @@
     CleanupStack::PopAndDestroy(); // tempBitmap
     tempBitmap = 0;
 
-    iActiveWaitInit->InitializeWaiter( &CMultiframeProvider::BMSScalingFinished );
+    iActiveWaitInit->InitializeWaiter( &BMSScalingFinished );
     iActiveWaitInit->Signal( KErrNone );
     __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::IniatializeBlank() <<"), RThread().Id().operator TUint()));
     }
@@ -517,7 +517,7 @@
     iDefaultImageFile.Close(); 
     if ( aError == KErrNone )
         {
-				iActiveWaitInitScale->InitializeWaiter( &CMultiframeProvider::BMSScalingFinished );
+				iActiveWaitInitScale->InitializeWaiter( &BMSScalingFinished );
       	if ( iGSImage )
        			{
        			__IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::ConversionFinished() scale GS "), RThread().Id().operator TUint()));
@@ -579,12 +579,12 @@
         	}
     // Allways inform Decoding problems
     else
-       	{
+        {
         iObserver->NotifyImageHandlingError( aError );
         delete iTempBM;
-       	delete iMask;
-       	iMask = NULL;
-       	iTempBM = NULL;
+        delete iMask;
+        iMask = NULL;
+        iTempBM = NULL;
         // GIF used when error happen
         if ( iCount > 1 )
             {
@@ -686,7 +686,7 @@
             {
             //ScaleCopy is not running, Jump ScaleCopy
             __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::VFScalingReady()jump ScaleCopy>>"), RThread().Id().operator TUint()));
-            iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+            iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
             iActiveWaitScale->Signal(KErrNone);
             }
         }
@@ -729,7 +729,7 @@
     else
         {
         __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::ScaleCopy(): scaling NOW"), RThread().Id().operator TUint()));
-        iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+        iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
         TInt result( iVFbitmap->Bitmap().Resize( aSize ) );
         __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::ScaleCopy() result %d <<"), RThread().Id().operator TUint(), result));
         if ( result != KErrNone )
@@ -811,7 +811,7 @@
 void CMultiframeProvider::ScaleVF( const TSize& aSize )
     {
     __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::ScaleVF() >>"), RThread().Id().operator TUint()));
-    iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+    iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
     TInt result( iVFbitmap->Bitmap().Resize( aSize ) );
     ClearVFScalingTargetSize();
     if ( result != KErrNone )

--- a/vtprotocols/group/videotelproto.mmp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocols/group/videotelproto.mmp	Wed Sep 01 12:29:12 2010 +0100
@@ -40,7 +40,7 @@
 SOURCE          cvtuserinput.cpp
 SOURCE          vtprotocolfactory.cpp
 
-DOCUMENT        ../../bld.inf
+DOCUMENT        ../../group/bld.inf
 
 USERINCLUDE     ../inc/
 

--- a/vtprotocols/inc/ch324confighandler.h	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocols/inc/ch324confighandler.h	Wed Sep 01 12:29:12 2010 +0100
@@ -126,4 +126,4 @@
     };    
 #endif
 //  End of File
- 
+ 
\ No newline at end of file

--- a/vtprotocols/src/ch324confighandler.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocols/src/ch324confighandler.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -168,7 +168,7 @@
 TInt CH324ConfigCommand::SendUserInputMessageL(MVTUserInput& user_input)
     {
     __IF_DEBUG(Print(_L("VTProto: CH324ConfigCommand::SendUserInputMessageL<")));	
-    if ( user_input.GetType() == EVtUiiDTMF )
+    if (user_input.GetType() == EVtUiiDTMF )
         {
         CVTUserInputDtmf* dtmf = static_cast<CVTUserInputDtmf*>(&user_input);
         return iH324Config->SendUserInputL(*dtmf->iUII);

--- a/vtprotocols/src/vtprotocolfactory.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocols/src/vtprotocolfactory.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -177,7 +177,7 @@
 EXPORT_C MVTUserInput* VTProtocolFactory::CreateUserInputIndication(TUserInputType aUIIType, TUint8 aTone)
     {
     __IF_DEBUG(Print(_L("VTProto: VTProtocolFactory::CreateUserInputIndication")));	
-    if ( aUIIType == EVtUiiDTMF )
+    if (aUIIType == EVtUiiDTMF )
         {
         CVTUserInputDtmf* uii = CVTUserInputDtmf::NewL(aTone);
         return uii;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vtuis/group/bld.inf	Wed Sep 01 12:29:12 2010 +0100
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2004 - 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:  Build information for Vtuis subsystem.
+*
+*/
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+// Include components' bld.inf files
+#include "../videotelui/group/bld.inf"
+
+//  End of File  

Binary file vtuis/lcvtapp/cenrep/keys_s60videotelephony.xls has changed

Binary file vtuis/lcvtapp/conf/CI_s60videotelephony.confml has changed

Binary file vtuis/lcvtapp/conf/s60videotelephony.confml has changed

Binary file vtuis/lcvtapp/conf/s60videotelephony_102072D0.crml has changed

Binary file vtuis/lcvtapp/conf/s60videotelephony_10281872.crml has changed

--- a/vtuis/lcvtapp/data/videotelui_stub.pkg	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:
-;
-; Languages
-&EN
-
-; Header
-#{"videotelui"}, (0x101F8681), 1, 0, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-""-"z:\sys\bin\videotelui.exe"
-""-"z:\resource\apps\videotelui.rsc"
-""-"z:\private\10003a3f\import\apps\videotelui_reg.rsc"
\ No newline at end of file

Binary file vtuis/lcvtapp/data/videotelui_stub.sis has changed

--- a/vtuis/lcvtapp/inc/VideoTelephonyInternalCRKeys.h	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
-* 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:  Video Telephony internal Central Repository keys
-*
-*/
-
-
-#ifndef VIDEOTELEPHONYINTERNALCRKEYS_H
-#define VIDEOTELEPHONYINTERNALCRKEYS_H
-
-#include <e32std.h>
-
-/**
-* Video Telephony Variation API
-* Keys under this category are used in defining video telephony variation.
-*/
-const TUid KCRUidVTVariation = {0x102072D0};
-
-/**
-* Video Telephony Local Variation Flags. Values are defined in 
-* VideoTelephonyVariant.hrh.
-*/
-const TUint32 KVTLocalVariationFlags = 0x00000001;
-
-/**
-* Video Telephony Configuration API
-* Keys under this category are used for configuring video call behaviour.
-* @since S60 3.1
-*/
-const TUid KCRUidVTConfiguration = {0x10281872};
-
-/**
-* This key controls minimum, normal and maximum frame rate for video encoder.
-* Integer values in the string are between 0 and 31 separated by space.
-* Example for key value is "5 10 5".
-*/
-const TUint32 KVTVideoFrameRates = 0x00000001;
-
-/**
-* Defines layout (screen orientation) used by Video Telephone application 
-* per active camera. Each camera has one of the following configurations:
-* 1) "LS" = Landscape
-* 2) "PR" = Portrait
-* 3) "OL" = Obey device layout (normal operation)
-* Camera values are:
-* 1) "C1" = VT primary camera (inwards)
-* 2) "C2" = VT secondary camera (outwards)
-*  Example value (portrait for cam1, landscape for cam2): C1:PR C2:LS
-*/
-const TUint32 KVTCameraLayout = 0x00000002;
-
-/**
-* Lists implementation UIDs for MPEG4, H.263 and H.264 encoders for video 
-* telephony in hexadecimal separated by space
-*/
-const TUint32 KVTVideoEncoderUIDs = 0x00000003;
-
-/**
-* Lists implementation UIDs for MPEG4, H.263 and H.264 decoders for video 
-* telephony in hexadecimal separated by space
-*/
-const TUint32 KVTVideoDecoderUIDs = 0x00000004;
-
-/**
-* Lists implementation UIDs for AMR-NB and future audio encoders for video
-* telephony (in hex, separated by space)
-*/
-const TUint32 KVTAudioEncoderUIDs = 0x00000005;
-
-/**
-* Lists implementation UIDs for AMR-NB and future audio decoders for video 
-* telephony (in hex, separated by space)
-*/
-const TUint32 KVTAudioDecoderUIDs = 0x00000006;
-                                               
-/**
-* Lists processing delay for MPEG4, H.263 and H.264 encoders for video 
-* telephony in unsigned 32-bit integers separated by space
-*/
-const TUint32 KVTVideoEncoderDelay = 0x00000007;
-
-/**
-* Lists processing delay for MPEG4, H.263 and H.264 decoders for video 
-* telephony in unsigned 32-bit integers separated by space
-*/
-const TUint32 KVTVideoDecoderDelay = 0x00000008;
-
-/**
-* Lists processing delay for AMR-NB and future audio encoders for video
-* telephony (in unsigned 32-bit integers, separated by space)
-*/
-const TUint32 KVTAudioEncoderDelay = 0x00000009;
-
-/**
-* Lists processing delay for AMR-NB and future audio decoders for video 
-* telephony (in unsigned 32-bit integers, separated by space)
-*/
-const TUint32 KVTAudioDecoderDelay = 0x0000000A;
-
-/*
-* Defines number of toolbar buttons. Three buttons is minimum
-* and seven is maximum.
-*/
-//const TUint32 KVTToolbarCommands  = 0x0000000B;
-
-#endif      // VIDEOTELEPHONYINTERNALCRKEYS_H
-
-// End of file
\ No newline at end of file

--- a/vtuis/lcvtapp/inc/VideoTelephonyVariant.hrh	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* 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:  Bit flag definitions for VT local variation.
-*
-*/
-
-
-#ifndef VIDEOTELEPHONYVARIANT_HRH
-#define VIDEOTELEPHONYVARIANT_HRH
-
-
-/**
-* KVTLVFlagScalingMethodENearest defines whether the video image is
-* scaled using Nearest algorithm, which is fast, but quality is low.
-* When the flag is set ENearest is used.
-* @since S60 v2.8
-*/
-#define KVTLVFlagScalingMethodENearest 0x00000001
-
-/**
-* KVTLVFlagScalingMethodEBilinear defines whether the video image is
-* scaled using Bilinear algorithm, which offers the best quality, but in a
-* slow way. When the flag is set Bilinear is used.
-* @since S60 v2.8
-*/
-#define KVTLVFlagScalingMethodEBilinear 0x00000002
-
-/**
-* KVTLVFlagEnableBitReversal defines if bit order should be
-* reversed in PV.
-* When the flag is set bit order is reversed.
-*/
-#define KVTLVFlagEnableBitReversal 0x00000004
-
-/**
-* KVTLVFlagEnableAMR_WB defines if AMR wideband is supported in video calls.
-* @since S60 v5.0
-*/
-#define KVTLVFlagEnableAMR_WB 0x00000008
-
-/**
-* KVTLVFlagSupportMpeg4 defines whether the PV should support Mepg4.
-* @since S60 v5.0
-*/
-#define KVTLVFlagDisableMpeg4 0x00000010
-
-#endif // VIDEOTELEPHONYVARIANT_HRH
-
-// End of File

--- a/vtuis/lcvtapp/lcapplication.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* 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:
-*
-*/
-//USER
-#include "lcapplication.h"
-#include "cvtlogger.h"
-
-LcHbApplication* LcHbApplication::self = 0;
-
-// -----------------------------------------------------------------------------
-// LcHbApplication::LcHbApplication
-// -----------------------------------------------------------------------------
-//
-LcHbApplication::LcHbApplication(int &argc, char *argv[]) :
-    HbApplication(argc, argv)
-{    
-    __VTPRINT( DEBUG_GEN,  "LcHbApplication::LcHbApplication()");
-    self = this;
-}
-
-// -----------------------------------------------------------------------------
-// LcHbApplication::~LcHbApplication
-// -----------------------------------------------------------------------------
-//
-LcHbApplication::~LcHbApplication()
-{
-    self = 0;
-}
-
-// -----------------------------------------------------------------------------
-// LcHbApplication::quit
-// -----------------------------------------------------------------------------
-//
-void LcHbApplication::quit()
-{
-    __VTPRINT( DEBUG_GEN, "LcHbApplication::quit()");
-    if (self) {
-        emit self->handleQuit();
-    }
-}
-
-    

--- a/vtuis/lcvtapp/lcapplication.h	Tue Aug 31 15:16:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef LCAPPLICATION_H
-#define LCAPPLICATION_H
-
-#include <hbapplication.h>
-
-class LcHbApplication : public HbApplication
-{
-Q_OBJECT
-public:
-    
-    LcHbApplication(int &argc, char *argv[]);
-    ~LcHbApplication();
-
-signals:
-    
-    void handleQuit();
-
-public slots:
-
-    //from QCoreApplication
-    static void quit();        
-
-private: //data
-    
-    static LcHbApplication* self;
-};
-
-#endif //LCAPPLICATION_H