# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1286210152 -3600
# Node ID 0e7027db5b572ec8d364a6f0b6755119228a8fb4
# Parent  6ecb7f34ad5b7650f5edc77cec06d3a4ca7b4991
Add videotelephony, update model for latest S4_PROPOSED build

diff -r 6ecb7f34ad5b -r 0e7027db5b57 symbian4/single/sources_proposed.csv
--- a/symbian4/single/sources_proposed.csv	Mon Oct 04 17:34:14 2010 +0100
+++ b/symbian4/single/sources_proposed.csv	Mon Oct 04 17:35:52 2010 +0100
@@ -34,6 +34,7 @@
 http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,tag,S4_PROPOSED,201035
 http://developer.symbian.org/oss/FCL/sf/app/testtools/,/sf/app/testtools,tag,S4_PROPOSED,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,tag,S4_PROPOSED,201037
+http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,tag,S4_PROPOSED,201037
 http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,tag,S4_PROPOSED,201037
 http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,tag,S4_PROPOSED,201035_01
 http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,tag,S4_PROPOSED,201033_02
diff -r 6ecb7f34ad5b -r 0e7027db5b57 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Mon Oct 04 17:34:14 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Mon Oct 04 17:35:52 2010 +0100
@@ -5488,7 +5488,7 @@
 <unit bldFile="mw/mmmw/mmserv/voipaudioservices/group"/>
 </component>
 <component name="lib3gpextparser" long-name="3GP Extension Metadata Parser Library" filter="s60" purpose="optional">
-<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+<unit bldFile="mw/mmmw/mmserv/metadatautility/3GPExtParserLib/group"/>
 </component>
 <component name="sts" long-name="System Tone Service" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="mw/mmmw/mmserv/sts/group"/>
@@ -8329,6 +8329,49 @@
 </component>
 </collection>
 </block>
+<block name="videotelephony" level="apps" levels="engine plugin prot ui" long-name="Video Telephony Apps">
+<collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
+<component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" purpose="optional" class="api">
+<unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+</component>
+</collection>
+<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
+<component name="videoteleng" long-name="Video Telephony Engine" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
+</component>
+<component name="vtmediatorplugin" long-name="VT Mediator Plugin" filter="s60" purpose="optional" plugin="Y">
+<unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
+</component>
+</collection>
+<collection name="vtuis" long-name="Video Telephony UIs" level="ui">
+<component name="lcvtplugin" long-name="Video Telephony Plugin" filter="s60" purpose="optional" plugin="Y">
+<unit bldFile="app/videotelephony/vtuis/lcvtplugin/group"/>
+</component>
+<component name="lcvtapp" long-name="Video Telephony Application" introduced="^4" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtuis/lcvtapp" proFile="lcvtapp.pro"/>
+</component>
+<component name="lcvtindicatorplugin" long-name="Video Telephony Indicator Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<unit bldFile="app/videotelephony/vtuis/lcvtindicatorplugin" proFile="lcvtindicatorplugin.pro"/>
+</component>
+<component name="lcvtindicatorcontroller" long-name="Video Telephony Indicator Controller" introduced="^4" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtuis/lcvtindicatorcontroller" proFile="lcvtindicatorcontroller.pro"/>
+</component>
+</collection>
+<collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
+<component name="displaysink" long-name="Display Sink" introduced="^2" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
+</component>
+<component name="videosource" long-name="Video Source" introduced="^2" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtprotocolplugins/VideoSource/group"/>
+</component>
+</collection>
+<collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
+<!--  this collection is really a component, move down a directory -->
+<component name="videotelproto" long-name="Video Telephony Protocol" filter="s60" purpose="optional">
+<unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
+</component>
+</collection>
+</block>
 <block name="photos" level="apps" levels="util support ui app" long-name="Photos">
 <collection name="photos_group" long-name="Photos Group" level="support">
 <component name="photos_group_build" long-name="Photos Group Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">