diff -r 43d09473c595 -r 128eb6a32b84 mmserv/metadatautility/Src/MetaDataParser.cpp --- a/mmserv/metadatautility/Src/MetaDataParser.cpp Fri May 14 16:22:35 2010 +0300 +++ b/mmserv/metadatautility/Src/MetaDataParser.cpp Thu May 27 13:20:50 2010 +0300 @@ -31,6 +31,7 @@ _LIT(KCharacterSetRscFile, "TopCharacterSet.rsc"); + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -172,12 +173,7 @@ #ifdef _DEBUG RDebug::Print(_L("CMetaDataParser::MapID3GenreToStringL")); #endif - - if(aNum < 0 || aNum > 125 && aNum != 199) - { - return; - } - switch(aNum) + switch(aNum) { case 0: aGenrePtr.Append(KGenreBlues); @@ -574,12 +570,7 @@ #ifdef _DEBUG RDebug::Print(_L("CMetaDataParser::MapID3GenreToStringL")); #endif - - if(aNum < 0 || aNum > 125 && aNum != 199) - { - return; - } - switch(aNum) + switch(aNum) { case 0: aGenrePtr.Append(KGenreBlues); @@ -1277,6 +1268,26 @@ } // ----------------------------------------------------------------------------- +// CMetaDataParser::CommonParseDesL +// ----------------------------------------------------------------------------- +// +void CMetaDataParser::CommonParseDesL( + const RArray& aWantedFields, + CMetaDataFieldContainer& aContainer ) + { +#ifdef _DEBUG + RDebug::Print(_L("CMetaDataParser::CommonParseDesL")); +#endif + + //Since this is for descriptor "source", by default it is not a DRM Protected file + _LIT(KNoProtection, "0"); + aContainer.AppendL( EMetaDataProtected, KNoProtection ); + + //Continue parsing the file + ParseL(aWantedFields, aContainer); + } + +// ----------------------------------------------------------------------------- // CMetaDataParser::GetProtectedL // ----------------------------------------------------------------------------- //