# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1279210302 -10800
# Node ID b034b1c214c2b76d34677dde5d7cd9700420a5e2
# Parent  4aca42fa4eb105402a523026f3c71dc4227af618
Revision: 201024
Kit: 2010127

diff -r 4aca42fa4eb1 -r b034b1c214c2 mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataproviderenumerator.cpp
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataproviderenumerator.cpp	Mon Jun 21 16:13:35 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataproviderenumerator.cpp	Thu Jul 15 19:11:42 2010 +0300
@@ -227,6 +227,7 @@
                     folder );  // + object
             object->SetUint( CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent );
             object->SetUint( CMTPObjectMetaData::EFormatSubCode, EMTPAssociationTypeGenericFolder );
+            object->SetDesCL( CMTPObjectMetaData::EName, KPlaylistFilePath().Left( KPlaylistFilePath().Length() - 1 ) );
             PERFLOGSTART( KObjectManagerInsert );
             iObjectMgr.InsertObjectL( *object );
             PERFLOGSTOP( KObjectManagerInsert );
diff -r 4aca42fa4eb1 -r b034b1c214c2 mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/inc/mediamtpdataproviderconst.h
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/inc/mediamtpdataproviderconst.h	Mon Jun 21 16:13:35 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/inc/mediamtpdataproviderconst.h	Thu Jul 15 19:11:42 2010 +0300
@@ -35,6 +35,7 @@
 enum TMmMtpSampleRateValue
     {
     EMTPSampleRate8K = 0x00001F40,
+    EMTPSampleRate11_025K = 0x00002B11,
     EMTPSampleRate16K = 0x00003E80,
     EMTPSampleRate22_05K = 0x00005622,
     EMTPSampleRate24K = 0x00005DC0,
diff -r 4aca42fa4eb1 -r b034b1c214c2 mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataproviderdescriptionutility.cpp
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataproviderdescriptionutility.cpp	Mon Jun 21 16:13:35 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataproviderdescriptionutility.cpp	Thu Jul 15 19:11:42 2010 +0300
@@ -536,6 +536,7 @@
     TUint32 values[] =
         {
             EMTPSampleRate8K,
+            EMTPSampleRate11_025K,
             EMTPSampleRate16K,
             EMTPSampleRate22_05K,
             EMTPSampleRate24K,
diff -r 4aca42fa4eb1 -r b034b1c214c2 mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp	Mon Jun 21 16:13:35 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp	Thu Jul 15 19:11:42 2010 +0300
@@ -369,7 +369,7 @@
     else if ( err == KErrNotFound )
         {
         if( MmMtpDpUtility::HasMetadata( aObjectMetaData.Uint( CMTPObjectMetaData::EFormatCode ) ) )
-            SendResponseL( EMTPRespCodeAccessDenied );
+            resCode = EMTPRespCodeAccessDenied;
         }
     else
         {
diff -r 4aca42fa4eb1 -r b034b1c214c2 mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp
--- a/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp	Mon Jun 21 16:13:35 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp	Thu Jul 15 19:11:42 2010 +0300
@@ -501,7 +501,17 @@
 
     if ( mimebuf == NULL )
         {
-        User::Leave( KErrNotFound );
+        PRINT( _L( "MM MTP <> MmMtpDpUtility::Mp4MimeTypeL, mimebuf == NULL, default as video" ) );
+
+        if ( file.Ext().CompareF( KTxtExtension3GP ) == 0
+            || file.Ext().CompareF( KTxtExtension3G2 ) == 0 )
+            {
+            mimebuf = KMimeTypeVideo3gpp().Alloc();
+            }
+        else
+            {
+            mimebuf = KMimeTypeVideoMp4().Alloc();
+            }
         }
     PRINT( _L( "MM MTP <= MmMtpDpUtility::Mp4MimeTypeL" ) );
     return mimebuf;