MCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/commoncontainer/src/mpxcommoncontainerhgimp.cpp

equal deleted inserted replaced

-:c54d95799c80
+:a1247965635c
 // -----------------------------------------------------------------------------
 // Draws a list box item
 // -----------------------------------------------------------------------------
 //
-void CMPXCommonContainerHgImp::DrawLbxItem( TInt aIndex )
+void CMPXCommonContainerHgImp::DrawLbxItemL( TInt aIndex )
 {
-MPX_DEBUG2( "CMPXCommonContainerHgImp::DrawLbxItem (aIndex=%d)", aIndex );
+MPX_DEBUG2( "CMPXCommonContainerHgImp::DrawLbxItemL (aIndex=%d)", aIndex );
 if ( iListWidget && iBottomIndex > 0 )
 {
 CHgItem* item = &iListWidget->ItemL(aIndex);
 SetDetailIndicatorL(item, aIndex);
 iListWidget->RefreshScreen(aIndex);
 	    iListWidget->RefreshScreen(0);
 	    }
 	}
 	    }
 SetDefaultIconL();
-	    SetScrollbarType();
+	    SetScrollbarTypeL();
 	}
 }
 // -----------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Custom handling of menu pane for markable lists
 // ---------------------------------------------------------------------------
 //
-void CMPXCommonContainerHgImp::HandleMarkableListDynInitMenuPane(
+void CMPXCommonContainerHgImp::HandleMarkableListDynInitMenuPaneL(
 TInt aResourceId,
 CEikMenuPane* aMenuPane )
 {
 MPX_FUNC( "CMPXCommonContainerHgImp::HandleMarkableListDynInitMenuPane" );
 }
 else
 {
 	iListWidget->InitScreenL(clientRect);
 }
-SetScrollbarType();
+SetScrollbarTypeL();
 }
 );
 }
 for ( TInt i = aBufferStart; i <= aBufferEnd; i++ )
 {
 iThumbnailReqMap[ i ] = EFalse;
 }
+MPX_TRAPD( err,
-if ( aDirection == EHgBufferReset  || aDirection == EHgBufferScrollDown || aDirection == EHgBufferScrollUp)
+if ( aDirection == EHgBufferReset || aDirection == EHgBufferScrollDown || aDirection == EHgBufferScrollUp)
 {
 // For index range in visible-area
 ProvideDataIntersectL(aBufferStart, aBufferEnd);
 // For index range elsewhere
 ProvideDataDifferenceL(aBufferStart, aBufferEnd);
 }
 else
 {
 ProvideDataL(aBufferStart, aBufferEnd);
-}
+} );
-	//RefreshL(aBufferStart);
+if( err != KErrNone )
+	{
+MPX_DEBUG2( "CMPXCommonContainerHgImp::Request leave err = %d", err );
+	}
+	//Refresh(aBufferStart);
 // When in main collection view, list can be refresh
 // without waiting on thumbnails since this list doesn't
 // require thumbnails.
 if ( iContext == EContextGroupCollection ||
 iContext == EContextGroupPlaylist ||
 		 index = *ret;
 		 }
 if ( aError == KErrNone && ret )
 {
+CMPXMedia* currentMedia( NULL );
 const CMPXMediaArray& mediaArray = iListBoxArray->MediaArray();
-CMPXMedia* currentMedia( mediaArray.AtL( index ) );
+MPX_TRAPD( err, currentMedia = mediaArray.AtL( index ) );
+if( err != KErrNone )
+	{
+__ASSERT_DEBUG( EFalse, User::Panic( _L( "CMPXCommonContainerHgImp::ThumbnailReady()" ), err ) );
+return;
+	}
 if ( currentMedia->IsSupported( KMPXMediaGeneralId ) )
 {
 CFbsBitmap* bmap = aThumbnail.DetachBitmap();
 if ( bmap )
 {
-CGulIcon* icon = CGulIcon::NewL(bmap, NULL);
+					CGulIcon* icon( NULL );
+					MPX_TRAP( err,  icon = CGulIcon::NewL( bmap, NULL ) );
+					if( err != KErrNone )
+						{
+						__ASSERT_DEBUG( EFalse, User::Panic( _L( "CMPXCommonContainerHgImp::ThumbnailReady()" ), err ) );
+						return;
+						}
 if ( iScrollerWithTitle && !iTitleSet )
 {
 iScrollerWithTitle->TitleItem().SetIcon(icon);
 iScrollerWithTitle->MakeVisible(ETrue);
 iListWidget->MakeVisible( ETrue );
 iScrollerWithTitle->DrawNow();
 iTitleSet = ETrue;
 }
 else
 {
-iListWidget->ItemL(index).SetIcon(icon);
+MPX_TRAPD( err, iListWidget->ItemL(index).SetIcon(icon); )
+if( err != KErrNone )
+	{
+MPX_DEBUG2( "CMPXCommonContainerHgImp::ThumbnailReady--iListWidget->ItemL(index).SetIcon(icon) leave err%d", err);
+	}
 iThumbnailReqMap[index] = ETrue;
-RefreshL(index);
+Refresh( index );
 }
 }
 				}
 			iThumbnailReqHashMap.Remove( (TInt)aId);
 				iRequestQueue.Remove(*iAlbumArtRequest);
 				--iQueueCounter;
 				TInt index = iAlbumArtRequest->iIndex;
 				const TDesC&   albumArtUri = *(iAlbumArtRequest->iAlbumArtUri);
+				TRAP_IGNORE
+				(
 				CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC( albumArtUri, KMPXAlbumMimeType );
 				delete iAlbumArtRequest->iAlbumArtUri;
 				delete iAlbumArtRequest;
 				// Using negative index as priority will ensure that thumbnail requests
 				// are processed in the order they were requested.
 				TInt ret = NULL;
 				TInt reqId;
-				TRAPD(err, reqId = (TInt) iThumbnailManager->GetThumbnailL( *source, (TAny*)ret, -index ));
+				MPX_TRAP(err, reqId = (TInt) iThumbnailManager->GetThumbnailL( *source, (TAny*)ret, -index ));
 				if ( err == KErrNone)
 					{
 					iThumbnailReqHashMap.InsertL( reqId, index );
 					}
 				CleanupStack::PopAndDestroy( source );
+				);
 				}
 			 else
 				{
 				//request queue is empty, decrease outstanding requests count
 			iRequestCount--;
 			 }
 		else
 			{
 			return;
 			}
+		TRAP_IGNORE
+		(
 		//no albumart supported
 		SetDefaultIconL(index);
 if ( iScrollerWithTitle && !iTitleSet )
 {
 iScrollerWithTitle->MakeVisible(ETrue);
 iTitleSet = ETrue;
 }
 else
 {
 iThumbnailReqMap[index] = ETrue;
-RefreshL(index);
+Refresh(index);
 }
-	}
+);
+}
 }
 // ---------------------------------------------------------------------------
 // Refresh for item without thumbnail
 iScrollerWithTitle->DrawNow();
 iTitleSet = ETrue;
 }
 else
 {
-RefreshL(aIndex);
+Refresh(aIndex);
 }
 }
 // ---------------------------------------------------------------------------
 // Refresh list as needed.
 // This function tries to determine the best time to refresh the screen as to
 // avoid too many redraws. In some cases, multiple refresh is unavoidable.
 // ---------------------------------------------------------------------------
 //
-void CMPXCommonContainerHgImp::RefreshL(TInt aIndex)
+void CMPXCommonContainerHgImp::Refresh(TInt aIndex)
 {
 MPX_FUNC( "CMPXCommonContainerHgImp::Refresh" );
 	TInt mediaCount = iListBoxArray->MediaArray().Count();
 // -----------------------------------------------------------------------------
 // CMPXCommonContainerHgImp::SetScrollbarType
 // -----------------------------------------------------------------------------
 //
-void CMPXCommonContainerHgImp::SetScrollbarType()
+void CMPXCommonContainerHgImp::SetScrollbarTypeL()
 {
 MPX_FUNC( "CMPXCommonContainerHgImp::SetScrollbarType" );
 if ( iContext == EContextGroupCollection ||
 iContext == EContextGroupPlaylist ||

branch	RCL_3
changeset 15	a1247965635c
parent 0	ff3acec5bc43
child 21	cb96c29156b2