diff -r bee149131e4b -r 05b0d2323768 mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp --- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Fri Feb 19 23:18:32 2010 +0200 +++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Fri Mar 12 15:44:36 2010 +0200 @@ -284,11 +284,10 @@ const TUint32 aWidth, const TUint32 aHeight ) { - if ( MmMtpDpUtility::IsVideoL( aFullFileName, iFramework ) ) - { - iMmMtpDpMetadataVideoAccess->SetStorageRootL( aFullFileName ); - iMmMtpDpMetadataVideoAccess->SetImageObjPropL( aFullFileName, aWidth, aHeight ); - } + iMmMtpDpMetadataVideoAccess->SetStorageRootL( aFullFileName ); + iMmMtpDpMetadataVideoAccess->SetImageObjPropL( aFullFileName, + aWidth, + aHeight ); } // ----------------------------------------------------------------------------- @@ -551,7 +550,8 @@ // Check if playlist file is a dummy file or an imported file for ( TInt i = 0; i < count; i++ ) { - if ( MmMtpDpUtility::FormatFromFilename( (*iAbstractMediaArray)[i] ) != + TPtrC dummyFileName( (*iAbstractMediaArray)[i] ); + if ( MmMtpDpUtility::FormatFromFilename( dummyFileName ) != EMTPFormatCodeM3UPlaylist ) { // delete the virtual playlist @@ -559,13 +559,13 @@ TInt err = iRfs.Delete( ( *iAbstractMediaArray )[i] ); PRINT2( _L( "MM MTP <> CMmMtpDpMetadataAccessWrapper::RemoveDummyFile filename = %S, err %d" ), - &( (*iAbstractMediaArray)[i] ), + &dummyFileName, err ); } else { // leave the Imported playlist in the file system - PRINT1( _L( "MM MTP <> CMmMtpDpMetadataAccessWrapper::RemoveDummyFile, Don't delete m3u file [%S]" ), &( (*iAbstractMediaArray)[i] ) ); + PRINT1( _L( "MM MTP <> CMmMtpDpMetadataAccessWrapper::RemoveDummyFile, Don't delete m3u file [%S]" ), &dummyFileName ); } } PRINT( _L( "MM MTP <= CMmMtpDpMetadataAccessWrapper::RemoveDummyFiles" ) );