FCL/sf/app/videoplayer: comparison videocollection/mpxmyvideoscollection/src/vcxmyvideosvideocache.cpp

equal deleted inserted replaced

-:dec420019252
+:4f111d64a341
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:    Video list cache. Contains cached data from MDS.*
+* Description:   Video list cache. Contains cached data from MDS.*
 */
 // INCLUDE FILES
 #include <mpxlog.h>
 TInt pos;
 if ( !FindVideoByMdsIdL( aMdsIds[j], pos ) )
 {
 MPX_DEBUG2("CVcxMyVideosVideoCache:: MDSID(%d) not found from cache, ok", aMdsIds[j]);
+//TODO: This doesnt work with new mds cmd queue. Cancel must be done if there is _any_ async req going on.
+//      Maybe the fetching could be changed to asynchronous...
 if ( iCollection.iMyVideosMdsDb->iVideoListFetchingIsOngoing )
 {
 // If list fetching is not canceled, CreateVideoObjectL will leave with KErrNotReady.
 MPX_DEBUG1("CVcxMyVideosVideoCache:: video list fetching is ongoing, canceling it to be able to fetch single items!");
 iCollection.iMyVideosMdsDb->Cancel();
 MPX_DEBUG2("CVcxMyVideosVideoCache:: aForce = %d", aForce );
 TVcxMyVideosSortingOrder sortingOrder = SortingOrderL();
-if ( iCollection.iMyVideosMdsDb->iVideoListFetchingIsOngoing
+if ( IsFetchingVideoList
 && sortingOrder == iLastSortingOrder && !aForce )
 {
 MPX_DEBUG1("CVcxMyVideosVideoCache:: iVideoList creation is already ongoing, skipping");
 return;
 }
 if ( iVideoListIsPartial || (sortingOrder != iLastSortingOrder) || aForce )
 {
 MPX_DEBUG1("CVcxMyVideosVideoCache:: iVideoList was partial or in wrong order or aForce was ETrue, recreating");
-if ( iCollection.iMyVideosMdsDb->iVideoListFetchingIsOngoing )
+if ( IsFetchingVideoList )
 {
 MPX_DEBUG1("CVcxMyVideosVideoCache:: video list fetching is ongoing, canceling it");
-iCollection.iMyVideosMdsDb->Cancel();
+iCollection.iMyVideosMdsDb->Cancel( CVcxMyVideosMdsDb::EGetVideoList );
+IsFetchingVideoList = EFalse;
 }
 ResetVideoListL();
 TBool ascending = ETrue;
 sortingOrder,
 ascending,
 EFalse /* brief list */,
 iVideoList /* use existing */ );
+IsFetchingVideoList = ETrue;
 iLastSortingOrder   = sortingOrder;
 iVideoListIsPartial = ETrue;
 }
 else
 {
 changed = ETrue;
 }
 }
-// 23
+// 22
 if ( aVideo.IsSupported( KMPXMediaVideoHeight ) )
 {
 TUint16 height = aVideo.ValueTObjectL<TUint16>( KMPXMediaVideoHeight );
 if ( height != videoInCache->ValueTObjectL<TUint16>( KMPXMediaVideoHeight ) )
 {
 //
 void CVcxMyVideosVideoCache::ResetVideoListL()
 {
 MPX_FUNC("CVcxMyVideosVideoCache::ResetVideoListL");
-iCollection.iMyVideosMdsDb->Cancel();
+//TODO: when should we cancel...
+//iCollection.iMyVideosMdsDb->Cancel();
 CMPXMediaArray* mediaArray =
 iVideoList->ValueCObjectL<CMPXMediaArray>( KMPXMediaArrayContents );
 CleanupStack::PushL( mediaArray ); // 1->

changeset 30	4f111d64a341
parent 1	6711b85517b7
child 34	bbb98528c666