# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272379296 -10800
# Node ID 198b91596e2e94862b6528fed039fda21939585d
# Parent  e16c1e402817e9bf04d2d90922f92d49a6061026
Revision: 201015
Kit: 201017

diff -r e16c1e402817 -r 198b91596e2e videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Wed Mar 31 23:11:17 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h	Tue Apr 27 17:41:36 2010 +0300
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 4 %
+// Version : %version: 5 %
 
 
 
@@ -53,6 +53,8 @@
 const TMPXAttributeData KMPXMediaVideoCopyright           = { KMPXMediaIdVideo, 0x4000 };
 const TMPXAttributeData KMPXMediaVideoLanguage            = { KMPXMediaIdVideo, 0x8000 };
 const TMPXAttributeData KMPXMediaVideoKeywords            = { KMPXMediaIdVideo, 0x10000 };
+const TMPXAttributeData KMPXMediaVideoCreated             = { KMPXMediaIdVideo, 0x20000 };
+const TMPXAttributeData KMPXMediaVideoLastModified        = { KMPXMediaIdVideo, 0x40000 };
 
 const TMPXAttributeData KMPXMediaVideoAll                 = { KMPXMediaIdVideo, 0xffffffff };
 
diff -r e16c1e402817 -r 198b91596e2e videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Wed Mar 31 23:11:17 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Tue Apr 27 17:41:36 2010 +0300
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 7 %
+// Version : %version: 10 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -121,7 +121,8 @@
     EPbCmdCustomPause,
     EPbCmdCustomPlay,
     EPbCmdRetrieveBufferingPercentage,
-    EPbCmdSurfaceRemoved
+    EPbCmdLoadingStarted,
+    EPbCmdHideControls
 };
 
 enum TMPXGeneralError
@@ -139,38 +140,36 @@
 //  Content ID identifying video display window category of content provided
 //  in the media object and associated attributes.
 //
-const TInt KMPXMediaIdVideoDisplaySyncMessage = 0x20024333;
+const TInt KMPXMediaIdVideoDisplayMessage = 0x20024333;
 
 //
 //  TInt for Command Id
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplaySyncMessage, 0x01 };
+const TMPXAttributeData KMPXMediaVideoDisplayCommand = { KMPXMediaIdVideoDisplayMessage, 0x01 };
 
 //
 //  TSurfaceId
 //
-const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplaySyncMessage, 0x02 };
+const TMPXAttributeData KMPXMediaVideoDisplayTSurfaceId = { KMPXMediaIdVideoDisplayMessage, 0x02 };
 
 //
 //  TRect
 //
-const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplaySyncMessage, 0x04 };
+const TMPXAttributeData KMPXMediaVideoDisplayCropRect = { KMPXMediaIdVideoDisplayMessage, 0x04 };
 
 //
 //  TVideoAspectRatio
 //
-const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplaySyncMessage, 0x08 };
+const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplayMessage, 0x08 };
 
 
 enum TMPXVideoDisplayCommand
 {
     EPbMsgVideoSurfaceCreated,
     EPbMsgVideoSurfaceChanged,
-    EPbMsgVideoSurfaceRemoved,
-    EPbMsgVideoRemoveDisplayWindow
+    EPbMsgVideoSurfaceRemoved
 };
 
-
 #endif
 
 // EOF
diff -r e16c1e402817 -r 198b91596e2e videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h
--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h	Wed Mar 31 23:11:17 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h	Tue Apr 27 17:41:36 2010 +0300
@@ -11,11 +11,12 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
+// Version : %version:  da1mmcf#4 %
 
 
 #ifndef VCXMYVIDEOSUIDS_H
@@ -26,4 +27,9 @@
 */
 #define KVcxUidMyVideosMpxCollection 0x20016B97
 
+//
+//  UID for the In Memory collection plugin used for playlist files
+//
+#define KMpxInMemoryPluginUid 0x101FFCD8
+
 #endif // VCXMYVIDEOSUIDS_H
diff -r e16c1e402817 -r 198b91596e2e videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h
--- a/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h	Wed Mar 31 23:11:17 2010 +0300
+++ b/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h	Tue Apr 27 17:41:36 2010 +0300
@@ -126,7 +126,7 @@
 		* @param    aArray      On return contains items from the database.
 		* @return   Generic symbian error code.
 		*/                                       
-        TInt GetSchedulesByPluginUid( const TInt32 aPluginUid,
+		IMPORT_C TInt GetSchedulesByPluginUid( const TInt32 aPluginUid,
                                       RPointerArray<CCseScheduledProgram>& aArray ) const;
 
         /**
@@ -135,7 +135,7 @@
 		* @param    aArray          On return contains items from the database.
 		* @return   Generic symbian error code.
 		*/                                      
-        TInt GetSchedulesByType( const TInt32 aScheduleType, 
+		IMPORT_C TInt GetSchedulesByType( const TInt32 aScheduleType, 
                                  RPointerArray<CCseScheduledProgram>& aArray ) const;
 
         /**
@@ -144,7 +144,7 @@
 		* @param    aEnd        End of the time frame
 		* @return   Generic symbian error code.
 		*/                                                                               
-        TInt GetSchedulesByTime( const TTime& aBeginning,
+		IMPORT_C TInt GetSchedulesByTime( const TTime& aBeginning,
                                  const TTime& aEnd,
                                  RPointerArray<CCseScheduledProgram>& aArray ) const;