diff -r 6f9f6e99a23e -r e257e2b6459d mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadatampxaccess.h
--- a/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadatampxaccess.h	Tue May 25 13:14:13 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadatampxaccess.h	Wed Jun 09 10:13:45 2010 +0300
@@ -72,7 +72,7 @@
      * @param aCategory, indicate the category of abstract medias
      */
     void GetAllAbstractMediaL( const TDesC& aStoreRoot,
-        CMPXMediaArray** aAbstractMedias,
+        CDesCArray& aAbstractMedias,
         TMPXGeneralCategory aCategory );
 
     /**
@@ -80,19 +80,11 @@
      * @param aAbstractMedia, specify of which reference should be get
      * @param aReferences, return result array which stored handles of all references
      */
-    void GetAllReferenceL( CMPXMedia* aAbstractMedia,
+    void GetAllReferenceL( const TDesC& aRefOwnerSuid,
+        TMPXGeneralCategory aCategory,
         CDesCArray& aReferences );
 
     /**
-     * Get an abstract media name from CMPXMedia object
-     * @param aAbstractMedia, specify the source
-     * @param aCategory, specify the category
-     * @return, name of the source, ownership transferred
-     */
-    HBufC* GetAbstractMediaNameL( CMPXMedia* aAbstractMedia,
-        TMPXGeneralCategory aCategory );
-
-    /**
      * Adds Songs info to Mpx DB
      * @param aFullFileName, full file name of Media file
      */
@@ -215,6 +207,8 @@
     MMPXCollectionHelper* iCollectionHelper;
     HBufC8* iSampleData;
 
+    TBool iHasCleanUp;
+
 #if defined(_DEBUG) || defined(MMMTPDP_PERFLOG)
     CMmMtpDpPerfLog* iPerfLog;
 #endif