harvester/harvesterplugins/AudioPlugin/src/harvesteraudiopluginutils.cpp
changeset 60 79f826a55db2
parent 40 910a23996aa0
--- a/harvester/harvesterplugins/AudioPlugin/src/harvesteraudiopluginutils.cpp	Mon Sep 27 15:53:05 2010 +0300
+++ b/harvester/harvesterplugins/AudioPlugin/src/harvesteraudiopluginutils.cpp	Wed Oct 06 15:08:08 2010 +0300
@@ -35,6 +35,7 @@
 _LIT( KMimeTypeWav,    "audio/wav" );
 _LIT( KMimeTypeAu,     "audio/au" );
 _LIT( KMimeTypeAudioMatroska, "audio/x-matroska");
+_LIT( KMimeTypeAudioMp4,  "audio/mp4" );
 
 _LIT( KExtensionMp3,    "mp3" );
 _LIT( KExtensionAac,    "aac" );
@@ -49,6 +50,7 @@
 _LIT( KExtensionAu,     "au" );
 _LIT( KExtensionNrt,    "nrt" );
 _LIT( KExtensionMka,    "mka" );
+_LIT( KExtensionM4a,    "m4a" );
 
 // -----------------------------------------------------------------------------
 // CAudioMDParser::NewL
@@ -113,6 +115,10 @@
     iWantedMetadataFields.AppendL( EMetaDataDuration );
     iWantedMetadataFields.AppendL( EMetaDataCopyright );
     iWantedMetadataFields.AppendL( EMetaDataDate );
+    iWantedMetadataFields.AppendL( EMetaDataProtected );
+    iWantedMetadataFields.AppendL( EMetaDataSampleRate );
+    iWantedMetadataFields.AppendL( EMetaDataBitRate );
+    iWantedMetadataFields.AppendL( EMetaDataAlbumArtist );
     
     if( aAlbumArt )
         {
@@ -137,7 +143,6 @@
     User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TAudioMetadataHandling>(
         	KExtensionWma(), KMimeTypeWma(), 
         	EMetaDataUtilityHandling ), cmp ) );
-
     User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TAudioMetadataHandling>(
     		KExtensionMid(), KMimeTypeMidi(), 
     		EFileSystemHandling ), cmp ) );
@@ -165,7 +170,9 @@
     User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TAudioMetadataHandling>(
             KExtensionMka(), KMimeTypeAudioMatroska(), 
             EMetaDataUtilityHandling ), cmp ) );
-
+    User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TAudioMetadataHandling>(
+            KExtensionM4a(), KMimeTypeAudioMp4(), 
+            EMetaDataUtilityHandling ), cmp ) );
     }
 
 
@@ -320,7 +327,26 @@
             id = EMetaDataJpeg;
             break;
             }
-
+        case EAudioMDFieldProtected:
+            {
+            id = EMetaDataProtected;
+            break;
+            }
+        case EAudioMDFieldSampleRate:
+            {
+            id = EMetaDataSampleRate;
+            break;
+            }
+        case EAudioMDFieldBitRate:
+            {
+            id = EMetaDataBitRate;
+            break;
+            }
+        case EAudioMDFieldAlbumArtist:
+            {
+            id = EMetaDataAlbumArtist;
+            break;
+            }
         default:
             {
 #ifdef _DEBUG