mmserv/metadatautility/Src/MetaDataParserWMA.cpp
branchRCL_3
changeset 50 999b2818a0eb
parent 46 0ac9a5310753
equal deleted inserted replaced
46:0ac9a5310753 50:999b2818a0eb
    67 _LIT(KWMTrackNumber,	"WM/TrackNumber\0");
    67 _LIT(KWMTrackNumber,	"WM/TrackNumber\0");
    68 _LIT(KWMUniqueFileIdentifier,	"WM/UniqueFileIdentifier\0");
    68 _LIT(KWMUniqueFileIdentifier,	"WM/UniqueFileIdentifier\0");
    69 _LIT(KWMAudioFileURL,	"WM/AudioFileURL\0");
    69 _LIT(KWMAudioFileURL,	"WM/AudioFileURL\0");
    70 _LIT(KWMSharedUserRating, "WM/SharedUserRating\0");
    70 _LIT(KWMSharedUserRating, "WM/SharedUserRating\0");
    71 _LIT(KWMDate, "WM/OriginalReleaseTime\0");
    71 _LIT(KWMDate, "WM/OriginalReleaseTime\0");
       
    72 _LIT(KWMAlbumArtist, "WM/AlbumArtist\0");
       
    73 
    72 #ifdef __WINDOWS_MEDIA
    74 #ifdef __WINDOWS_MEDIA
    73 _LIT(KWMProvider, "WM/Provider\0");
    75 _LIT(KWMProvider, "WM/Provider\0");
    74 #endif
    76 #endif
    75 _LIT8 (KASFStreamPropertiesObject, "B7DC0791A9B711CF8EE600C00C205365");
    77 _LIT8 (KASFStreamPropertiesObject, "B7DC0791A9B711CF8EE600C00C205365");
    76 
    78 
   179 		TRAP(err, GetExtContDesEntryL(EMetaDataYear, iYearOffset));
   181 		TRAP(err, GetExtContDesEntryL(EMetaDataYear, iYearOffset));
   180 		TRAP(err, GetExtContDesEntryL(EMetaDataOriginalArtist, iOriginalArtistOffset));
   182 		TRAP(err, GetExtContDesEntryL(EMetaDataOriginalArtist, iOriginalArtistOffset));
   181 		TRAP(err, GetExtContDesEntryL(EMetaDataAlbumTrack, iTrackNumberOffset));
   183 		TRAP(err, GetExtContDesEntryL(EMetaDataAlbumTrack, iTrackNumberOffset));
   182 		TRAP(err, GetExtContDesEntryL(EMetaDataUniqueFileIdentifier, iUniqueFileIdentifierOffset));
   184 		TRAP(err, GetExtContDesEntryL(EMetaDataUniqueFileIdentifier, iUniqueFileIdentifierOffset));
   183 		TRAP(err, GetExtContDesEntryL(EMetaDataUrl, iAudioFileURLOffset));
   185 		TRAP(err, GetExtContDesEntryL(EMetaDataUrl, iAudioFileURLOffset));
       
   186         TRAP(err, GetExtContDesEntryL(EMetaDataAlbumArtist, iAlbumArtistOffset));
   184 		TRAP(err, GetDurationL());
   187 		TRAP(err, GetDurationL());
   185 		TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset));
   188 		TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset));
   186 	#ifdef __WINDOWS_MEDIA
   189 	#ifdef __WINDOWS_MEDIA
   187 		TRAP(err, GetExtContDesEntryL(EMetaDataVendor, iProviderOffset));
   190 		TRAP(err, GetExtContDesEntryL(EMetaDataVendor, iProviderOffset));
   188 	#endif
   191 	#endif
   242 				case EMetaDataDuration:
   245 				case EMetaDataDuration:
   243 					TRAP(err, GetDurationL());
   246 					TRAP(err, GetDurationL());
   244 					break;
   247 					break;
   245 				case EMetaDataDate:
   248 				case EMetaDataDate:
   246 					TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset));
   249 					TRAP(err, GetExtContDesEntryL(EMetaDataDate, iDateOffset));
       
   250 					break;
       
   251                 case EMetaDataAlbumArtist:
       
   252                     TRAP(err, GetExtContDesEntryL(EMetaDataAlbumArtist, iAlbumArtistOffset));
   247 					break;
   253 					break;
   248 			#ifdef __WINDOWS_MEDIA
   254 			#ifdef __WINDOWS_MEDIA
   249 				case EMetaDataVendor:
   255 				case EMetaDataVendor:
   250 					TRAP(err, GetExtContDesEntryL(EMetaDataVendor, iProviderOffset));
   256 					TRAP(err, GetExtContDesEntryL(EMetaDataVendor, iProviderOffset));
   251 			#endif
   257 			#endif
   884 				}
   890 				}
   885 			else if(!name16.Compare(KWMDate))
   891 			else if(!name16.Compare(KWMDate))
   886 				{
   892 				{
   887 				iDateOffset = offset; 
   893 				iDateOffset = offset; 
   888 				}
   894 				}
       
   895             else if(!name16.Compare(KWMAlbumArtist))
       
   896                 {
       
   897                 iAlbumArtistOffset = offset; 
       
   898                 }
   889 		#ifdef __WINDOWS_MEDIA
   899 		#ifdef __WINDOWS_MEDIA
   890 			else if(!name16.Compare(KWMProvider))
   900 			else if(!name16.Compare(KWMProvider))
   891 				{
   901 				{
   892 				iProviderOffset = offset; 
   902 				iProviderOffset = offset; 
   893 				}
   903 				}