--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailrequestactive.cpp Wed Sep 15 12:32:44 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailrequestactive.cpp Wed Oct 13 14:53:56 2010 +0300
@@ -47,7 +47,6 @@
{
iTimer->Cancel();
}
-
delete iTimer;
iTimer = NULL;
@@ -164,14 +163,6 @@
TN_DEBUG2( "CThumbnailRequestActive::StartL() - file handle opened for %S", &iPath );
CleanupClosePushL( iFile );
-
- if ( iParams.iQualityPreference == CThumbnailManager::EOptimizeForQualityWithPreview )
- {
- // We may need the file handle later for the 2nd phase thumbnail
- iMyFileHandle.Close();
- User::LeaveIfError( iMyFileHandle.Duplicate( iFile ));
- }
-
iSession.RequestThumbnailL( iFile, iPath, iParamsPckg, iStatus );
CleanupStack::PopAndDestroy( &iFile );
}
@@ -206,14 +197,6 @@
TN_DEBUG2( "CThumbnailRequestActive::StartL() - file handle opened for %S", &iTargetUri );
CleanupClosePushL( iFile );
-
- if ( iParams.iQualityPreference == CThumbnailManager::EOptimizeForQualityWithPreview )
- {
- // We may need the file handle later for the 2nd phase thumbnail
- iMyFileHandle.Close();
- User::LeaveIfError( iMyFileHandle.Duplicate( iFile ));
- }
-
iSession.RequestThumbnailL( iFile, iTargetUri, iParamsPckg, iStatus );
CleanupStack::PopAndDestroy( &iFile );
break;
@@ -237,29 +220,6 @@
iSession.RenameThumbnails( iParamsPckg, iStatus );
break;
}
- case EReqSetThumbnailPath:
- {
- // open file handle
- iFile.Close();
- User::LeaveIfError( iFile.Open( iFs, iParams.iFileName, EFileShareReadersOrWriters ) );
-
- TN_DEBUG2( "CThumbnailRequestActive::StartL() - file handle opened for %S", &iParams.iFileName );
-
- CleanupClosePushL( iFile );
-
- if ( iParams.iQualityPreference == CThumbnailManager::EOptimizeForQualityWithPreview )
- {
- // We may need the file handle later for the 2nd phase thumbnail
- iMyFileHandle.Close();
- User::LeaveIfError( iMyFileHandle.Duplicate( iFile ));
- }
-
- iSession.RequestThumbnailL( iFile, iTargetUri, iParamsPckg, iStatus );
- CleanupStack::PopAndDestroy( &iFile );
-
- break;
- }
-
default:
{
break;
@@ -634,7 +594,7 @@
}
}
#endif
- TN_DEBUG3( "CThumbnaiRequestActive::HandleError() - iObserver.ThumbnailReady req=%d err=%d", iParams.iRequestId, iError );
+ TN_DEBUG2( "CThumbnaiRequestActive::HandleError() - iObserver.ThumbnailReady %d", iParams.iRequestId );
iObserver.ThumbnailReady( iError, *iCallbackThumbnail, iParams.iRequestId );
}
@@ -659,7 +619,7 @@
// ---------------------------------------------------------------------------
//
void CThumbnailRequestActive::GetThumbnailL( const RFile64& aFile, TThumbnailId aThumbnailId,
- const TDesC8& aMimeType, CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
+ CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
::TThumbnailQualityPreference aQualityPreference, const TSize& aSize, const
TDisplayMode aDisplayMode, const TInt aPriority, TAny* aClientData, TBool aGeneratePersistentSizesOnly,
const TDesC& aTargetUri, TThumbnailSize aThumbnailSize)
@@ -680,7 +640,6 @@
EThumbnailGeneratePersistentSizesOnly :
EThumbnailNoControlFlags);
iParams.iOriginalControlFlags = iParams.iControlFlags;
- iParams.iMimeType = TDataType( aMimeType );
iParams.iBitmapHandle = 0;
iParams.iSize = aSize;
iParams.iDisplayMode = aDisplayMode;
@@ -692,20 +651,10 @@
iParams.iThumbnailSize = aThumbnailSize;
iParams.iThumbnailId = aThumbnailId;
iParams.iOverwrite = EFalse;
- iParams.iImport = EFalse;
User::LeaveIfError( iFile.Duplicate( aFile ));
iTargetUri = aTargetUri;
-
- if (iParams.iFileName.Length() && IsVirtualUri(iParams.iFileName))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
}
@@ -715,8 +664,8 @@
// ---------------------------------------------------------------------------
//
void CThumbnailRequestActive::GetThumbnailL( TThumbnailId aThumbnailId,
- const TDesC& aPath, const TDesC8& aMimeType, CThumbnailManager::TThumbnailFlags aFlags,
- CThumbnailManager::TThumbnailQualityPreference aQualityPreference, const TSize& aSize, const
+ const TDesC& aPath, CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
+ ::TThumbnailQualityPreference aQualityPreference, const TSize& aSize, const
TDisplayMode aDisplayMode, const TInt aPriority, TAny* aClientData, TBool aGeneratePersistentSizesOnly,
const TDesC& aTargetUri, TThumbnailSize aThumbnailSize)
{
@@ -727,7 +676,6 @@
EThumbnailGeneratePersistentSizesOnly :
EThumbnailNoControlFlags);
iParams.iOriginalControlFlags = iParams.iControlFlags;
- iParams.iMimeType = TDataType( aMimeType );
iParams.iBitmapHandle = 0;
iParams.iSize = aSize;
iParams.iDisplayMode = aDisplayMode;
@@ -739,18 +687,8 @@
iParams.iThumbnailSize = aThumbnailSize;
iParams.iThumbnailId = aThumbnailId;
iParams.iOverwrite = EFalse;
- iParams.iImport = EFalse;
iTargetUri = aTargetUri;
-
- if (iPath.Length() && IsVirtualUri(iPath))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
}
@@ -760,7 +698,7 @@
// ---------------------------------------------------------------------------
//
void CThumbnailRequestActive::GetThumbnailL( const TDesC& aPath, TThumbnailId aThumbnailId,
- const TDesC8& aMimeType, CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
+ CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
::TThumbnailQualityPreference aQualityPreference, const TSize& aSize, const
TDisplayMode aDisplayMode, const TInt aPriority, TAny* aClientData, TBool aGeneratePersistentSizesOnly,
const TDesC& aTargetUri, TThumbnailSize aThumbnailSize)
@@ -772,7 +710,6 @@
EThumbnailGeneratePersistentSizesOnly :
EThumbnailNoControlFlags);
iParams.iOriginalControlFlags = iParams.iControlFlags;
- iParams.iMimeType = TDataType( aMimeType );
iParams.iBitmapHandle = 0;
iParams.iSize = aSize;
iParams.iDisplayMode = aDisplayMode;
@@ -784,19 +721,9 @@
iParams.iThumbnailId = aThumbnailId;
iParams.iFileName = aPath;
iParams.iOverwrite = EFalse;
- iParams.iImport = EFalse;
iPath = aPath;
iTargetUri = aTargetUri;
-
- if (iPath.Length() && IsVirtualUri(iPath))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
}
// ---------------------------------------------------------------------------
@@ -830,18 +757,8 @@
iParams.iQualityPreference = aQualityPreference;
iParams.iThumbnailId = aThumbnailId;
iParams.iOverwrite = aOverwrite;
- iParams.iImport = EFalse;
iTargetUri = aTargetUri;
-
- if (iTargetUri.Length() && IsVirtualUri(iTargetUri))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
}
// ---------------------------------------------------------------------------
@@ -872,19 +789,9 @@
iParams.iThumbnailId = aThumbnailId;
iParams.iFileName = aTargetUri;
iParams.iOverwrite = aOverwrite;
- iParams.iImport = EFalse;
iTargetUri = aTargetUri;
- if (iTargetUri.Length() && IsVirtualUri(iTargetUri))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
-
TInt memoryFree( 0 );
HAL::Get( HALData::EMemoryRAMFree, memoryFree );
@@ -897,7 +804,7 @@
iParams.iMimeType = TDataType( aMimeType );
iRequestType = EReqSetThumbnailBitmap;
}
- else if (!iParams.iVirtualUri)
+ else
{
// memory low, create thumbs using filehandle
TN_DEBUG1( "CThumbnaiRequestActive::SetThumbnailbyBitmap() - memory low, create thumbs using filehandle!" );
@@ -906,10 +813,6 @@
iParams.iPriority = aPriority - 1;
iRequestType = EReqGetThumbnailHandleLater;
}
- else
- {
- User::Leave(KErrNoMemory);
- }
}
// ---------------------------------------------------------------------------
@@ -935,8 +838,6 @@
iParams.iQualityPreference = aQualityPreference;
iParams.iThumbnailId = aThumbnailId;
iParams.iOverwrite = EFalse;
- iParams.iVirtualUri = EFalse;
- iParams.iImport = EFalse;
iPath = aPath;
iOrientation = aOrientation;
@@ -977,51 +878,6 @@
}
// ---------------------------------------------------------------------------
-// CThumbnailRequestActive::SetThumbnailL()
-// Set thumbnail from file path.
-// ---------------------------------------------------------------------------
-//
-void CThumbnailRequestActive::SetThumbnailL( const TDesC& aPath, const TDesC8& aMimeType,
- CThumbnailManager::TThumbnailFlags aFlags, CThumbnailManager
- ::TThumbnailQualityPreference aQualityPreference, const TSize& aSize, const
- TDisplayMode aDisplayMode, const TInt aPriority, TAny* aClientData,
- TBool aGeneratePersistentSizesOnly, const TDesC& aTargetUri,
- TThumbnailSize aThumbnailSize, TBool aOverwrite)
- {
- iRequestType = EReqSetThumbnailPath;
-
- iClientData = aClientData;
- iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
- EThumbnailGeneratePersistentSizesOnly :
- EThumbnailNoControlFlags);
- iParams.iOriginalControlFlags = iParams.iControlFlags;
- iParams.iMimeType = TDataType( aMimeType );
- iParams.iBitmapHandle = 0;
- iParams.iSize = aSize;
- iParams.iDisplayMode = aDisplayMode;
- iParams.iFileName = aPath;
- iParams.iRequestId = iRequestId;
- iParams.iPriority = aPriority;
- iParams.iFlags = aFlags;
- iParams.iQualityPreference = aQualityPreference;
- iParams.iThumbnailSize = aThumbnailSize;
- iParams.iOverwrite = aOverwrite;
-
- iTargetUri = aTargetUri;
-
- if (iTargetUri.Length() && IsVirtualUri(iTargetUri))
- {
- iParams.iVirtualUri = ETrue;
- }
- else
- {
- iParams.iVirtualUri = EFalse;
- }
-
- iParams.iImport = ETrue;
- }
-
-// ---------------------------------------------------------------------------
// Request 2nd phase thumbnail
// ---------------------------------------------------------------------------
//
@@ -1114,26 +970,4 @@
return KErrNone;
}
-// ---------------------------------------------------------------------------
-// CThumbnailRequestActive::IsVirtualUri()
-// Checks if URI is virtual.
-// ---------------------------------------------------------------------------
-//
-TBool CThumbnailRequestActive::IsVirtualUri( const TDesC& aPath )
- {
- TInt pos = aPath.Find(KBackSlash);
-
- // normal URI
- if ( pos == 2 )
- {
- return EFalse;
- }
- // virtual URI
- else
- {
- TN_DEBUG1( "CThumbnailRequestActive::IsVirtualUri() - yes");
- return ETrue;
- }
- }
-
// End of file