equal
deleted
inserted
replaced
260 iReHarvester->SetHarvesterQueue( iQueue ); |
260 iReHarvester->SetHarvesterQueue( iQueue ); |
261 |
261 |
262 iHarvesterPluginFactory = CHarvesterPluginFactory::NewL(); |
262 iHarvesterPluginFactory = CHarvesterPluginFactory::NewL(); |
263 iHarvesterPluginFactory->SetBlacklist( *iBlacklist ); |
263 iHarvesterPluginFactory->SetBlacklist( *iBlacklist ); |
264 |
264 |
|
265 // Reset harvesting status for clients in case blacklisted file was handled |
|
266 iHarvesterPluginFactory->SendHarvestingStatusEventL( EFalse ); |
|
267 |
265 iCameraExtensionArray = new ( ELeave ) CDesCArraySeg( 6 ); |
268 iCameraExtensionArray = new ( ELeave ) CDesCArraySeg( 6 ); |
266 iCameraExtensionArray->InsertIsqL( KExtensionMp4 ); |
269 iCameraExtensionArray->InsertIsqL( KExtensionMp4 ); |
267 iCameraExtensionArray->InsertIsqL( KExtensionMpg4 ); |
270 iCameraExtensionArray->InsertIsqL( KExtensionMpg4 ); |
268 iCameraExtensionArray->InsertIsqL( KExtensionMpeg4 ); |
271 iCameraExtensionArray->InsertIsqL( KExtensionMpeg4 ); |
269 iCameraExtensionArray->InsertIsqL( KExtension3gp ); |
272 iCameraExtensionArray->InsertIsqL( KExtension3gp ); |
520 removed = iQueue->RemoveItems( aMediaId ); |
523 removed = iQueue->RemoveItems( aMediaId ); |
521 WRITELOG1( "CHarvesterAO::HandleUnmount() removed iQueue = %d", removed ); |
524 WRITELOG1( "CHarvesterAO::HandleUnmount() removed iQueue = %d", removed ); |
522 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); |
525 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); |
523 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); |
526 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); |
524 } |
527 } |
525 |
|
526 iMediaIdUtil->RemoveMediaId( aMediaId ); |
|
527 |
528 |
528 removed = 0; |
529 removed = 0; |
529 |
530 |
530 RPointerArray<CHarvesterPluginInfo>& hpiArray = iHarvesterPluginFactory->GetPluginInfos(); |
531 RPointerArray<CHarvesterPluginInfo>& hpiArray = iHarvesterPluginFactory->GetPluginInfos(); |
531 const TInt hpiArrayCount( hpiArray.Count() ); |
532 const TInt hpiArrayCount( hpiArray.Count() ); |
567 WRITELOG1( "CHarvesterAO::HandleUnmount() remove from plugins = %d", removed); |
568 WRITELOG1( "CHarvesterAO::HandleUnmount() remove from plugins = %d", removed); |
568 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); |
569 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); |
569 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); |
570 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); |
570 } |
571 } |
571 } |
572 } |
|
573 |
|
574 iMediaIdUtil->RemoveMediaId( aMediaId ); |
572 |
575 |
573 // resume harvesting from last state |
576 // resume harvesting from last state |
574 if( !iRamFull && !iDiskFull ) |
577 if( !iRamFull && !iDiskFull ) |
575 { |
578 { |
576 // resume monitoring |
579 // resume monitoring |
816 |
819 |
817 CMdENamespaceDef& defNS = iMdESession->GetDefaultNamespaceDefL(); |
820 CMdENamespaceDef& defNS = iMdESession->GetDefaultNamespaceDefL(); |
818 CMdEObjectDef& mdeObjectDef = defNS.GetObjectDefL( objDefStr ); |
821 CMdEObjectDef& mdeObjectDef = defNS.GetObjectDefL( objDefStr ); |
819 |
822 |
820 CMdEObject* mdeObject = iMdESession->NewObjectL( mdeObjectDef, hd->Uri() ); |
823 CMdEObject* mdeObject = iMdESession->NewObjectL( mdeObjectDef, hd->Uri() ); |
|
824 CleanupStack::PushL( mdeObject ); |
821 |
825 |
822 CPlaceholderData* phData = NULL; |
826 CPlaceholderData* phData = NULL; |
823 |
827 |
824 if( hd->TakeSnapshot() ) |
828 if( hd->TakeSnapshot() ) |
825 { |
829 { |
951 hd->SetObjectType( ENormal ); |
955 hd->SetObjectType( ENormal ); |
952 } |
956 } |
953 |
957 |
954 hd->SetMdeObject( mdeObject ); |
958 hd->SetMdeObject( mdeObject ); |
955 |
959 |
956 mdeObjectArray.Append( mdeObject ); |
960 // Ownership of mdeObject transferred to the array |
|
961 mdeObjectArray.AppendL( mdeObject ); |
957 |
962 |
958 CleanupStack::PopAndDestroy( phData ); |
963 CleanupStack::PopAndDestroy( phData ); |
|
964 |
|
965 CleanupStack::Pop( mdeObject ); |
959 |
966 |
960 iReadyPHArray.Append( hd ); |
967 iReadyPHArray.Append( hd ); |
961 iPHArray.Remove( i ); |
968 iPHArray.Remove( i ); |
962 i--; |
969 i--; |
963 endindex--; |
970 endindex--; |