equal
deleted
inserted
replaced
510 // only IDs which are actually added to cache. aNonVideoIds will contain IDs |
510 // only IDs which are actually added to cache. aNonVideoIds will contain IDs |
511 // which were not video objects. |
511 // which were not video objects. |
512 // ---------------------------------------------------------------------------- |
512 // ---------------------------------------------------------------------------- |
513 // |
513 // |
514 void CVcxMyVideosVideoCache::AddVideosFromMdsL( RArray<TUint32>& aMdsIds, |
514 void CVcxMyVideosVideoCache::AddVideosFromMdsL( RArray<TUint32>& aMdsIds, |
515 TBool& aListFetchingWasCanceled, RArray<TUint32>* aNonVideoIds ) |
515 TBool& aListFetchingWasCanceled, RArray<TUint32>* aNonVideoIds, TBool aUpdateCategories ) |
516 { |
516 { |
517 MPX_FUNC("CVcxMyVideosVideoCache::AddVideosFromMdsL"); |
517 MPX_FUNC("CVcxMyVideosVideoCache::AddVideosFromMdsL"); |
518 |
518 |
519 TVcxMyVideosSortingOrder sortingOrder = SortingOrderL(); |
519 TVcxMyVideosSortingOrder sortingOrder = SortingOrderL(); |
520 |
520 |
545 |
545 |
546 if ( videoToCache ) |
546 if ( videoToCache ) |
547 { |
547 { |
548 CleanupStack::PushL( videoToCache ); // 1-> |
548 CleanupStack::PushL( videoToCache ); // 1-> |
549 |
549 |
550 TInt err = AddL( videoToCache, sortingOrder ); |
550 TInt err = AddL( videoToCache, sortingOrder, aUpdateCategories ); |
551 |
551 |
552 if ( err == KErrNone ) |
552 if ( err == KErrNone ) |
553 { |
553 { |
554 CleanupStack::Pop( videoToCache ); // <-1 |
554 CleanupStack::Pop( videoToCache ); // <-1 |
555 } |
555 } |
582 // ---------------------------------------------------------------------------- |
582 // ---------------------------------------------------------------------------- |
583 // CVcxMyVideosVideoCache::AddL() |
583 // CVcxMyVideosVideoCache::AddL() |
584 // This is for single adds, video list fetching does not call this. |
584 // This is for single adds, video list fetching does not call this. |
585 // ---------------------------------------------------------------------------- |
585 // ---------------------------------------------------------------------------- |
586 // |
586 // |
587 TInt CVcxMyVideosVideoCache::AddL( CMPXMedia* aVideo, TVcxMyVideosSortingOrder aSortingOrder ) |
587 TInt CVcxMyVideosVideoCache::AddL( CMPXMedia* aVideo, TVcxMyVideosSortingOrder aSortingOrder, |
|
588 TBool aUpdateCategories ) |
588 { |
589 { |
589 MPX_FUNC("CVcxMyVideosVideoCache::AddL"); |
590 MPX_FUNC("CVcxMyVideosVideoCache::AddL"); |
590 |
591 |
591 if ( !IsComplete() ) |
592 if ( !IsComplete() ) |
592 { |
593 { |
594 return AddToPartialListL( aVideo ); |
595 return AddToPartialListL( aVideo ); |
595 } |
596 } |
596 else |
597 else |
597 { |
598 { |
598 MPX_DEBUG1("CVcxMyVideosVideoCache:: iVideoList is complete, adding to iVideoList"); |
599 MPX_DEBUG1("CVcxMyVideosVideoCache:: iVideoList is complete, adding to iVideoList"); |
599 return AddToCorrectPlaceL( *aVideo, aSortingOrder ); |
600 return AddToCorrectPlaceL( *aVideo, aSortingOrder, aUpdateCategories ); |
600 } |
601 } |
601 } |
602 } |
602 |
603 |
603 // ---------------------------------------------------------------------------- |
604 // ---------------------------------------------------------------------------- |
604 // CVcxMyVideosVideoCache::CheckForPartialVideoListItemsL() |
605 // CVcxMyVideosVideoCache::CheckForPartialVideoListItemsL() |
943 iCollection.CategoriesL().NewVideoFlagChangedL( |
944 iCollection.CategoriesL().NewVideoFlagChangedL( |
944 oldFlags, newFlags, |
945 oldFlags, newFlags, |
945 origin, |
946 origin, |
946 modified ); |
947 modified ); |
947 |
948 |
948 #ifndef VIDEO_COLLECTION_PLUGIN_TB92 |
949 #ifdef VCX_ALBUMS |
949 iCollection.AlbumsL().NewVideoFlagChangedL( |
950 iCollection.AlbumsL().NewVideoFlagChangedL( |
950 TVcxMyVideosCollectionUtil::IdL( *videoInCache ).iId1 ); |
951 TVcxMyVideosCollectionUtil::IdL( *videoInCache ).iId1 ); |
951 #endif |
952 #endif |
952 } |
953 } |
953 changed = ETrue; |
954 changed = ETrue; |
1188 |
1189 |
1189 TBool modified = EFalse; |
1190 TBool modified = EFalse; |
1190 iCollection.CategoriesL().UpdateCategoryNewVideoNameAndDateL( |
1191 iCollection.CategoriesL().UpdateCategoryNewVideoNameAndDateL( |
1191 *aVideoInCache, modified ); |
1192 *aVideoInCache, modified ); |
1192 |
1193 |
1193 #ifndef VIDEO_COLLECTION_PLUGIN_TB92 |
1194 #ifdef VCX_ALBUMS |
1194 iCollection.AlbumsL().VideoTitleChangedL( |
1195 iCollection.AlbumsL().VideoTitleChangedL( |
1195 TVcxMyVideosCollectionUtil::IdL( *aVideoInCache ).iId1 ); |
1196 TVcxMyVideosCollectionUtil::IdL( *aVideoInCache ).iId1 ); |
1196 #endif |
1197 #endif |
1197 |
1198 |
1198 TVcxMyVideosSortingOrder sortingOrder = SortingOrderL(); |
1199 TVcxMyVideosSortingOrder sortingOrder = SortingOrderL(); |
1499 #endif |
1500 #endif |
1500 |
1501 |
1501 if ( aUpdateCategories ) |
1502 if ( aUpdateCategories ) |
1502 { |
1503 { |
1503 iCollection.CategoriesL().VideoAddedL( aVideo ); |
1504 iCollection.CategoriesL().VideoAddedL( aVideo ); |
1504 #ifndef VIDEO_COLLECTION_PLUGIN_TB92 |
1505 #ifdef VCX_ALBUMS |
1505 iCollection.AlbumsL().VideoAddedOrRemovedFromCacheL( aVideo ); |
1506 iCollection.AlbumsL().VideoAddedOrRemovedFromCacheL( aVideo ); |
1506 #endif |
1507 #endif |
1507 } |
1508 } |
1508 |
1509 |
1509 return KErrNone; |
1510 return KErrNone; |
1559 |
1560 |
1560 if ( aUpdateCategories && |
1561 if ( aUpdateCategories && |
1561 pos != KErrNotFound /* no need to update if item is on iPartialVideoList*/ ) |
1562 pos != KErrNotFound /* no need to update if item is on iPartialVideoList*/ ) |
1562 { |
1563 { |
1563 iCollection.CategoriesL().VideoRemovedL( *video ); |
1564 iCollection.CategoriesL().VideoRemovedL( *video ); |
1564 #ifndef VIDEO_COLLECTION_PLUGIN_TB92 |
1565 #ifdef VCX_ALBUMS |
1565 iCollection.AlbumsL().VideoAddedOrRemovedFromCacheL( *video ); |
1566 iCollection.AlbumsL().VideoAddedOrRemovedFromCacheL( *video ); |
1566 #endif |
1567 #endif |
1567 } |
1568 } |
1568 |
1569 |
1569 if ( pos != KErrNotFound ) |
1570 if ( pos != KErrNotFound ) |