diff -r bee149131e4b -r 05b0d2323768 mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Fri Feb 19 23:18:32 2010 +0200 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Fri Mar 12 15:44:36 2010 +0200 @@ -28,9 +28,8 @@ #include "cmmmtpdpmetadataaccesswrapper.h" #include "mmmtpdplogger.h" #include "mmmtpdpconfig.h" +#include "tobjectdescription.h" -_LIT( KMtpDateTimeFormat, "%F%Y%M%DT%H%T%S" ); -const TInt KMtpMaxDateTimeStringLength = 15; // ----------------------------------------------------------------------------- // Verification data for the GetObjectPropValue request @@ -138,7 +137,7 @@ TUint32 objectHandle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 ); TUint32 propCode = Request().Uint32( TMTPTypeRequest::ERequestParameter2 ); PRINT2( _L( "MM MTP <> CGetObjectPropValue::ServiceL objectHandle = 0x%x, propCode = 0x%x" ), - objectHandle, propCode ); + objectHandle, propCode ); // don't have the ownship of the object iObjectInfo = iRequestChecker->GetObjectInfo( objectHandle ); @@ -146,8 +145,6 @@ PRINT1( _L( "MM MTP <> CGetObjectPropValue::ServiceL object file name is %S" ), &suid ); TParsePtrC parse( suid ); - iDpConfig.GetWrapperL().SetStorageRootL( parse.Drive() ); - if ( iMTPTypeString != NULL ) { delete iMTPTypeString; @@ -182,7 +179,7 @@ { iMTPTypeUint16.Set( 0 ); iMTPTypeUint16 = MmMtpDpUtility::GetProtectionStatusL( iFramework.Fs(), - iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); + iObjectInfo->DesC( CMTPObjectMetaData::ESuid ) ); SendDataL( iMTPTypeUint16 ); } break; @@ -232,9 +229,9 @@ case EMTPObjectPropCodeName: // 0xDC44 case EMTPObjectPropCodeDateAdded: // 0xDC4E { - if ( ( propCode == EMTPObjectPropCodeName) + if ( ( propCode == EMTPObjectPropCodeName ) || ( ( !MmMtpDpUtility::IsVideoL(iObjectInfo->DesC( CMTPObjectMetaData::ESuid ), iFramework ) ) - && ( propCode == EMTPObjectPropCodeDateAdded ) ) ) + && ( propCode == EMTPObjectPropCodeDateAdded ) ) ) { iMTPTypeString = CMTPTypeString::NewL(); ServiceMetaDataFromWrapperL( propCode, *iMTPTypeString, *iObjectInfo );