--- a/mmserv/metadatautility/Src/3GPExtParser.h	Thu Aug 19 10:26:11 2010 +0300
+++ b/mmserv/metadatautility/Src/3GPExtParser.h	Tue Aug 31 15:43:02 2010 +0300
@@ -27,6 +27,19 @@
 #include "MetaDataFieldContainer.h"
 #include "MetaDataField.hrh"
 
+// CONSTANTS
+
+_LIT8 (K3GPExtMetaTitleFormat, "%cnam"); 
+_LIT8 (K3GPExtMetaArtistFormat, "%cART"); 
+_LIT8 (K3GPExtMetaComposerFormat, "%cwrt"); 
+_LIT8 (K3GPExtMetaAlbumFormat, "%calb"); 
+_LIT8 (K3GPExtMetaCommentFormat, "%ccmt"); 
+_LIT8 (K3GPExtMetaCustomGenreFormat, "%cgen");  // mapped to rating
+_LIT8 (K3GPExtMetaYearFormat, "%cday"); 
+_LIT8 (K3GPExtMetaGenre, "gnre");
+_LIT8 (K3GPExtMetaTrack, "trkn"); 
+_LIT8 (K3GPExtMetaJpeg, "covr"); 
+
 
 // CLASS DECLARATION
 
@@ -54,18 +67,20 @@
         /**
 		* Extract meta data boxes from ilst
 		* @since 3.0
+		* @param aBox wanted metadata box
         * @param aFieldId metadata field in 3GPExtParser
 		* @return void
 		*/
-		IMPORT_C void GetilstBoxesL(TMetaDataFieldId aFieldId, HBufC** aBuf);
+		IMPORT_C void GetilstBoxesL(const TDesC8& aBox, TMetaDataFieldId aFieldId, HBufC** aBuf);
 		/**
 		* Extract meta data boxes from ilst
 		* 8-bit version to support international languages in string metadata
 		* @since 3.1
+		* @param aBox wanted metadata box
         * @param aFieldId metadata field in 3GPExtParser
 		* @return void
 		*/
-		IMPORT_C void GetilstBoxesL(TMetaDataFieldId aFieldId, HBufC8** aBuf);
+		IMPORT_C void GetilstBoxesL(const TDesC8& aBox, TMetaDataFieldId aFieldId, HBufC8** aBuf);
 				
 		/** 
 		* Checks if file has 3GPExt metadata
@@ -143,7 +158,9 @@
  		TUint32 iTrackNumberSize;
  		TUint32 iCoverOffset;
  		TUint32 iCoverSize;
- 		
+        TUint32 iAlbumArtistOffset;  
+        TUint32 iAlbumArtistSize;
+        
  	public:
  				// constants
 		TBuf8<4> K3GPExtMetaTitle;