diff -r 3eb824b18d67 -r 375929f879c2 videocollection/hgmyvideos/src/vcxhgmyvideoscollectionclient.cpp --- a/videocollection/hgmyvideos/src/vcxhgmyvideoscollectionclient.cpp Wed Sep 15 12:15:24 2010 +0300 +++ b/videocollection/hgmyvideos/src/vcxhgmyvideoscollectionclient.cpp Wed Oct 13 14:34:36 2010 +0300 @@ -47,7 +47,6 @@ const TInt KVcxHgEventLevelCategory = 2; const TInt KVcxHgEventLevelVideo = 3; -const TInt KVcxMpxLevelRoot = 1; const TInt KVcxMpxLevelCategories = 2; const TInt KVcxMpxLevelVideos = 3; @@ -221,20 +220,9 @@ } else if ( iCollectionLevel == KVcxMpxLevelVideos ) { - TInt currentIndex = CategoryIndexL(); - - if ( aIndex == currentIndex ) - { - // OpenL() will return a list if there has been any changes. - // No reply if list is same as with previous OpenL(). - iCollectionUtility->Collection().OpenL(); - } - else - { - iCollectionUtility->Collection().BackL( ); - iCollectionUtility->Collection().OpenL( aIndex ); - iCollectionLevel = KErrNotFound; - } + // OpenL() will return a list if there has been any changes. + // No reply if list is same as with previous OpenL(). + iCollectionUtility->Collection().OpenL(); } else { @@ -393,30 +381,16 @@ IPTVLOGSTRING2_LOW_LEVEL( "CVcxHgMyVideosCollectionClient::PlayVideoL: Play video at collection index %d", aMpxItemId.iId1 ); - CMPXCollectionPath* collectionPath = iCollectionUtility->Collection().PathL(); - CleanupStack::PushL( collectionPath ); + CMPXCollectionPath* path = CMPXCollectionPath::NewL(); + CleanupStack::PushL(path); - if ( collectionPath->Levels() == KVcxMpxLevelVideos ) - { - collectionPath->DeselectAll(); - collectionPath->SelectL( aMpxItemId ); - iCollectionUtility->Collection().OpenL( *collectionPath ); - } - else - { - CMPXCollectionPath* customPath = CMPXCollectionPath::NewL(); - CleanupStack::PushL(customPath); - - customPath->AppendL( KVcxUidMyVideosMpxCollection ); - customPath->AppendL( KVcxMvcCategoryIdAll ); - customPath->AppendL( aMpxItemId ); - customPath->SelectL( aMpxItemId ); - - iCollectionUtility->Collection().OpenL( *customPath ); - CleanupStack::PopAndDestroy( customPath ); - } - - CleanupStack::PopAndDestroy( collectionPath ); + path->AppendL( KVcxUidMyVideosMpxCollection ); + path->AppendL( KVcxMvcCategoryIdAll ); + path->AppendL( aMpxItemId ); + path->SelectL( aMpxItemId ); + + iCollectionUtility->Collection().OpenL( *path ); + CleanupStack::PopAndDestroy(path); } // ----------------------------------------------------------------------------- @@ -1166,24 +1140,6 @@ } } -// ----------------------------------------------------------------------------- -// CVcxHgMyVideosCollectionClient::CategoryIndexL() -// ----------------------------------------------------------------------------- -// -TInt CVcxHgMyVideosCollectionClient::CategoryIndexL() - { - CMPXCollectionPath* path = iCollectionUtility->Collection().PathL(); - CleanupStack::PushL( path ); - TInt index ( -1 ); - if ( path->Levels() > KVcxMpxLevelCategories ) - { - index = path->Index( KVcxMpxLevelRoot ); - } - CleanupStack::PopAndDestroy( path ); - - return index; - } - #if defined(_DEBUG) && IPTV_LOGGING_METHOD != 0 // ----------------------------------------------------------------------------- // CVcxHgMyVideosCollectionClient::DebugPrintVideoListL()