FCL/sf/app/photos: comparison photosgallery/viewframework/medialists/src/glxcachemanager.cpp

equal deleted inserted replaced

-:f7f0874bfe7d
+:6b87b143d312
 iMaintainCacheCallback = new ( ELeave )
 	    CAsyncCallBack( TCallBack( MaintainCacheL, this ), CActive::EPriorityStandard );
 #ifdef USE_S60_TNM
 iTnEngine = CThumbnailManager::NewL( *this);
-iTnEngine->SetDisplayModeL( EColor64K );
+iTnEngine->SetDisplayModeL( EColor16MU );
 #endif
 }
 // -----------------------------------------------------------------------------
 // Destructor
 					    {
 					    priority = attrSpecs->ValueTObjectL<TBool>(priorityAttrib);
 					    }
 						TGlxIdSpaceId spaceId = list->IdSpaceId(iRequestedItemIndexes[0]);
-#ifdef MEDIA_ID_BASED_TN_FETCH_ENABLED
-	               	 	GLX_DEBUG2("CGlxCacheManager::MaintainCacheL() requesting TN attribute (Medialist) itemId %d", itemId.Value());
-						if (item.Uri().Find(KFileIdentifier) != KErrNotFound ||
-						    item.Uri().Length() && itemId.Value())
-#else
 	               	 	GLX_DEBUG1("CGlxCacheManager::MaintainCacheL() requesting TN attribute (Medialist) Uri");
 						if (item.Uri().Find(KFileIdentifier) != KErrNotFound)
-#endif
 							{
 #ifdef _DEBUG
 							iStartTime.HomeTime(); // Get home time
 #endif
 						    if (tnSize.iWidth < KMaxGridThumbnailWidth)
 parse.Path().Length() > KPrivateFolder().Length() &&
 parse.Path().Left( KPrivateFolder().Length() ).CompareF( KPrivateFolder ) == 0 )
 {
 CreateImageViewerInstanceL();
 GLX_DEBUG1("KGlxCollectionPluginImageViewerImplementationUid - Fetch (Private) TN!");
-if ( &(iImageViewerInstance->ImageFileHandle()) != NULL )
+if ( &(iImageViewerInstance->ImageFileHandle()) )
 {
 CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(iImageViewerInstance->ImageFileHandle());
 iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
 CleanupStack::PopAndDestroy(source);
 }
 CleanupStack::PopAndDestroy(source);
 }
 }
 else
 {
-#ifdef MEDIA_ID_BASED_TN_FETCH_ENABLED
+CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(item.Uri(), 0);
-						    iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(itemId.Value()), spaceId, tnSize, itemId));
+iThumbnailRequestIds.AppendL(TLoadingTN(
-#else
+iTnEngine->GetThumbnailL(*source),
-						    CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(item.Uri(), 0);
+spaceId, tnSize, itemId));
-						    iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
+CleanupStack::PopAndDestroy(source);
-						    CleanupStack::PopAndDestroy(source);
-#endif
 }
 		                    iThumbnailId = itemId;
 							}
 						else
 							{
 }
 else
 {
 // private path
 RFile64& imageHandle = iImageViewerInstance->ImageFileHandle();
-if ( &imageHandle != NULL )
+if ( &imageHandle )
 {
 fileName.Append(imageHandle.FullName(fileName));
 }
 else
 {
 }
 }
 else
 {
 // user data path
-if(  iImageViewerInstance->ImageUri() != NULL  )
+if ( iImageViewerInstance->ImageUri() )
 {
 fileName.Append(iImageViewerInstance->ImageUri()->Des());
 RFs fs;
 CleanupClosePushL(fs);
 TInt err = fs.Connect();
 void CGlxCacheManager::ThumbnailPreviewReady(MThumbnailData& aThumbnail,
 TThumbnailRequestId aId)
 {
 TRACER("CGlxCacheManager::ThumbnailPreviewReady");
 TInt error = KErrNotSupported;
-if (aThumbnail.Bitmap() != NULL)
+if ( aThumbnail.Bitmap() )
 {
 		 GLX_DEBUG1("CGlxCacheManager::ThumbnailPreviewReady preview aval");
 error = KErrNone;
 }
 ThumbnailReadyL(error, aThumbnail, aId, EFalse);
 // -----------------------------------------------------------------------------
 //
 void CGlxCacheManager::CreateImageViewerInstanceL()
 {
 TRACER("CGlxCacheManager::CreateImageViewerInstanceL");
-if ( iImageViewerInstance == NULL )
+iImageViewerInstance = CGlxImageViewerManager::InstanceL();
-{
-iImageViewerInstance = CGlxImageViewerManager::InstanceL();
-}
 __ASSERT_ALWAYS(iImageViewerInstance, Panic(EGlxPanicNullPointer));
 }
 // -----------------------------------------------------------------------------
 // DeleteImageViewerInstance
 // -----------------------------------------------------------------------------
 //
 void CGlxCacheManager::DeleteImageViewerInstance()
 {
 TRACER("CGlxCacheManager::DeleteImageViewerInstance");
-if ( iImageViewerInstance != NULL )
+if ( iImageViewerInstance )
 {
 iImageViewerInstance->DeleteInstance();
 }
 }

branch	RCL_3
changeset 9	6b87b143d312
parent 4	57d388cc48c1
child 13	71da52165949