--- a/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Thu Jul 15 19:35:12 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Thu Aug 19 10:44:03 2010 +0300
@@ -210,8 +210,8 @@
             // get field id
             fields.FieldIdAt( i , fieldId );
             LOGGER_WRITE_2( "AudioFieldId( %d ): 0x%02x", i, fieldId );
-            
-            if ( fieldId == EMetaDataJpeg )
+            TUint8 sconFieldId = AudioFieldId( fieldId );
+            if ( sconFieldId == KSconAudioJpeg )
                 {
                 TPtrC8 field8( fields.Field8( fieldId ) );
                 AppendByteDataFieldL(
@@ -219,13 +219,16 @@
                     field8,
                     AudioFieldId( fieldId ) );
                 }
-            else
+            else if ( sconFieldId > 0 )
                 {
                 // get field data and add UTF-8 formatted text to buffer
                 fieldData.Set( fields.At( i , fieldId ) );
-                AppendUtf8DataFieldL( buffer, fieldData, AudioFieldId( fieldId ) );
+                AppendUtf8DataFieldL( buffer, fieldData, sconFieldId );
                 }
-            
+            else
+                {
+                LOGGER_WRITE("Unknown field skipped");
+                }
             }
         
         if ( buffer->Size() > 0 )
@@ -426,6 +429,12 @@
         case EMetaDataDate :
             ret = KSconAudioDate;
             break;
+        case EMetaDataUnsyncLyrics:
+            ret = KSconAudioUnsyncLyrics;
+            break;
+        case EMetaDataProtected:
+            ret = KSconAudioProtected;
+            break;
         default :
             LOGGER_WRITE( "SConMetadata::AudioFieldId : ERR field not defined!" );
             break;