--- a/mmserv/metadatautility/Src/MetaDataParser3GPExt.cpp Thu Aug 19 10:26:11 2010 +0300
+++ b/mmserv/metadatautility/Src/MetaDataParser3GPExt.cpp Tue Aug 31 15:43:02 2010 +0300
@@ -111,55 +111,55 @@
if ( aWantedFields.Count() == 0 )
{
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataSongTitle, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTitleFormat, EMetaDataSongTitle, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataSongTitle);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataArtist, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataArtist, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataArtist);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComposer, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaComposerFormat, EMetaDataComposer, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataComposer);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbum, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaAlbumFormat, EMetaDataAlbum, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataAlbum);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComment, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCommentFormat, EMetaDataComment, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataComment);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataGenre, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaGenre, EMetaDataGenre, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataGenre);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataYear, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaYearFormat, EMetaDataYear, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataYear);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataRating, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCustomGenreFormat, EMetaDataRating, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataGenre);
}
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumTrack, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTrack, EMetaDataAlbumTrack, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataAlbumTrack);
@@ -167,7 +167,13 @@
TRAP(err, GetDurationL(EMetaDataDuration));
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataAlbumArtist, &buf8));
+ if (KErrNone == err)
+ {
+ ConvertAndAppendL(&buf8, EMetaDataAlbumArtist);
+ }
+
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaJpeg, EMetaDataJpeg, &buf8));
if (KErrNone == err)
{
AppendL(&buf8, EMetaDataJpeg);
@@ -183,7 +189,7 @@
switch ( aWantedFields[ i ] )
{
case EMetaDataSongTitle:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataSongTitle, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTitleFormat, EMetaDataSongTitle, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataSongTitle);
@@ -191,7 +197,7 @@
break;
case EMetaDataComment:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComment, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCommentFormat, EMetaDataComment, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataComment);
@@ -199,7 +205,7 @@
break;
case EMetaDataAlbumTrack:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbumTrack, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaTrack, EMetaDataAlbumTrack, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataAlbumTrack);
@@ -207,7 +213,7 @@
break;
case EMetaDataArtist:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataArtist, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataArtist, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataArtist);
@@ -215,7 +221,7 @@
break;
case EMetaDataComposer:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataComposer, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaComposerFormat, EMetaDataComposer, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataComposer);
@@ -223,7 +229,7 @@
break;
case EMetaDataAlbum:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataAlbum, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaAlbumFormat, EMetaDataAlbum, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataAlbum);
@@ -231,7 +237,7 @@
break;
case EMetaDataGenre:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataGenre, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaGenre, EMetaDataGenre, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataGenre);
@@ -243,7 +249,7 @@
break;
case EMetaDataYear:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataYear, &buf));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaYearFormat, EMetaDataYear, &buf));
if (KErrNone == err)
{
AppendL(&buf, EMetaDataYear);
@@ -251,15 +257,23 @@
break;
case EMetaDataRating:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataRating, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaCustomGenreFormat, EMetaDataRating, &buf8));
if (KErrNone == err)
{
ConvertAndAppendL(&buf8, EMetaDataGenre);
}
break;
+ case EMetaDataAlbumArtist:
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaArtistFormat, EMetaDataAlbumArtist, &buf8));
+ if (KErrNone == err)
+ {
+ ConvertAndAppendL(&buf8, EMetaDataAlbumArtist);
+ }
+ break;
+
case EMetaDataJpeg:
- TRAP(err, i3GPExtParser->GetilstBoxesL(EMetaDataJpeg, &buf8));
+ TRAP(err, i3GPExtParser->GetilstBoxesL(K3GPExtMetaJpeg, EMetaDataJpeg, &buf8));
if (KErrNone == err)
{
AppendL(&buf8, EMetaDataJpeg);