--- a/layers.sysdef.xml Thu Apr 01 22:57:34 2010 +0300
+++ b/layers.sysdef.xml Fri Apr 16 18:15:25 2010 +0300
@@ -7,7 +7,7 @@
<systemModel>
<layer name="mw_layer">
<module name="videoutils">
- <unit unitID="vado.videoutils" mrp="" bldFile="&layer_real_source_path;/group" name="videoutils" />
+ <unit unitID="vado.videoutils" mrp="" bldFile="&layer_real_source_path;" name="videoutils" proFile="videoutils.pro" qmakeArgs="-r" />
</module>
</layer>
--- a/videoutils.pro Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils.pro Fri Apr 16 18:15:25 2010 +0300
@@ -17,6 +17,6 @@
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\""
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoutils_plat/videoplayer_constants_api/group/bld.inf\""
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoutils_plat/videoscheduler_api/group/bld.inf\""
}
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h Fri Apr 16 18:15:25 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 };
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h Fri Apr 16 18:15:25 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
--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Fri Apr 16 18:15:25 2010 +0300
@@ -52,6 +52,12 @@
const TInt KVcxMvcMaxUrlLength = 1024;
/**
+* Maximum length of KMPXMediaGeneralTitle attribute. Limiting factor
+* comes from MDS.
+*/
+const TInt KVcxMvcMaxTitleLength = 255;
+
+/**
* Content ID (UID) identifying My Videos category of content provided
* in the media object and associated attributes.
*/
@@ -180,6 +186,7 @@
/**
* 2. (BRIEF)
* Descriptor, contains video name.
+* Maximum length is KVcxMvcMaxTitleLength.
* Saved to MDS.
*/
//KMPXMediaGeneralTitle
@@ -920,7 +927,8 @@
| cmd is the same as was given in .CommandL() call. |
| cmd contains in addition to parameters set earlier: |
| 1. Media array has error codes set to each array item: |
- | KVcxMediaMyVideosInt32Value = KErrNone if successful, KErrGeneral otherwise.
+ | KVcxMediaMyVideosInt32Value = KErrNone if successful, |
+ | KErrGeneral or KErrAlreadyExists otherwise. |
| 2. cmd KVcxMediaMyVideosInt32Value contains KErrNone if everything went |
| OK. If value is != KErrNone, then something went wrong and individual |
| error codes for array items might not contain values. |
--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h Fri Apr 16 18:15:25 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
--- a/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h Thu Apr 01 22:57:34 2010 +0300
+++ b/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h Fri Apr 16 18:15:25 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;