# HG changeset patch
# User hgs
# Date 1270151133 -10800
# Node ID 2f50dfb243ea0ac6d6fc6e84ed2ec1fea119508d
# Parent  866c8dcf3377fcb7104542492ea8e8d68a8b79e6
201005

diff -r 866c8dcf3377 -r 2f50dfb243ea layers.sysdef.xml
--- a/layers.sysdef.xml	Thu Apr 01 22:35:56 2010 +0300
+++ b/layers.sysdef.xml	Thu Apr 01 22:45:33 2010 +0300
@@ -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 866c8dcf3377 -r 2f50dfb243ea videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Thu Apr 01 22:35:56 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Thu Apr 01 22:45:33 2010 +0300
@@ -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 866c8dcf3377 -r 2f50dfb243ea videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Thu Apr 01 22:35:56 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Thu Apr 01 22:45:33 2010 +0300
@@ -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
 {