diff -r d881023c13eb -r cbb1bfb7ebfb mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadataaccesswrapper.h
--- a/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadataaccesswrapper.h	Mon May 03 12:58:40 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/inc/cmmmtpdpmetadataaccesswrapper.h	Fri May 14 16:21:14 2010 +0300
@@ -75,7 +75,7 @@
     * @param aFullFileName, full file name of file
     * @return void
     */
-    void AddObjectL( const CMTPObjectMetaData& aObject );
+    IMPORT_C void AddObjectL( const CMTPObjectMetaData& aObject );
 
     /**
     * Set abstract media to DB
@@ -124,7 +124,7 @@
     * Deletes metadata information associated with the object
     * @param aObject, the object need to be deleted
     */
-    void DeleteObjectL( const CMTPObjectMetaData& aObject );
+    IMPORT_C void DeleteObjectL( const CMTPObjectMetaData& aObject );
 
     /**
     * Set current  drive info
@@ -215,7 +215,7 @@
 
     void ConstructL();
 
-    TMPXGeneralCategory ContainerCategory( const TDesC& aFullFileName );
+    TMPXGeneralCategory ContainerCategoryL( const TDesC& aFullFileName );
 
     /**
     * Remove all dummy file of which format is "pla", and leave the "m3u"
@@ -225,10 +225,11 @@
 private:
     CMmMtpDpMetadataMpxAccess* iMmMtpDpMetadataMpxAccess;
     CMmMtpDpMetadataVideoAccess* iMmMtpDpMetadataVideoAccess;
-    TBool iOpenSession;
 
     MMTPDataProviderFramework& iFramework;
-    RFs& iFs;	// should not remove this member data!!!
+    RFs& iFs;    // should not remove this member data!!!
+
+    TInt iOpenCount;	// introduce to fix CollectionHelper Flush problem
 
     CDesCArray* iAbstractMediaArray;