Catchup to latest Symbian^4 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Thu, 22 Jul 2010 16:44:04 +0100
branchGCC_SURGE
changeset 40 41f94cbc86f6
parent 32 9e14eed5a342 (current diff)
parent 39 d25ba9d8a7a2 (diff)
Catchup to latest Symbian^4
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Fri Jun 11 16:27:06 2010 +0100
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Thu Jul 22 16:44:04 2010 +0100
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 11 %
+// Version : %version: 13 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -82,14 +82,19 @@
 const TMPXAttributeData KMPXMediaVideoTvOutConnected = { KMPXMediaIdVideoPlayback, 0x200 };
 
 //
+//  TInt
+//
+const TMPXAttributeData KMPXMediaVideoTvOutPlayAllowed = { KMPXMediaIdVideoPlayback, 0x400 };
+
+//
 //  MimeType returned by the recognizer
 //
-const TMPXAttributeData KMPXMediaVideoRecognizedMimeType = { KMPXMediaIdVideoPlayback, 0x400 };
+const TMPXAttributeData KMPXMediaVideoRecognizedMimeType = { KMPXMediaIdVideoPlayback, 0x800 };
 
 //
 //  TInt
 //
-const TMPXAttributeData KMPXMediaVideoBufferingPercentage = { KMPXMediaIdVideoPlayback, 0x800 };
+const TMPXAttributeData KMPXMediaVideoBufferingPercentage = { KMPXMediaIdVideoPlayback, 0x1000 };
 
 
 enum TMPXVideoPlaybackCommand
@@ -117,13 +122,19 @@
     EPbCmdCustomPlay,
     EPbCmdRetrieveBufferingPercentage,
     EPbCmdLoadingStarted,
-    EPbCmdHideControls
+    EPbCmdHideControls,
+    EPbCmdSetPosterFrame
 };
 
 enum TMPXGeneralError
 {
     KMPXVideoCallOngoingError = 1,
     KMPXVideoPlayOver2GDuringVoiceCallError,
+    KMPXVideoTvOutPlaybackNotAllowed,
+    KMPXVideoTvOutPlaybackNotAllowedClose,
+    KMPXVideoSetPosterFrameFailure,
+    KMPXVideoSetPosterFrameSuccess,
+    KMPXVideoSetPosterFrameNotSupported,
     KMPXPluginError
 };
 
--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Fri Jun 11 16:27:06 2010 +0100
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Thu Jul 22 16:44:04 2010 +0100
@@ -2,7 +2,7 @@
 * 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"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -26,6 +26,9 @@
 #include <mdeconstants.h>
 #include <mpxcollectionpath.h>
 
+#define VCX_DOWNLOADS_CATEGORY
+#define VCX_ALBUMS
+
 //These are written to TMPXItemId::iId2
 const TInt KVcxMvcMediaTypeVideo    = 0;
 const TInt KVcxMvcMediaTypeCategory = 1;
@@ -40,6 +43,19 @@
 const TInt KVcxMvcCategoryIdTvRecordings = 2;
 const TInt KVcxMvcCategoryIdCaptured     = 3;
 const TInt KVcxMvcCategoryIdOther        = 4;
+const TInt KCategoryIdLastWatched        = 5;
+const TInt KCategoryIdExtraItem1         = 6;
+const TInt KCategoryIdExtraItem2         = 7;
+const TInt KCategoryIdExtraItem3         = 8;
+
+/**
+* My Videos Custom command ID
+*
+* This is sent to MPX video player app UI, 
+* when the my videos main view is initialized, and
+* player app should do the background initialization.
+*/
+const TInt KVcxMyVideosCmdDoLateConstruct =  0x20016B9D;
 
 /**
 * Same as KIptvUrlMaxLength in IptvUtil.h.
@@ -124,8 +140,12 @@
     EVcxMyVideosOriginTvRecording        = MdeConstants::Object::ERecorded
     }  TVcxMyVideosOrigin;
 
-const TInt KVcxMyVideosCollectionCenrepUid             = 0x2001B2A9;
-const TInt KVcxMyVideosCollectionCenrepKeySortingOrder = 0x01; 
+const TInt KVcxMyVideosCollectionCenrepUid                      = 0x2001B2A9;
+const TInt KVcxMyVideosCollectionCenrepKeySortingOrder          = 0x01; 
+const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedMpxId      = 0x02; 
+const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedName       = 0x03; 
+const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedPath       = 0x04; 
+const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedIndicator  = 0x05; 
 
 const TInt KVcxMyVideosCenRepUid = 0x102750E2; // same as KIptvCenRepUid in CIptvUtil.h
 const TInt KVcxMyVideosCenRepPreferredMemoryKey = 0x01; // same as KIptvCenRepPreferredMemoryKey in CIptvUtil.h
@@ -165,6 +185,19 @@
     */
     EVcxMyVideosVideoListOrderChanged
     };
+
+/**
+* These values are written to video list (received by HandleOpen)
+* KVcxMediaMyVideosInt32Value attribute to give extra information about the list status.
+*/
+enum TVcxMyVideosVideoListInfo
+    {    
+    /**
+    * Indicates that the list is complete and no more items are appended
+    * to the list by KVcxMessageMyVideosItemsAppended event.
+    */ 
+    EVcxMyVideosVideoListComplete
+    };
     
 //
 // These are the general attributes used in My Videos media object.
@@ -484,6 +517,13 @@
  */
 const TMPXAttributeData KVcxMediaMyVideosTransactionId = {KVcxMediaIdMyVideos, 1 << 24};
 
+/**
+ * 37.
+ * TBool, video list is partial. This is set to Category level video list to inform
+ * client that video cache is not complete yet.
+ */
+const TMPXAttributeData KVcxMediaMyVideosVideoListIsPartial = {KVcxMediaIdMyVideos, 1 << 24};
+
 
 // -------- end of my videos media attributes -------- //
 
@@ -586,6 +626,9 @@
  video list at the same time. The scenario described below involves video list fetching from MDS. If the collection
  has the video list already fetched, then the HandleOpenL will contain all videos and KVcxMessageMyVideosListComplete
  is received immedetially.
+ 
+ The list complete status (EVcxMyVideosVideoListComplete) is also written to aEntries KVcxMediaMyVideosInt32Value
+ attribute when the list is complete. 
   
                  .------.                                                                 .-------------------------.
                  |CLIENT|                                                                 |MPX My Videos Collection |