# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284543164 -10800 # Node ID 60bb012f11575a7f506bb0f8d18fbd94878a48a7 # Parent 3d743e824514817d2c1f3c843b37a53bf2c08640 Revision: 201035 Kit: 201036 diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/ThumbnailManager_0x102830AB_v9.20.8_SA_S60.50_Euro1.sis Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/ThumbnailManager_0x102830AB_v9.20.8_SA_S60.50_Euro1.sis has changed diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Wed Sep 15 12:32:44 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Thumbnail Manager"},(0x102830AB), 9, 20, 8, TYPE=SA, RU +#{"Thumbnail Manager"},(0x102830AB), 9, 20, 9, TYPE=SA, RU ; Localised Vendor name %{"Nokia"} diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Wed Sep 15 12:32:44 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"ThumbnailManager"},(0x102830AB), 9, 20, 8, TYPE=SA +#{"ThumbnailManager"},(0x102830AB), 9, 20, 9, TYPE=SA ; Localised Vendor name %{"Nokia"} diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/thumbnailmanager_stub.sis Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/thumbnailmanager_stub.sis has changed diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Wed Sep 15 12:32:44 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Thumbnail Manager Cenrep"},(0x10202BE9), 9, 20, 8, TYPE=SP +#{"Thumbnail Manager Cenrep"},(0x10202BE9), 9, 20, 9, TYPE=SP ; Localised Vendor name %{"Symbian Software Ltd."} diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -308,12 +308,10 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( audioDef ); - CleanupStack::PushL( &addObjectCondition ); + addCondition->AddObjectConditionL( audioDef ); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( audioDef ); - CleanupStack::PushL( &modifyObjectCondition ); + modifyCondition->AddObjectConditionL( audioDef ); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -321,7 +319,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 4, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGAudioObserver::AddObserversL() - end" ); } diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -303,12 +303,10 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -316,7 +314,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 4, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGCameraObserver::AddObserversL() - end" ); } diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -290,19 +290,14 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( imageDef ); - CleanupStack::PushL( &addObjectCondition ); + addCondition->AddObjectConditionL( imageDef ); - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( imageDef ); - CleanupStack::PushL( &modifyObjectCondition ); + modifyCondition->AddObjectConditionL( imageDef ); - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); // add observers iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -310,7 +305,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 6, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - end" ); } diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -1048,23 +1048,18 @@ rootCondition.SetOperator( ELogicConditionOperatorOr ); CMdEObjectCondition& imagePHObjectCondition = rootCondition.AddObjectConditionL(imageObjDef); - CleanupStack::PushL( &imagePHObjectCondition ); imagePHObjectCondition.SetPlaceholderOnly( ETrue ); imagePHObjectCondition.SetNotPresent( aPresent ); CMdEObjectCondition& videoPHObjectCondition = rootCondition.AddObjectConditionL(videoObjDef); - CleanupStack::PushL( &videoPHObjectCondition ); videoPHObjectCondition.SetPlaceholderOnly( ETrue ); videoPHObjectCondition.SetNotPresent( aPresent ); CMdEObjectCondition& audioPHObjectCondition = rootCondition.AddObjectConditionL(audioObjDef); - CleanupStack::PushL( &audioPHObjectCondition ); audioPHObjectCondition.SetPlaceholderOnly( ETrue ); audioPHObjectCondition.SetNotPresent( aPresent ); iQueryPlaceholders->FindL(KMaxTInt, KMaxQueryBatchSize); - - CleanupStack::Pop(3, &imagePHObjectCondition ); } TN_DEBUG1( "CThumbAGProcessor::QueryPlaceholdersL - end" ); @@ -1131,7 +1126,7 @@ err = iHarvesterClient.AddHarvesterEventObserver( *this, EHEObserverTypeOverall | EHEObserverTypeMMC | EHEObserverTypePlaceholder, 20 ); TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient observer err = %d", err); - if( !err ) + if( err != KErrNone ) { TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer failed"); // if we fail observer harvester, fake it @@ -1890,18 +1885,11 @@ CMdELogicCondition& rootCondition = iQueryAllItems->Conditions(); rootCondition.SetOperator( ELogicConditionOperatorOr ); - CMdEObjectCondition& imageObjectCondition = rootCondition.AddObjectConditionL(imageObjDef); - CleanupStack::PushL( &imageObjectCondition ); - - CMdEObjectCondition& videoObjectCondition = rootCondition.AddObjectConditionL(videoObjDef); - CleanupStack::PushL( &videoObjectCondition ); - - CMdEObjectCondition& audioObjectCondition = rootCondition.AddObjectConditionL(audioObjDef); - CleanupStack::PushL( &audioObjectCondition ); + rootCondition.AddObjectConditionL(imageObjDef); + rootCondition.AddObjectConditionL(videoObjDef); + rootCondition.AddObjectConditionL(audioObjDef); iQueryAllItems->FindL(KMaxTInt, KMaxQueryBatchSize); - - CleanupStack::Pop(3, &imageObjectCondition); TN_DEBUG1( "CThumbAGProcessor::QueryAllItemsL - end" ); } diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -301,19 +301,14 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); + addCondition->AddObjectConditionL( videoDef ); - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( videoDef ); - CleanupStack::PushL( &addObjectCondition ); - - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( videoDef ); - CleanupStack::PushL( &modifyObjectCondition ); - - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddObjectConditionL( videoDef ); + + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -321,7 +316,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 6, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGVideoObserver::AddObserversL() - end" ); } diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -353,7 +353,8 @@ { const TInt count = iMissingSizes->Count(); - for ( TInt i( 0 ); i < count; i++ ) + // scale small thumbs first, because fullscreen encoding takes longer + for ( TInt i( count-1 ); i >= 0; i-- ) { TThumbnailSize size = (*iMissingSizes)[ i ].iType; #ifdef _DEBUG @@ -365,7 +366,8 @@ if ( size == EFullScreenThumbnailSize || size == EVideoFullScreenThumbnailSize || size == EAudioFullScreenThumbnailSize || - size == EImageFullScreenThumbnailSize ) + size == EImageFullScreenThumbnailSize || + size == EContactFullScreenThumbnailSize ) { TN_DEBUG2( "*iMissingSizes)[ i ].iWidth == %d", (*iMissingSizes)[ i ].iSize.iWidth ); TN_DEBUG2( "*iMissingSizes)[ i ].iHeight == %d", (*iMissingSizes)[ i ].iSize.iHeight ); @@ -418,7 +420,8 @@ if ( iThumbnailSize == EFullScreenThumbnailSize || iThumbnailSize == EVideoFullScreenThumbnailSize || iThumbnailSize == EAudioFullScreenThumbnailSize || - iThumbnailSize == EImageFullScreenThumbnailSize ) + iThumbnailSize == EImageFullScreenThumbnailSize || + iThumbnailSize == EContactFullScreenThumbnailSize) { TInt width = iSize.iWidth; iSize.iWidth = iSize.iHeight; diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -241,7 +241,8 @@ if ( (iThumbnailSize == EFullScreenThumbnailSize || iThumbnailSize == EImageFullScreenThumbnailSize || iThumbnailSize == EVideoFullScreenThumbnailSize || - iThumbnailSize == EAudioFullScreenThumbnailSize) && + iThumbnailSize == EAudioFullScreenThumbnailSize || + iThumbnailSize == EContactFullScreenThumbnailSize) && iOriginalSize.iHeight < iTargetSize.iHeight && iOriginalSize.iWidth < iTargetSize.iWidth ) { diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -810,7 +810,8 @@ TSize bitmapSize = bitmap->SizeInPixels(); - for ( TInt i( 0 ); i < count; i++ ) + // scale small thumbs first, because fullscreen encoding takes longer + for ( TInt i( count-1 ); i >= 0; i-- ) { if( bitmapSize.iWidth < bitmapSize.iHeight ) { @@ -819,7 +820,8 @@ if ( size == EFullScreenThumbnailSize || size == EVideoFullScreenThumbnailSize || size == EAudioFullScreenThumbnailSize || - size == EImageFullScreenThumbnailSize ) + size == EImageFullScreenThumbnailSize || + size == EContactFullScreenThumbnailSize ) { TInt height = (*missingSizes)[i].iSize.iHeight; (*missingSizes)[i].iSize.iHeight = (*missingSizes)[i].iSize.iWidth; diff -r 3d743e824514 -r 60bb012f1157 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Tue Sep 14 21:55:34 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Wed Sep 15 12:32:44 2010 +0300 @@ -1276,8 +1276,10 @@ flags |= KThumbnailDbFlagBlacklisted; } - if( (aThumbnailSize == EImageFullScreenThumbnailSize || aThumbnailSize == EVideoFullScreenThumbnailSize || - aThumbnailSize == EAudioFullScreenThumbnailSize) && !aBlackListed ) + if( (aThumbnailSize == EImageFullScreenThumbnailSize || + aThumbnailSize == EVideoFullScreenThumbnailSize || + aThumbnailSize == EAudioFullScreenThumbnailSize || + aThumbnailSize == EContactFullScreenThumbnailSize) && !aBlackListed ) { TN_DEBUG1( "CThumbnailStore::StoreThumbnailL( public ) - encode jpg" );