--- 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 );
--- 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,
--- 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,
--- 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
{
--- 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;