Revision: 201025 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 15 Jul 2010 18:41:27 +0300
branchRCL_3
changeset 53 2d690156cf8f
parent 45 baf439b22ddd
child 54 315810614048
Revision: 201025 Kit: 2010127
mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp
videocollection/hgmyvideos/inc/vcxhgmyvideosvideodataupdater.h
videocollection/hgmyvideos/src/vcxhgmyvideoscategorymodelhandler.cpp
videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp
videocollection/hgmyvideos/src/vcxhgmyvideosvideodataupdater.cpp
videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp
videocollection/hgmyvideos/src/vcxhgmyvideosvideomodelhandler.cpp
videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/custom/prerun_custom.xml
videoplayback/inc/mpxvideobaseplaybackview.h
videoplayback/inc/mpxvideopdlplaybackview.h
videoplayback/videohelix/src/mpxvideoplaybackstate.cpp
videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp
videoplayback/videoplaybackviews/src/mpxvideopdlplaybackview.cpp
videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp
videoplayerapp/mpxvideoplayer/sis/VideoPlayer.pkg
videoplayerapp/mpxvideoplayer/sis/VideoPlayer_stub.pkg
--- a/mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/mediasettings/mediasettingsengine/src/MPSettingsRopConfigParser.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 3 %
+// Version : %version: 4 %
 
 
 
@@ -347,15 +347,13 @@
         case EMPRopConfTypeString:
             {
             HBufC* str = aItem->iStringValue;
-            TInt strLength = str->Length();
-            HBufC8* str8 = HBufC8::NewLC(strLength);
-            TPtr8 str8Ptr = str8->Des();
-            CnvUtfConverter::ConvertFromUnicodeToUtf8(str8Ptr, *str);
-            
-            buf = HBufC8::NewL(aItem->iKey->Length() + strLength + KMPRopStringEntryPrototypeStaticLength);
+            HBufC8* str8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L( *str );
+            CleanupStack::PushL( str8 );
+            TInt str8Length = str8->Length();
+            buf = HBufC8::NewL(aItem->iKey->Length() + str8Length + KMPRopStringEntryPrototypeStaticLength);
             TPtr8 ptr = buf->Des();
             ptr.Format(KMPRopStringEntryPrototype, aItem->iKey, &(*str8));
-            CleanupStack::PopAndDestroy(); //str8
+            CleanupStack::PopAndDestroy( str8 );
             break;
             }
         default:
--- a/videocollection/hgmyvideos/inc/vcxhgmyvideosvideodataupdater.h	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/inc/vcxhgmyvideosvideodataupdater.h	Thu Jul 15 18:41:27 2010 +0300
@@ -34,6 +34,7 @@
 class CThumbnailManager;
 class CVcxHgMyVideosVideoList;
 class CPeriodic;
+class CMyVideosIndicator;
 
 // CLASS DECLARATION
 
@@ -58,7 +59,8 @@
         static CVcxHgMyVideosVideoDataUpdater* NewL( 
                 CVcxHgMyVideosModel& aModel,
                 CHgScroller& aScroller,
-                CVcxHgMyVideosVideoList& aVideoArray );
+                CVcxHgMyVideosVideoList& aVideoArray,
+                CMyVideosIndicator& aVideosIndicator );
 
         /**
          * Two-phased constructor.
@@ -71,7 +73,8 @@
         static CVcxHgMyVideosVideoDataUpdater* NewLC( 
                 CVcxHgMyVideosModel& aModel,
                 CHgScroller& aScroller,
-                CVcxHgMyVideosVideoList& aVideoArray );
+                CVcxHgMyVideosVideoList& aVideoArray,
+                CMyVideosIndicator& aVideosIndicator );
 
         /**
          * Destructor.
@@ -182,7 +185,8 @@
         CVcxHgMyVideosVideoDataUpdater( 
                 CVcxHgMyVideosModel& aModel,
                 CHgScroller& aScroller,
-                CVcxHgMyVideosVideoList& aVideoArray );
+                CVcxHgMyVideosVideoList& aVideoArray,
+                CMyVideosIndicator& aVideosIndicator );
     
         /**
          * 2nd phase constructor.
@@ -403,6 +407,12 @@
          */
         TBool iPreviousModifiedIndexOnScreen;
 
+        /**
+         * Reference to overlay indicator handler
+         * Not own.
+         */
+        CMyVideosIndicator& iVideosIndicator;
+
     };
 
 #endif // VCXHGMYVIDEOSVIDEODATAUPDATER_H
--- a/videocollection/hgmyvideos/src/vcxhgmyvideoscategorymodelhandler.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideoscategorymodelhandler.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -1062,6 +1062,7 @@
             {
             thumbnail = CGulIcon::NewL( aThumbnail.DetachBitmap() );
             CleanupStack::PushL( thumbnail );
+            SetLastWatchedIndicatorL();
             }
         else
             {
@@ -1077,7 +1078,6 @@
         
         listItem.SetIcon( thumbnail ); // Takes ownership
         CleanupStack::Pop( thumbnail );
-        SetLastWatchedIndicatorL();
         iScroller.RefreshScreen( lastWatchedIndex );
         }
     }
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 47 %
+// Version : %version: 48 %
 
 // INCLUDE FILES
 #include <bldvariant.hrh>
@@ -490,7 +490,7 @@
                 VideoListL()->HandleMarkCommandL( EVcxHgMyVideosCmdUnmarkAll );
                 ActivateCategoryListL();
                 }
-            else
+            else if ( iModel->AppState() == CVcxHgMyVideosModel::EVcxMyVideosAppStateCategoryIdle )
                 {
                 AppUi()->HandleCommandL( aCommand );
                 }
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosvideodataupdater.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosvideodataupdater.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -33,6 +33,7 @@
 #include <gulicon.h>
 
 #include "IptvDebug.h"
+#include <myvideosindicator.h>
 #include <vcxmyvideosdefs.h>
 #include "vcxhgmyvideosmodel.h"
 #include "vcxhgmyvideosmainview.h"
@@ -67,12 +68,14 @@
 CVcxHgMyVideosVideoDataUpdater* CVcxHgMyVideosVideoDataUpdater::NewL(
         CVcxHgMyVideosModel& aModel,
         CHgScroller& aScroller,
-        CVcxHgMyVideosVideoList& aVideoArray )
+        CVcxHgMyVideosVideoList& aVideoArray,
+        CMyVideosIndicator& aVideosIndicator )
     {
     CVcxHgMyVideosVideoDataUpdater* self = 
         CVcxHgMyVideosVideoDataUpdater::NewLC( aModel,
                                                aScroller,
-                                               aVideoArray );
+                                               aVideoArray,
+                                               aVideosIndicator );
     CleanupStack::Pop( self );
     return self;
     }
@@ -84,12 +87,14 @@
 CVcxHgMyVideosVideoDataUpdater* CVcxHgMyVideosVideoDataUpdater::NewLC(
         CVcxHgMyVideosModel& aModel,
         CHgScroller& aScroller,
-        CVcxHgMyVideosVideoList& aVideoArray )
+        CVcxHgMyVideosVideoList& aVideoArray,
+        CMyVideosIndicator& aVideosIndicator)
     {
     CVcxHgMyVideosVideoDataUpdater* self = 
         new (ELeave) CVcxHgMyVideosVideoDataUpdater( aModel,
                                                      aScroller,
-                                                     aVideoArray );
+                                                     aVideoArray,
+                                                     aVideosIndicator );
     CleanupStack::PushL( self );
     self->ConstructL();
     return self;
@@ -102,11 +107,13 @@
 CVcxHgMyVideosVideoDataUpdater::CVcxHgMyVideosVideoDataUpdater(
         CVcxHgMyVideosModel& aModel,
         CHgScroller& aScroller,
-        CVcxHgMyVideosVideoList& aVideoArray )
+        CVcxHgMyVideosVideoList& aVideoArray,
+        CMyVideosIndicator& aVideosIndicator )
   : CActive( EPriorityStandard ),
     iModel( aModel ),
     iScroller( aScroller ),
     iVideoArray( aVideoArray ),
+    iVideosIndicator( aVideosIndicator ),
     iPaused( EFalse )
     {
     CActiveScheduler::Add( this );
@@ -396,6 +403,8 @@
 //
 void CVcxHgMyVideosVideoDataUpdater::UpdateVideoDataToUiL( CVcxHgMyVideosVideoData& aVideoData )
     {
+    IPTVLOGSTRING_LOW_LEVEL("CVcxHgMyVideosVideoDataUpdater::UpdateVideoDataToUiL() ENTER" );
+
     TInt index = iVideoArray.IndexByMPXItemId( aVideoData.MPXItemId() );
     
     if ( index >= 0 && index < iScroller.ItemCount() )
@@ -406,7 +415,18 @@
         if ( aVideoData.Thumbnail() )
             {
             CGulIcon* thumbnail = CGulIcon::NewL( aVideoData.Thumbnail( ETrue ) );
-            listItem.SetIcon( thumbnail ); 
+            listItem.SetIcon( thumbnail );
+            CMPXMedia* media = iVideoArray.MPXMediaByMPXItemId( aVideoData.MPXItemId() );
+            if ( iVideosIndicator.IsIndicatorShown( *media ) )
+                {
+                IPTVLOGSTRING_LOW_LEVEL("CVcxHgMyVideosVideoDataUpdater::UpdateVideoDataToUiL() has icon, has indicator" );
+                listItem.SetFlags( CHgItem::EHgItemFlagsIconOverlayIndicator );
+                }
+            else
+                {
+                IPTVLOGSTRING_LOW_LEVEL("CVcxHgMyVideosVideoDataUpdater::UpdateVideoDataToUiL() has icon, no indicator" );
+                listItem.ClearFlags( CHgItem::EHgItemFlagsIconOverlayIndicator );
+                }
             }
         
         if ( drmUpdate )
@@ -464,6 +484,7 @@
             RefreshScreen();
             }
         }
+    IPTVLOGSTRING_LOW_LEVEL("CVcxHgMyVideosVideoDataUpdater::UpdateVideoDataToUiL() RETURN" );
     }
 
 // -----------------------------------------------------------------------------
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -703,6 +703,13 @@
             TBool showPlay = ( !videosMarked && ( highlight >= 0 ) && ( count > 0 ) );
             aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdPlay, ! showPlay );
             }
+        else
+            {
+            if ( IsMarking() )
+                {
+                aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdPlay, ETrue );
+                }
+            }
 
         if ( count > 0 )
             {
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosvideomodelhandler.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosvideomodelhandler.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -125,11 +125,13 @@
     {
     iVideoArray = CVcxHgMyVideosVideoList::NewL();
 
+    iVideoIndicator = CMyVideosIndicator::NewL();
+
     iDataUpdater = CVcxHgMyVideosVideoDataUpdater::NewL( iModel,
                                                          iScroller,                                                        
-                                                         *iVideoArray );
+                                                         *iVideoArray,
+                                                         *iVideoIndicator );
 
-    iVideoIndicator = CMyVideosIndicator::NewL();
     }
 
 // -----------------------------------------------------------------------------
@@ -791,6 +793,8 @@
 // 
 void CVcxHgMyVideosVideoModelHandler::UpdateVideoListItemL( TInt aListIndex )
     {
+    IPTVLOGSTRING2_LOW_LEVEL( "CVcxHgMyVideosVideoModelHandler::UpdateVideoListItemL() ENTER list index = %d", aListIndex );
+
     if ( aListIndex >= 0 && aListIndex < iScroller.ItemCount() )
         {
         TVcxHgMyVideosIndicatorHelper indicatorHelper;
@@ -856,7 +860,7 @@
                 {
                 item.SetFlags( CHgItem::EHgItemFlagMarked );
                 }
-            if ( VideoIndicator().IsIndicatorShown( *media ) )
+            if ( item.Icon() && VideoIndicator().IsIndicatorShown( *media ) )
                 {
                 item.SetFlags( CHgItem::EHgItemFlagsIconOverlayIndicator );
                 }
@@ -867,6 +871,8 @@
                 }    
             }
         }
+
+    IPTVLOGSTRING_LOW_LEVEL( "CVcxHgMyVideosVideoModelHandler::UpdateVideoListItemL() RETURN" );
     }
 
 // -----------------------------------------------------------------------------
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/custom/prerun_custom.xml	Mon Jun 21 15:43:03 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/custom/prerun_custom.xml	Thu Jul 15 18:41:27 2010 +0300
@@ -51,12 +51,4 @@
     	<params>
         <param dir="c:\logs\testframework\Testserver"/>
     	</params>
-</step>
-<step name="Install IAP file" harness="STIF" enabled="true" passrate="100" significant="false">
-       <command>install</command>
-       <reboot target-alias="*" when="after" />
-       <params>
-       <param src="cccccc00.cre"/>
-       <param dst="c:\private\10202be9\persists\cccccc00.cre"/>
-       </params>
 </step>
\ No newline at end of file
--- a/videoplayback/inc/mpxvideobaseplaybackview.h	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/inc/mpxvideobaseplaybackview.h	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 24 %
+// Version : %version: 25 %
 
 
 // This file defines the API for VideoBasePlaybackView.dll
@@ -291,6 +291,8 @@
 
         virtual void HandlePdlReloadComplete();
 
+        virtual void ResetPdlUserInputs();
+
     private:
 
         /**
--- a/videoplayback/inc/mpxvideopdlplaybackview.h	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/inc/mpxvideopdlplaybackview.h	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 8 %
+// Version : %version: 9 %
 
 
 // This file defines the API for VideoPlaybackView.dll
@@ -79,6 +79,8 @@
 
         void HandlePdlReloadComplete();
 
+        void ResetPdlUserInputs();
+
     private:
 
         CMPXVideoPdlPlaybackView();
--- a/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 45 %
+// Version : %version: 46 %
 
 
 //
@@ -1638,6 +1638,14 @@
     {
         IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying, EFalse );
     }
+    else
+    {
+        // As the custom play command could not resume the playback. Send a pause event to 
+        // the view though the MPX FW to get the view state in sync playback plugin. 
+        iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPPaused,
+                                                              0,
+                                                              KErrNone );
+    }
 }
 
 // -------------------------------------------------------------------------------------------------
--- a/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 82 %
+// Version : %version: 83 %
 
 
 //  Include Files
@@ -2037,7 +2037,7 @@
 
     if ( err == KErrNone )
     {
-        DRM::CDrmUiHandling* drmUiHandling = DRM::CDrmUiHandling::NewL( iCoeEnv );
+        DRM::CDrmUiHandling* drmUiHandling = DRM::CDrmUiHandling::NewL();
         CleanupStack::PushL( drmUiHandling );
 
         if ( openError == KErrNone )
@@ -2073,6 +2073,11 @@
     }
 
     CleanupStack::PopAndDestroy();  // fileHandle
+
+    //
+    //  User inputs should not be blocked when user close DRM details view
+    //
+    ResetPdlUserInputs();
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -2297,4 +2302,13 @@
     MPX_DEBUG(_L("CMPXVideoBasePlaybackView::HandlePdlReloadComplete()"));
 }
 
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoBasePlaybackView::ResetPdlUserInputs()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoBasePlaybackView::ResetPdlUserInputs()
+{
+    MPX_DEBUG(_L("CMPXVideoBasePlaybackView::ResetPdlUserInputs()"));
+}
+
 // EOF
--- a/videoplayback/videoplaybackviews/src/mpxvideopdlplaybackview.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/videoplaybackviews/src/mpxvideopdlplaybackview.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 27 %
+// Version : %version: 28 %
 
 
 //  Include Files
@@ -493,6 +493,17 @@
     //
     //  User inputs should not be blocked since the new PDL command is complete
     //
+    ResetPdlUserInputs();
+}
+
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoPdlPlaybackView::ResetPdlUserInputs()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoPdlPlaybackView::ResetPdlUserInputs()
+{
+    MPX_ENTER_EXIT(_L("CMPXVideoPdlPlaybackView::ResetPdlUserInputs()"));
+
     iUserInputsBlocked = EFalse;
     iContainer->UserInputHandler()->BlockPdlUserInputs( iUserInputsBlocked );
 }
--- a/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Thu Jul 15 18:41:27 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 14 %
+// Version : %version: 15 %
 
 
 #include <sysutil.h>
@@ -239,10 +239,13 @@
 
         //
         //  if can't find out match aspect ratio in dat file,
-        //  choose the scaling type through the rule
-        //      videoAspectRatio - aDisplayAspectRatio > 0.1 ==> zoom
-        //      videoAspectRatio - aDisplayAspectRatio < 0.1 ==> stretch
-        //      videoAspectRatio = aDisplayAspectRatio ==> natural
+        //  choose the scaling type through the rule        
+        //      aspectRatioDiff =  videoAspectRatio - aDisplayAspectRatio
+        //      aspectRatioDiff ==  0        ==> natural
+        //      aspectRatioDiff > 0.1        ==> zoom
+        //      aspectRatioDiff < - 0.3      ==> natural
+        //      aspectRatioDiff >= - 0.3 and <= 0.1   ==> stretch
+
         //
         if ( i == cnt )
         {
@@ -250,7 +253,8 @@
             {
                 scalingType = EMMFZoom;
             }
-            else if ( videoAspectRatio != displayAspectRatio )
+            else if ( ( videoAspectRatio != displayAspectRatio ) &&
+                      ( videoAspectRatio - displayAspectRatio > (- 0.3) ) )
             {
                 scalingType = EMMFStretch;
             }
--- a/videoplayerapp/mpxvideoplayer/sis/VideoPlayer.pkg	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayerapp/mpxvideoplayer/sis/VideoPlayer.pkg	Thu Jul 15 18:41:27 2010 +0300
@@ -20,7 +20,7 @@
 &EN
 
 ; Header
-#{"Video Player"},(0x200159B2),9,20,23, TYPE=SA, RU
+#{"Video Player"},(0x200159B2),9,20,24, TYPE=SA, RU
 
 ; Supports Series 60 v5.0
 ;[0x1028315F], 0, 0, 0, {"Series60ProductID"}
--- a/videoplayerapp/mpxvideoplayer/sis/VideoPlayer_stub.pkg	Mon Jun 21 15:43:03 2010 +0300
+++ b/videoplayerapp/mpxvideoplayer/sis/VideoPlayer_stub.pkg	Thu Jul 15 18:41:27 2010 +0300
@@ -20,7 +20,7 @@
 &EN
 
 ;Header
-#{"Video Player"},(0x200159B2),9,20,23, TYPE=SA
+#{"Video Player"},(0x200159B2),9,20,24, TYPE=SA
 
 ;Localised Vendor name
 %{"Nokia"}