# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286971569 -10800 # Node ID 16db3449d7babea3e591fc90904f068b1eeec56e # Parent 91d5ad76f5c61d596faa1e8d3e2a0e8487a88cbe Revision: 201039 Kit: 201041 diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/inc/audiofetcher.h --- a/mmappcomponents/audiofetcher/inc/audiofetcher.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/inc/audiofetcher.h Wed Oct 13 15:06:09 2010 +0300 @@ -182,11 +182,6 @@ * Verifier */ MMGFetchVerifier* iVerifier; - - /** - * Mime Type array - */ - const MDesCArray* iMimeTypeArray; }; #endif // AUDIOFETCHER_H diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/inc/audiofetcherdialog.h --- a/mmappcomponents/audiofetcher/inc/audiofetcherdialog.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/inc/audiofetcherdialog.h Wed Oct 13 15:06:09 2010 +0300 @@ -59,8 +59,7 @@ MMGFetchVerifier* aVerifier, const TDesC& aTitle, TBool aMultiSelectionEnabled, - TMediaFileType aMediaType, - const MDesCArray& aMimeTypeArray); + TMediaFileType aMediaType ); /** * Destructor. @@ -79,8 +78,7 @@ */ CAudioFetcherDialog( CDesCArray& aSelectedFiles, MMGFetchVerifier* aVerifier, const TDesC& aTitle, - TBool aMultiSelectionEnabled, TMediaFileType aMediaType, - const MDesCArray& aMimeTypeArray); + TBool aMultiSelectionEnabled, TMediaFileType aMediaType); private: @@ -250,9 +248,6 @@ CAknInputBlock* iInputBlock; TMediaFileType iMediaType; - - // Mine Type array - const MDesCArray& iMimeTypeArray; }; #endif // AUDIOFETCHERDIALOG_H diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/inc/audiofetcherfilehandler.h --- a/mmappcomponents/audiofetcher/inc/audiofetcherfilehandler.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/inc/audiofetcherfilehandler.h Wed Oct 13 15:06:09 2010 +0300 @@ -166,7 +166,6 @@ void SetObserver( MAudioFetcherFileHandlerObserver* aObserver ); void SetQueryId( TInt aId ); void EnableObserverCall( TBool aEnable ); - void SetMimeType( const MDesCArray& aMimeTypeArray ); public: TInt RomFileAttribute( TInt aIndex, TInt aAttr ); @@ -186,7 +185,6 @@ private: void ExcludeRomFilesL( CMdELogicCondition& aCondition ); - void MimeFilterL( CMdELogicCondition& aCondition ); private: void LeaveIfSessionClosedL(); @@ -229,9 +227,6 @@ // search result list - ui shows items from this list CSearchList* iSearchList; - - // Mime Type array - const MDesCArray* iMimeTypeArray; // metadata search text TBuf<128> iSearchText; diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/src/audiofetcher.cpp --- a/mmappcomponents/audiofetcher/src/audiofetcher.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/src/audiofetcher.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -101,11 +101,10 @@ // SetMimeTypesL // --------------------------------------------------------------------------- // -void CAudioFetcher::SetMimeTypesL( const MDesCArray& aMimeTypes ) +void CAudioFetcher::SetMimeTypesL( const MDesCArray& /*aMimeTypes*/ ) { - WLOG("CAudioFetcher::SetMimeTypesL"); - - iMimeTypeArray = &aMimeTypes; + WLOG("CAudioFetcher::SetMimeTypesL (not supported)"); + // No implementation required (not supported) } // --------------------------------------------------------------------------- @@ -198,8 +197,7 @@ // create the dialog first CAudioFetcherDialog* dialog = - CAudioFetcherDialog::NewL( aSelectedFiles, iVerifier, *iTitle, - iIsMultiSelection, aMediaType, *iMimeTypeArray ); + CAudioFetcherDialog::NewL( aSelectedFiles, iVerifier, *iTitle, iIsMultiSelection, aMediaType ); // Returns zero when Fetcher is cancelled by User. buttonId = dialog->ExecuteLD( R_MODAL_SINGLE_DIALOG ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/src/audiofetcherdialog.cpp --- a/mmappcomponents/audiofetcher/src/audiofetcherdialog.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/src/audiofetcherdialog.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -63,14 +63,12 @@ MMGFetchVerifier* aVerifier, const TDesC& aTitle, TBool aMultiSelectionEnabled, - TMediaFileType aMediaType, - const MDesCArray& aMimeTypeArray) + TMediaFileType aMediaType) : iSelectedFiles( aSelectedFiles ), iVerifier( aVerifier ), iTitle( aTitle ), iMultiSelectionEnabled(aMultiSelectionEnabled), - iMediaType(aMediaType), - iMimeTypeArray( aMimeTypeArray ) + iMediaType(aMediaType) { WLOG("CAudioFetcherDialog::CAudioFetcherDialog"); // No implementation required @@ -82,12 +80,12 @@ // CAudioFetcherDialog* CAudioFetcherDialog::NewL(CDesCArray& aSelectedFiles, MMGFetchVerifier* aVerifier, const TDesC& aTitle, TBool aMultiSelectionEnabled, - TMediaFileType aMediaType, const MDesCArray& aMimeTypeArray) + TMediaFileType aMediaType) { WLOG("CAudioFetcherDialog::NewL"); CAudioFetcherDialog* self= - new( ELeave ) CAudioFetcherDialog(aSelectedFiles, aVerifier, aTitle, - aMultiSelectionEnabled, aMediaType, aMimeTypeArray); + new( ELeave ) CAudioFetcherDialog( + aSelectedFiles, aVerifier, aTitle, aMultiSelectionEnabled, aMediaType ); CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop( self ); @@ -889,7 +887,7 @@ WLOG("CAudioFetcherDialog::QueryL: query in progress"); return; } - iFileHandler->SetMimeType( iMimeTypeArray ); + iFileHandler->EnableObserverCall( ETrue ); iFileHandler->SetQueryId( 0 ); iFileHandler->QueryAudioL(); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/audiofetcher/src/audiofetcherfilehandler.cpp --- a/mmappcomponents/audiofetcher/src/audiofetcherfilehandler.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/audiofetcher/src/audiofetcherfilehandler.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -376,7 +376,6 @@ iQuery->AddPropertyFilterL( &fileTypePropertyDef ); CMdELogicCondition& conditions = iQuery->Conditions(); - MimeFilterL( conditions ); ExcludeRomFilesL( conditions ); iQuery->SetResultMode( EQueryResultModeItem ); @@ -415,7 +414,6 @@ iQuery->AddPropertyFilterL( &fileTypePropertyDef ); CMdELogicCondition& conditions = iQuery->Conditions(); - MimeFilterL( conditions ); ExcludeRomFilesL( conditions ); // define sort order @@ -457,7 +455,6 @@ iQuery->AddPropertyFilterL( &fileTypePropertyDef ); CMdELogicCondition& conditions = iQuery->Conditions(); - MimeFilterL( conditions ); ExcludeRomFilesL( conditions ); iQuery->SetResultMode( EQueryResultModeItem ); @@ -703,45 +700,6 @@ cond.SetNegate( ETrue ); } -// ----------------------------------------------------------------------------- -// CAudioFetcherFileHandler::MimeFilterL -// -// ----------------------------------------------------------------------------- -// -void CAudioFetcherFileHandler::MimeFilterL( CMdELogicCondition& aCondition ) - { - WLOG("CAudioFetcherFileHandler::MimeFilterL"); - - if( iMimeTypeArray ) - { - if ( iMimeTypeArray->MdcaCount() > 0 ) - { - CMdELogicCondition& cond = - aCondition.AddLogicConditionL( ELogicConditionOperatorOr ); - for ( TInt i = 0; i < iMimeTypeArray->MdcaCount(); i++ ) - { - TPtrC ptr = iMimeTypeArray->MdcaPoint(i); - - cond.AddPropertyConditionL( - iSession->GetDefaultNamespaceDefL().GetObjectDefL( - MdeConstants::Image::KImageObject ).GetPropertyDefL( - MdeConstants::Object::KItemTypeProperty ), - ETextPropertyConditionCompareEquals, ptr ); - } - } - } - } - -// ----------------------------------------------------------------------------- -// CAudioFetcherFileHandler::SetMimeType -// -// ----------------------------------------------------------------------------- -// -void CAudioFetcherFileHandler::SetMimeType( const MDesCArray& aMimeTypeArray ) - { - WLOG("CAudioFetcherFileHandler::SetMimeType"); - iMimeTypeArray = &aMimeTypeArray; - } // ------------------------------------------------------------------------------- // CAudioFetcherFileHandler::StrCopy diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h --- a/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Wed Oct 13 15:06:09 2010 +0300 @@ -19,9 +19,6 @@ #ifndef CMPXCOLLECTIONHELPERIMP_H #define CMPXCOLLECTIONHELPERIMP_H -#include -#include - #include "mpxcollectionhelper.h" #include "mpxharvesterutilityobserver.h" #include "mpxmediatorobserver.h" @@ -44,8 +41,7 @@ NONSHARABLE_CLASS( CMPXCollectionHelperImp ): public CBase, public MMPXCollectionHelper, public MMPXHarvesterUtilityObserver, - public MMPXMediatorObserver, - public MThumbnailManagerObserver + public MMPXMediatorObserver { public: @@ -699,18 +695,6 @@ */ void HandleFileGetMediaCompletedL( CMPXMedia* aMedia, TInt aErr ); -public: - /** - * From MThumbnailManagerObserver - */ - void ThumbnailPreviewReady( MThumbnailData& aThumbnail, - TThumbnailRequestId aId ); - /** - * From MThumbnailManagerObserver - */ - void ThumbnailReady( TInt aError, - MThumbnailData& aThumbnail, - TThumbnailRequestId aId ); private: /** @@ -718,13 +702,6 @@ * @param aMedia media item to add to the collection */ void DoAddToCollectionL( CMPXMedia* aMedia ); - - /** - * Rename the thumbnail through thumbnail manager - * @param aOldUri exiting uri of the song - * @param aNewUri new uri of the song - */ - void RenameThumbnailL( const TDesC& aOldUri, const TDesC& aNewUri ); protected: @@ -743,8 +720,7 @@ MMPXHarvesterUtility* iHvsUtility; MMPXCollectionUtility* iCollectionUtil; CMPXCollectionMediator* iMediator; - - CThumbnailManager* iTNManager; // owned + MMPXCollectionHelperObserver* iObserver; // not owned TUid iMusicCollectionId; TBool iInitialized; diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp --- a/mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Extended collection helper with an internal caching array -* Version : %version: da1mmcf#27.1.12.1.4 % +* Version : %version: da1mmcf#27.1.12.1.2.1.3 % * */ @@ -53,6 +53,7 @@ _LIT( K3G2FileExt, ".3g2" ); _LIT( KODFFileExt, ".odf" ); _LIT( KO4AFileExt, ".o4a" ); +_LIT( KAACFileExt, ".aac" ); // ======== MEMBER FUNCTIONS ======== @@ -179,7 +180,7 @@ if( iCache->Count() >= cacheCount) Commit(); - #ifdef ABSTRACTAUDIOALBUM_INCLUDED +#ifdef ABSTRACTAUDIOALBUM_INCLUDED TBool extract = ETrue; if( aMedia->IsSupported( KMPXMediaMTPSampleDataFlag ) ) { @@ -1214,6 +1215,7 @@ // only do this for file that might not be natively supported by PC if ( ( parse.Ext().CompareF(K3GPFileExt) == 0 ) || ( parse.Ext().CompareF(K3G2FileExt) == 0 ) + || ( parse.Ext().CompareF(KAACFileExt) == 0 ) || ( parse.Ext().CompareF(KODFFileExt) == 0 ) || ( parse.Ext().CompareF(KO4AFileExt) == 0 ) ) { diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/collectionhelper/src/mpxcollectionhelperimp.cpp --- a/mmappcomponents/collectionhelper/src/mpxcollectionhelperimp.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/collectionhelper/src/mpxcollectionhelperimp.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -46,7 +45,6 @@ // --------------------------------------------------------------------------- // CMPXCollectionHelperImp::CMPXCollectionHelperImp() - : iTNManager(NULL) { } @@ -61,7 +59,7 @@ iCollectionUtil = MMPXCollectionUtility::NewL(); iMediator = CMPXCollectionMediator::NewL( iCollectionUtil->Collection(), this ); - + RArray ary; CleanupClosePushL( ary ); ary.AppendL( TUid::Uid(EMPXCollectionPluginMusic) ); @@ -113,8 +111,6 @@ iCollectionUtil->Close(); } delete iMediator; - - delete iTNManager; } @@ -420,28 +416,11 @@ RArray attributes; CleanupClosePushL( attributes ); attributes.AppendL(KMPXMediaGeneralId); - attributes.AppendL(KMPXMediaMusicAlbumArtFileName); CMPXMedia* media = GetL(aOldUri, attributes.Array(), aItemCat); CleanupStack::PopAndDestroy(&attributes); CleanupStack::PushL(media); - const TDesC& fileName(media->ValueText(KMPXMediaMusicAlbumArtFileName)); - - // the songs have embedded albumart. - if(fileName.CompareF(aOldUri) == 0) - { - // change the Art filename to the new Uri - media->SetTextValueL(KMPXMediaMusicAlbumArtFileName, aNewUri); - - // Rename the thumbnail - TRAPD(err, RenameThumbnailL(aOldUri, aNewUri)); - if(KErrNone != err) - { - MPX_DEBUG2("Thumbnail renames failed. Err: %d", err); - } - } - // change file path to the new file path media->SetTextValueL(KMPXMediaGeneralUri, aNewUri); @@ -756,41 +735,4 @@ delete this; } -// --------------------------------------------------------------------------- -// Rename the thumbnail through TNM -// --------------------------------------------------------------------------- -// -void CMPXCollectionHelperImp::RenameThumbnailL( const TDesC& aOldUri, - const TDesC& aNewUri ) - { - MPX_FUNC("CMPXCollectionHelperImp::RenameThumbnailL"); - - // Create Thumbnail Manager instance when use first time. - if(NULL == iTNManager) - { - iTNManager = CThumbnailManager::NewL( *this ); - } - - // Rename thumbnail - iTNManager->RenameThumbnailsL(aOldUri, aNewUri, 0); - } - -// --------------------------------------------------------------------------- -// CMPXDbAbstractAlbum::ThumbnailReady -// Callback but not used here -// --------------------------------------------------------------------------- -void CMPXCollectionHelperImp::ThumbnailPreviewReady( - MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ ) - { - } - - -// --------------------------------------------------------------------------- -// CMPXDbAbstractAlbum::ThumbnailReady -// Callback but not used here -// --------------------------------------------------------------------------- -void CMPXCollectionHelperImp::ThumbnailReady( TInt /*aError*/, - MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ ) - { - } // End of file diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/harvester/filehandler/inc/mpxdbcommon.h --- a/mmappcomponents/harvester/filehandler/inc/mpxdbcommon.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/harvester/filehandler/inc/mpxdbcommon.h Wed Oct 13 15:06:09 2010 +0300 @@ -24,11 +24,11 @@ // Please update the increment number for each increment // Please update the version number for each schema change #ifdef ABSTRACTAUDIOALBUM_INCLUDED -_LIT( KHarvesterDBName, "harvesterdbv10_2.dat" ); -_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_2i.dat" ); +_LIT( KHarvesterDBName, "harvesterdbv10_1.dat" ); +_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_1i.dat" ); #else -_LIT( KHarvesterDBName, "harvesterdbv10_2n.dat" ); -_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_2in.dat" ); +_LIT( KHarvesterDBName, "harvesterdbv10_1n.dat" ); +_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_1in.dat" ); #endif _LIT( KHarvesterDBPattern, "harvesterdbv*.dat" ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/harvester/metadataextractor/src/mpxfileinfoutility.cpp --- a/mmappcomponents/harvester/metadataextractor/src/mpxfileinfoutility.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/harvester/metadataextractor/src/mpxfileinfoutility.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: This class is responsible for reading file info -* Version : %version: e003sa33#5.1.3.1.10 % << Don't touch! Updated by Synergy at check-out. +* Version : %version: da1mmcf#5.1.3.1.8 % << Don't touch! Updated by Synergy at check-out. * * Copyright © 2005 Nokia. All rights reserved. */ @@ -81,8 +81,8 @@ iMMFControllers.ResetAndDestroy(); iMMFControllers.Close(); - //delete non cached Helix controller - if( iController && ( iCurrentControllerUid == 0x10207B65 ) ) + // delete non cached controller + if(iController) { iController->Close(); delete iController; @@ -163,6 +163,9 @@ buf->Ptr(0), dataSource)); + MPX_DEBUG1("CMPXFileInfoUtility::OpenFileL()- AddDataSink()"); + User::LeaveIfError(iController->AddDataSink(KUidMmfAudioOutput, + KNullDesC8)); CleanupStack::PopAndDestroy(buf); MPX_DEBUG1("CMPXFileInfoUtility::OpenFileL()--->"); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/harvester/metadataextractor/src/mpxmetadataextractor.cpp --- a/mmappcomponents/harvester/metadataextractor/src/mpxmetadataextractor.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/harvester/metadataextractor/src/mpxmetadataextractor.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Extracts metadata from a file -* Version : %version: da1mmcf#38.1.4.2.6.1.17 % << Don't touch! Updated by Synergy at check-out. +* Version : %version: da1mmcf#38.1.4.2.6.1.14 % << Don't touch! Updated by Synergy at check-out. * */ @@ -254,10 +254,6 @@ // URL aMediaProp.SetTextValueL( KMPXMediaMusicURL, KNullDesC ); - // AlbumArtist - aMediaProp.SetTextValueL( KMPXMediaMusicAlbumArtist, - KNullDesC ); - } // --------------------------------------------------------------------------- @@ -436,62 +432,6 @@ } break; } - case EMetaDataSampleRate: - { - const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType ); - MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType); - - // Verify if WMA, get the sample rate - if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 ) - { - MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA"); - - // Perform the sample rate conversion - TLex lexer( *value ); - TInt32 sampleRate ( 0 ); - lexer.Val( sampleRate ); - - iMedia->SetTObjectValueL( KMPXMediaAudioSamplerate, - sampleRate ); - - MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- sample rate = %i", sampleRate); - } - break; - } - case EMetaDataBitRate: - { - const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType ); - MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType); - - // Verify if WMA, get the duration - if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 ) - { - MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA"); - - // Perform the duration conversion - TLex lexer( *value ); - TInt32 bitRate ( 0 ); - lexer.Val( bitRate ); - - iMedia->SetTObjectValueL( KMPXMediaAudioBitrate, - bitRate ); - - MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- duration = %i", bitRate); - } - break; - } - case EMetaDataAlbumArtist: - { - TPtr valptr = value->Des(); - valptr.Trim(); - TInt vallen = value->Length(); - if (vallen>0) - { - FindAndReplaceForbiddenChars(valptr, vallen); - iMedia->SetTextValueL(KMPXMediaMusicAlbumArtist, *value); - } - break; - } case EMetaDataOriginalArtist: // fall through case EMetaDataVendor: // fall through case EMetaDataRating: // fall through @@ -942,20 +882,7 @@ { TDataType dataType; TUid dummyUid(KNullUid); - // File handle based mime type recogniton required , because AppArc does - // not have All Files capa required for files in private folders - TDataRecognitionResult result; - RFs fs; - RFile rFile; - User::LeaveIfError(fs.Connect()); - CleanupClosePushL(fs); - User::LeaveIfError(fs.ShareProtected()); - User::LeaveIfError(rFile.Open(fs, iFileName, EFileShareReadersOrWriters)); - CleanupClosePushL(rFile); - User::LeaveIfError(iAppArc.RecognizeData(rFile, result)); - CleanupStack::PopAndDestroy(&rFile); - CleanupStack::PopAndDestroy(&fs); - dataType = result.iDataType; + iAppArc.AppForDocument(iFileName, dummyUid, dataType); iMedia->SetTextValueL( KMPXMediaGeneralMimeType,dataType.Des() ); } diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectproplist.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectproplist.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectproplist.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -124,7 +124,7 @@ PRINT2( _L( "MM MTP <> EMTPObjectPropCodeRepresentativeSampleData sampleFile.Size size=%d, err=%d" ), size, err ); if( err == KErrNone && size > 0 ) { - HBufC8* sampleData = HBufC8::NewLC( size ); // + sampleData + HBufC8* sampleData = HBufC8::NewLC( size * sizeof( TUint8 ) ); // + sampleData TPtr8 samplePtr = sampleData->Des(); err = sampleFile.Read( samplePtr ); PRINT1( _L( "MM MTP <> EMTPObjectPropCodeRepresentativeSampleData sampleFile.Read err=%d" ), err ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectpropvalue.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectpropvalue.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectpropvalue.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -126,7 +126,7 @@ if( size > 0 ) { - HBufC8* sampleData = HBufC8::NewLC( size ); // + sampleData + HBufC8* sampleData = HBufC8::NewLC( size * sizeof(TUint8) ); // + sampleData TPtr8 samplePtr = sampleData->Des(); User::LeaveIfError( sampleFile.Read( samplePtr ) ); iMTPTypeArray->SetByDesL( samplePtr ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidercopyobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidercopyobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidercopyobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -222,6 +222,10 @@ { iPropertyElement = NULL; } + else + { + User::LeaveIfError( err ); + } PRINT( _L( "MM MTP <= CMediaMtpDataProviderCopyObject::ServiceSpecificObjectPropertyL" ) ); } diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/bwins/mmmtpdprequestprocessoru.def --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/bwins/mmmtpdprequestprocessoru.def Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/bwins/mmmtpdprequestprocessoru.def Wed Oct 13 15:06:09 2010 +0300 @@ -8,144 +8,143 @@ ?UpdateMusicCollectionL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 7 NONAME ; void CMmMtpDpMetadataAccessWrapper::UpdateMusicCollectionL(class TDesC16 const &) ?Release@CRequestProcessor@@MAEXXZ @ 8 NONAME ; void CRequestProcessor::Release(void) ?HandleRequestL@CRequestProcessor@@MAEHABVTMTPTypeRequest@@W4TMTPTransactionPhase@@@Z @ 9 NONAME ; int CRequestProcessor::HandleRequestL(class TMTPTypeRequest const &, enum TMTPTransactionPhase) - ?DoHandleCompletingPhaseL@CDeleteObject@@MAEHXZ @ 10 NONAME ; int CDeleteObject::DoHandleCompletingPhaseL(void) - ??1CGetInterdependentPropDesc@@UAE@XZ @ 11 NONAME ; CGetInterdependentPropDesc::~CGetInterdependentPropDesc(void) - ?OpenSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 12 NONAME ; void CMmMtpDpAccessSingleton::OpenSessionL(void) - ?ServiceL@CGetPartialObject@@MAEXXZ @ 13 NONAME ; void CGetPartialObject::ServiceL(void) - ?DoHandleResponsePhaseL@CRequestProcessor@@MAEHXZ @ 14 NONAME ; int CRequestProcessor::DoHandleResponsePhaseL(void) - ?NewL@CGetObjectPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 15 NONAME ; class MMmRequestProcessor * CGetObjectPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ??0CGetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 16 NONAME ; CGetObjectPropValue::CGetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?CheckRequestL@CSetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 17 NONAME ; enum TMTPResponseCode CSetObjectPropList::CheckRequestL(void) - ?RunL@CRequestProcessor@@MAEXXZ @ 18 NONAME ; void CRequestProcessor::RunL(void) - ?ServiceL@CDeleteObject@@MAEXXZ @ 19 NONAME ; void CDeleteObject::ServiceL(void) - ?DoCancel@CSetObjectPropList@@MAEXXZ @ 20 NONAME ; void CSetObjectPropList::DoCancel(void) - ?CleanupDatabaseL@CMmMtpDpMetadataAccessWrapper@@QAEXXZ @ 21 NONAME ; void CMmMtpDpMetadataAccessWrapper::CleanupDatabaseL(void) - ?ServiceL@CGetObjectPropsSupported@@MAEXXZ @ 22 NONAME ; void CGetObjectPropsSupported::ServiceL(void) - ?NewL@CSetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 23 NONAME ; class MMmRequestProcessor * CSetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?Release@CMmMtpDpAccessSingleton@@SAXXZ @ 24 NONAME ; void CMmMtpDpAccessSingleton::Release(void) - ?UsbDisconnect@CSendObject@@MAEXXZ @ 25 NONAME ; void CSendObject::UsbDisconnect(void) - ?ServiceL@CGetFormatCapabilities@@MAEXXZ @ 26 NONAME ; void CGetFormatCapabilities::ServiceL(void) - ??1CSetObjectPropList@@UAE@XZ @ 27 NONAME ; CSetObjectPropList::~CSetObjectPropList(void) - ?ServiceL@CSetObjectPropList@@MAEXXZ @ 28 NONAME ; void CSetObjectPropList::ServiceL(void) - ??0CMoveObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 29 NONAME ; CMoveObject::CMoveObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?ConstructL@CGetObjectPropList@@IAEXXZ @ 30 NONAME ; void CGetObjectPropList::ConstructL(void) - ??1CSendObject@@UAE@XZ @ 31 NONAME ; CSendObject::~CSendObject(void) - ?ServiceMetaDataFromWrapperL@CGetObjectPropValue@@IAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 32 NONAME ; void CGetObjectPropValue::ServiceMetaDataFromWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) - ?NewL@CGetObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 33 NONAME ; class MMmRequestProcessor * CGetObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ??1CGetObjectPropValue@@UAE@XZ @ 34 NONAME ; CGetObjectPropValue::~CGetObjectPropValue(void) - ?ActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 35 NONAME ; void CMmMtpDpAccessSingleton::ActiveToIdleStatusChange(void) - ?CreateL@CMmMtpDpAccessSingleton@@SAXAAVMMTPDataProviderFramework@@@Z @ 36 NONAME ; void CMmMtpDpAccessSingleton::CreateL(class MMTPDataProviderFramework &) - ??1CGetFormatCapabilities@@UAE@XZ @ 37 NONAME ; CGetFormatCapabilities::~CGetFormatCapabilities(void) - ?ServiceL@CSetObjectReferences@@EAEXXZ @ 38 NONAME ; void CSetObjectReferences::ServiceL(void) - ?DoHandleDataIToRPhaseL@CRequestProcessor@@MAEHXZ @ 39 NONAME ; int CRequestProcessor::DoHandleDataIToRPhaseL(void) - ??0CGetObjectPropList@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 40 NONAME ; CGetObjectPropList::CGetObjectPropList(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?ConstructL@CCopyObject@@IAEXXZ @ 41 NONAME ; void CCopyObject::ConstructL(void) - ?SetMetaDataToWrapper@CPropertySettingUtility@@QAE?AW4TMTPResponseCode@@AAVMMmMtpDpConfig@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 42 NONAME ; enum TMTPResponseCode CPropertySettingUtility::SetMetaDataToWrapper(class MMmMtpDpConfig &, unsigned short, class MMTPType &, class CMTPObjectMetaData const &) - ?ServiceL@CGetObjectPropValue@@MAEXXZ @ 43 NONAME ; void CGetObjectPropValue::ServiceL(void) - ??1CRenameObject@@UAE@XZ @ 44 NONAME ; CRenameObject::~CRenameObject(void) - ?Match@CRequestProcessor@@MBEHABVTMTPTypeEvent@@AAVMMTPConnection@@@Z @ 45 NONAME ; int CRequestProcessor::Match(class TMTPTypeEvent const &, class MMTPConnection &) const - ?DoHandleCompletingPhaseL@CSendObject@@MAEHXZ @ 46 NONAME ; int CSendObject::DoHandleCompletingPhaseL(void) - ?GetDrmStatus@MmMtpDpUtility@@SAHABVTDesC16@@@Z @ 47 NONAME ; int MmMtpDpUtility::GetDrmStatus(class TDesC16 const &) - ?RunL@CRenameObject@@MAEXXZ @ 48 NONAME ; void CRenameObject::RunL(void) - ?SetPSStatus@MmMtpDpUtility@@SAXW4TMtpPSStatus@@@Z @ 49 NONAME ; void MmMtpDpUtility::SetPSStatus(enum TMtpPSStatus) - ??0CRequestProcessor@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@HPBUTMTPRequestElementInfo@@@Z @ 50 NONAME ; CRequestProcessor::CRequestProcessor(class MMTPDataProviderFramework &, class MMTPConnection &, int, struct TMTPRequestElementInfo const *) - ?ServiceL@CSendObject@@MAEXXZ @ 51 NONAME ; void CSendObject::ServiceL(void) - ?Request@CRequestProcessor@@MBEABVTMTPTypeRequest@@XZ @ 52 NONAME ; class TMTPTypeRequest const & CRequestProcessor::Request(void) const - ?CheckRequestL@CGetPartialObject@@MAE?AW4TMTPResponseCode@@XZ @ 53 NONAME ; enum TMTPResponseCode CGetPartialObject::CheckRequestL(void) - ?DoCancel@CRequestProcessor@@MAEXXZ @ 54 NONAME ; void CRequestProcessor::DoCancel(void) - ?NewL@CRequestUnknown@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@@Z @ 55 NONAME ; class MMmRequestProcessor * CRequestUnknown::NewL(class MMTPDataProviderFramework &, class MMTPConnection &) - ?ConstructL@CGetObjectInfo@@AAEXXZ @ 56 NONAME ; void CGetObjectInfo::ConstructL(void) - ?UsbDisconnect@CRequestProcessor@@MAEXXZ @ 57 NONAME ; void CRequestProcessor::UsbDisconnect(void) - ??1CMoveObject@@UAE@XZ @ 58 NONAME ; CMoveObject::~CMoveObject(void) - ?CheckRequestL@CSendObject@@MAE?AW4TMTPResponseCode@@XZ @ 59 NONAME ; enum TMTPResponseCode CSendObject::CheckRequestL(void) - ??1CRequestProcessor@@MAE@XZ @ 60 NONAME ; CRequestProcessor::~CRequestProcessor(void) - ?DoCancel@CDeleteObject@@MAEXXZ @ 61 NONAME ; void CDeleteObject::DoCancel(void) - ??1CGetObject@@UAE@XZ @ 62 NONAME ; CGetObject::~CGetObject(void) - ?NewL@CGetInterdependentPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 63 NONAME ; class MMmRequestProcessor * CGetInterdependentPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?AddObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@@Z @ 64 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddObjectL(class CMTPObjectMetaData const &) - ?DoHandleResponsePhaseL@CSetObjectReferences@@EAEHXZ @ 65 NONAME ; int CSetObjectReferences::DoHandleResponsePhaseL(void) - ?GetAccessWrapperL@CMmMtpDpAccessSingleton@@SAAAVCMmMtpDpMetadataAccessWrapper@@XZ @ 66 NONAME ; class CMmMtpDpMetadataAccessWrapper & CMmMtpDpAccessSingleton::GetAccessWrapperL(void) - ??1CGetObjectPropsSupported@@UAE@XZ @ 67 NONAME ; CGetObjectPropsSupported::~CGetObjectPropsSupported(void) - ?CheckRequestL@CGetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 68 NONAME ; enum TMTPResponseCode CGetObjectPropList::CheckRequestL(void) - ?HasDataphase@CRequestProcessor@@MBEHXZ @ 69 NONAME ; int CRequestProcessor::HasDataphase(void) const - ?NewL@CGetObjectPropsSupported@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 70 NONAME ; class MMmRequestProcessor * CGetObjectPropsSupported::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?Connection@CRequestProcessor@@MBEAAVMMTPConnection@@XZ @ 71 NONAME ; class MMTPConnection & CRequestProcessor::Connection(void) const - ??1CPropertySettingUtility@@UAE@XZ @ 72 NONAME ; CPropertySettingUtility::~CPropertySettingUtility(void) - ??1CGetPartialObject@@UAE@XZ @ 73 NONAME ; CGetPartialObject::~CGetPartialObject(void) - ?NewL@CGetObjectInfo@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 74 NONAME ; class MMmRequestProcessor * CGetObjectInfo::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?RunError@CSetObjectPropList@@MAEHH@Z @ 75 NONAME ; int CSetObjectPropList::RunError(int) - ?CheckRequestL@CGetInterdependentPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 76 NONAME ; enum TMTPResponseCode CGetInterdependentPropDesc::CheckRequestL(void) - ?Match@CRequestUnknown@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 77 NONAME ; int CRequestUnknown::Match(class TMTPTypeRequest const &, class MMTPConnection &) const - ?ServiceL@CMoveObject@@MAEXXZ @ 78 NONAME ; void CMoveObject::ServiceL(void) - ?CreateDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 79 NONAME ; void CMmMtpDpMetadataAccessWrapper::CreateDummyFile(class TDesC16 const &) - ?CheckRequestL@CGetObjectPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 80 NONAME ; enum TMTPResponseCode CGetObjectPropDesc::CheckRequestL(void) - ?DoHandleRToIPhaseL@CRequestProcessor@@MAEHXZ @ 81 NONAME ; int CRequestProcessor::DoHandleRToIPhaseL(void) - ?ServiceMetaDataToWrapperL@CSetObjectPropValue@@IAE?AW4TMTPResponseCode@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 82 NONAME ; enum TMTPResponseCode CSetObjectPropValue::ServiceMetaDataToWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) - ?FormatFromFilename@MmMtpDpUtility@@SA?AW4TMTPFormatCode@@ABVTDesC16@@@Z @ 83 NONAME ; enum TMTPFormatCode MmMtpDpUtility::FormatFromFilename(class TDesC16 const &) - ?GetAllReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 84 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &) - ?CheckRequestL@CSetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 85 NONAME ; enum TMTPResponseCode CSetObjectPropValue::CheckRequestL(void) - ??0CPropertySettingUtility@@IAE@XZ @ 86 NONAME ; CPropertySettingUtility::CPropertySettingUtility(void) - ?Match@CRequestProcessor@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 87 NONAME ; int CRequestProcessor::Match(class TMTPTypeRequest const &, class MMTPConnection &) const - ??0CCopyObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 88 NONAME ; CCopyObject::CCopyObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?CheckRequestL@CRequestProcessor@@MAE?AW4TMTPResponseCode@@XZ @ 89 NONAME ; enum TMTPResponseCode CRequestProcessor::CheckRequestL(void) - ?SendResponseL@CRequestProcessor@@IAEXW4TMTPResponseCode@@HPAK@Z @ 90 NONAME ; void CRequestProcessor::SendResponseL(enum TMTPResponseCode, int, unsigned long *) - ?CancelActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 91 NONAME ; void CMmMtpDpAccessSingleton::CancelActiveToIdleStatusChange(void) - ?DoHandleCompletingPhaseL@CRequestProcessor@@MAEHXZ @ 92 NONAME ; int CRequestProcessor::DoHandleCompletingPhaseL(void) - ?DeleteDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 93 NONAME ; void CMmMtpDpMetadataAccessWrapper::DeleteDummyFile(class TDesC16 const &) - ??1CGetObjectInfo@@UAE@XZ @ 94 NONAME ; CGetObjectInfo::~CGetObjectInfo(void) - ?ServiceL@CRequestUnknown@@MAEXXZ @ 95 NONAME ; void CRequestUnknown::ServiceL(void) - ?HasDataphase@CSetObjectPropList@@MBEHXZ @ 96 NONAME ; int CSetObjectPropList::HasDataphase(void) const - ?NewL@CGetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 97 NONAME ; class MMmRequestProcessor * CGetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?DoCancel@CRenameObject@@MAEXXZ @ 98 NONAME ; void CRenameObject::DoCancel(void) - ??1CSetObjectReferences@@UAE@XZ @ 99 NONAME ; CSetObjectReferences::~CSetObjectReferences(void) - ?Match@CSendObject@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 100 NONAME ; int CSendObject::Match(class TMTPTypeRequest const &, class MMTPConnection &) const - ?NewL@CSetObjectPropList@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 101 NONAME ; class MMmRequestProcessor * CSetObjectPropList::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ??1CCopyObject@@UAE@XZ @ 102 NONAME ; CCopyObject::~CCopyObject(void) - ?GetModifiedContentL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAHAAVCDesC16Array@@@Z @ 103 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetModifiedContentL(class TDesC16 const &, int &, class CDesC16Array &) - ?RunL@CGetObjectPropList@@MAEXXZ @ 104 NONAME ; void CGetObjectPropList::RunL(void) - ?NewRangeFormDescriptionL@CDescriptionUtility@@QAEPAVCMTPTypeObjectPropDesc@@GKKKH@Z @ 105 NONAME ; class CMTPTypeObjectPropDesc * CDescriptionUtility::NewRangeFormDescriptionL(unsigned short, unsigned long, unsigned long, unsigned long, int) - ?RunError@CRequestProcessor@@MAEHH@Z @ 106 NONAME ; int CRequestProcessor::RunError(int) - ?SessionId@CRequestProcessor@@MAEKXZ @ 107 NONAME ; unsigned long CRequestProcessor::SessionId(void) - ??0CDescriptionUtility@@IAE@XZ @ 108 NONAME ; CDescriptionUtility::CDescriptionUtility(void) - ?HandleEventL@CRequestProcessor@@MAEXABVTMTPTypeEvent@@@Z @ 109 NONAME ; void CRequestProcessor::HandleEventL(class TMTPTypeEvent const &) - ?NewL@CGetPartialObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 110 NONAME ; class MMmRequestProcessor * CGetPartialObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?HasDataphase@CSetObjectReferences@@EBEHXZ @ 111 NONAME ; int CSetObjectReferences::HasDataphase(void) const - ?RunError@CGetObjectPropList@@MAEHH@Z @ 112 NONAME ; int CGetObjectPropList::RunError(int) - ?DoHandleResponsePhaseL@CSetObjectPropList@@MAEHXZ @ 113 NONAME ; int CSetObjectPropList::DoHandleResponsePhaseL(void) - ?NewL@CRenameObject@@SAPAV1@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 114 NONAME ; class CRenameObject * CRenameObject::NewL(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &) - ?RenameObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@ABVTDesC16@@@Z @ 115 NONAME ; void CMmMtpDpMetadataAccessWrapper::RenameObjectL(class CMTPObjectMetaData const &, class TDesC16 const &) - ?GetObjectMetadataValueL@CMmMtpDpMetadataAccessWrapper@@QAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 116 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetObjectMetadataValueL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) - ?GetAllAbstractMediaL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAVCDesC16Array@@W4TMPXGeneralCategory@@@Z @ 117 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllAbstractMediaL(class TDesC16 const &, class CDesC16Array &, enum TMPXGeneralCategory) - ?AddDummyFileL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 118 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddDummyFileL(class TDesC16 const &) - ??1CGetObjectPropDesc@@UAE@XZ @ 119 NONAME ; CGetObjectPropDesc::~CGetObjectPropDesc(void) - ?ServiceL@CGetObjectPropDesc@@MAEXXZ @ 120 NONAME ; void CGetObjectPropDesc::ServiceL(void) - ?HasDataphase@CSetObjectPropValue@@MBEHXZ @ 121 NONAME ; int CSetObjectPropValue::HasDataphase(void) const - ?ServiceL@CCopyObject@@MAEXXZ @ 122 NONAME ; void CCopyObject::ServiceL(void) - ?CheckRequestL@CGetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 123 NONAME ; enum TMTPResponseCode CGetObjectPropValue::CheckRequestL(void) - ?CloseSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 124 NONAME ; void CMmMtpDpAccessSingleton::CloseSessionL(void) - ?NewL@CGetFormatCapabilities@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 125 NONAME ; class MMmRequestProcessor * CGetFormatCapabilities::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?ReceiveDataL@CRequestProcessor@@IAEXAAVMMTPType@@@Z @ 126 NONAME ; void CRequestProcessor::ReceiveDataL(class MMTPType &) - ??1CDescriptionUtility@@UAE@XZ @ 127 NONAME ; CDescriptionUtility::~CDescriptionUtility(void) - ?ConstructL@CMoveObject@@IAEXXZ @ 128 NONAME ; void CMoveObject::ConstructL(void) - ?NewL@CSendObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 129 NONAME ; class MMmRequestProcessor * CSendObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ?RunL@CSetObjectPropList@@MAEXXZ @ 130 NONAME ; void CSetObjectPropList::RunL(void) - ??1CGetObjectReferences@@UAE@XZ @ 131 NONAME ; CGetObjectReferences::~CGetObjectReferences(void) - ?HasDataphase@CSendObject@@MBEHXZ @ 132 NONAME ; int CSendObject::HasDataphase(void) const - ??1CSetObjectPropValue@@UAE@XZ @ 133 NONAME ; CSetObjectPropValue::~CSetObjectPropValue(void) - ?ConstructL@CRenameObject@@IAEXXZ @ 134 NONAME ; void CRenameObject::ConstructL(void) - ?DoHandleResponsePhaseL@CSendObject@@MAEHXZ @ 135 NONAME ; int CSendObject::DoHandleResponsePhaseL(void) - ?SendDataL@CRequestProcessor@@IAEXABVMMTPType@@@Z @ 136 NONAME ; void CRequestProcessor::SendDataL(class MMTPType const &) - ?SetReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 137 NONAME ; void CMmMtpDpMetadataAccessWrapper::SetReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &) - ?DoCancel@CGetObjectPropList@@MAEXXZ @ 138 NONAME ; void CGetObjectPropList::DoCancel(void) - ?ServiceL@CGetInterdependentPropDesc@@MAEXXZ @ 139 NONAME ; void CGetInterdependentPropDesc::ServiceL(void) - ?DoHandleRequestPhaseL@CRequestProcessor@@MAEHXZ @ 140 NONAME ; int CRequestProcessor::DoHandleRequestPhaseL(void) - ?ServiceL@CSetObjectPropValue@@MAEXXZ @ 141 NONAME ; void CSetObjectPropValue::ServiceL(void) - ?RunError@CRenameObject@@MAEHH@Z @ 142 NONAME ; int CRenameObject::RunError(int) - ??1CDeleteObject@@UAE@XZ @ 143 NONAME ; CDeleteObject::~CDeleteObject(void) - ?DoHandleResponsePhaseL@CGetPartialObject@@MAEHXZ @ 144 NONAME ; int CGetPartialObject::DoHandleResponsePhaseL(void) - ??0CSetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 145 NONAME ; CSetObjectPropValue::CSetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) - ??1CGetObjectPropList@@UAE@XZ @ 146 NONAME ; CGetObjectPropList::~CGetObjectPropList(void) - ?CheckRequestL@CGetFormatCapabilities@@MAE?AW4TMTPResponseCode@@XZ @ 147 NONAME ; enum TMTPResponseCode CGetFormatCapabilities::CheckRequestL(void) + ??1CGetInterdependentPropDesc@@UAE@XZ @ 10 NONAME ; CGetInterdependentPropDesc::~CGetInterdependentPropDesc(void) + ?OpenSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 11 NONAME ; void CMmMtpDpAccessSingleton::OpenSessionL(void) + ?ServiceL@CGetPartialObject@@MAEXXZ @ 12 NONAME ; void CGetPartialObject::ServiceL(void) + ?DoHandleResponsePhaseL@CRequestProcessor@@MAEHXZ @ 13 NONAME ; int CRequestProcessor::DoHandleResponsePhaseL(void) + ?NewL@CGetObjectPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 14 NONAME ; class MMmRequestProcessor * CGetObjectPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ??0CGetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 15 NONAME ; CGetObjectPropValue::CGetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?CheckRequestL@CSetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 16 NONAME ; enum TMTPResponseCode CSetObjectPropList::CheckRequestL(void) + ?RunL@CRequestProcessor@@MAEXXZ @ 17 NONAME ; void CRequestProcessor::RunL(void) + ?ServiceL@CDeleteObject@@MAEXXZ @ 18 NONAME ; void CDeleteObject::ServiceL(void) + ?DoCancel@CSetObjectPropList@@MAEXXZ @ 19 NONAME ; void CSetObjectPropList::DoCancel(void) + ?CleanupDatabaseL@CMmMtpDpMetadataAccessWrapper@@QAEXXZ @ 20 NONAME ; void CMmMtpDpMetadataAccessWrapper::CleanupDatabaseL(void) + ?ServiceL@CGetObjectPropsSupported@@MAEXXZ @ 21 NONAME ; void CGetObjectPropsSupported::ServiceL(void) + ?NewL@CSetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 22 NONAME ; class MMmRequestProcessor * CSetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?Release@CMmMtpDpAccessSingleton@@SAXXZ @ 23 NONAME ; void CMmMtpDpAccessSingleton::Release(void) + ?UsbDisconnect@CSendObject@@MAEXXZ @ 24 NONAME ; void CSendObject::UsbDisconnect(void) + ?ServiceL@CGetFormatCapabilities@@MAEXXZ @ 25 NONAME ; void CGetFormatCapabilities::ServiceL(void) + ??1CSetObjectPropList@@UAE@XZ @ 26 NONAME ; CSetObjectPropList::~CSetObjectPropList(void) + ?ServiceL@CSetObjectPropList@@MAEXXZ @ 27 NONAME ; void CSetObjectPropList::ServiceL(void) + ??0CMoveObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 28 NONAME ; CMoveObject::CMoveObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?ConstructL@CGetObjectPropList@@IAEXXZ @ 29 NONAME ; void CGetObjectPropList::ConstructL(void) + ??1CSendObject@@UAE@XZ @ 30 NONAME ; CSendObject::~CSendObject(void) + ?ServiceMetaDataFromWrapperL@CGetObjectPropValue@@IAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 31 NONAME ; void CGetObjectPropValue::ServiceMetaDataFromWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) + ?NewL@CGetObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 32 NONAME ; class MMmRequestProcessor * CGetObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ??1CGetObjectPropValue@@UAE@XZ @ 33 NONAME ; CGetObjectPropValue::~CGetObjectPropValue(void) + ?ActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 34 NONAME ; void CMmMtpDpAccessSingleton::ActiveToIdleStatusChange(void) + ?CreateL@CMmMtpDpAccessSingleton@@SAXAAVMMTPDataProviderFramework@@@Z @ 35 NONAME ; void CMmMtpDpAccessSingleton::CreateL(class MMTPDataProviderFramework &) + ??1CGetFormatCapabilities@@UAE@XZ @ 36 NONAME ; CGetFormatCapabilities::~CGetFormatCapabilities(void) + ?ServiceL@CSetObjectReferences@@EAEXXZ @ 37 NONAME ; void CSetObjectReferences::ServiceL(void) + ?DoHandleDataIToRPhaseL@CRequestProcessor@@MAEHXZ @ 38 NONAME ; int CRequestProcessor::DoHandleDataIToRPhaseL(void) + ??0CGetObjectPropList@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 39 NONAME ; CGetObjectPropList::CGetObjectPropList(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?ConstructL@CCopyObject@@IAEXXZ @ 40 NONAME ; void CCopyObject::ConstructL(void) + ?SetMetaDataToWrapper@CPropertySettingUtility@@QAE?AW4TMTPResponseCode@@AAVMMmMtpDpConfig@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 41 NONAME ; enum TMTPResponseCode CPropertySettingUtility::SetMetaDataToWrapper(class MMmMtpDpConfig &, unsigned short, class MMTPType &, class CMTPObjectMetaData const &) + ?ServiceL@CGetObjectPropValue@@MAEXXZ @ 42 NONAME ; void CGetObjectPropValue::ServiceL(void) + ??1CRenameObject@@UAE@XZ @ 43 NONAME ; CRenameObject::~CRenameObject(void) + ?Match@CRequestProcessor@@MBEHABVTMTPTypeEvent@@AAVMMTPConnection@@@Z @ 44 NONAME ; int CRequestProcessor::Match(class TMTPTypeEvent const &, class MMTPConnection &) const + ?DoHandleCompletingPhaseL@CSendObject@@MAEHXZ @ 45 NONAME ; int CSendObject::DoHandleCompletingPhaseL(void) + ?GetDrmStatus@MmMtpDpUtility@@SAHABVTDesC16@@@Z @ 46 NONAME ; int MmMtpDpUtility::GetDrmStatus(class TDesC16 const &) + ?RunL@CRenameObject@@MAEXXZ @ 47 NONAME ; void CRenameObject::RunL(void) + ?SetPSStatus@MmMtpDpUtility@@SAXW4TMtpPSStatus@@@Z @ 48 NONAME ; void MmMtpDpUtility::SetPSStatus(enum TMtpPSStatus) + ??0CRequestProcessor@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@HPBUTMTPRequestElementInfo@@@Z @ 49 NONAME ; CRequestProcessor::CRequestProcessor(class MMTPDataProviderFramework &, class MMTPConnection &, int, struct TMTPRequestElementInfo const *) + ?ServiceL@CSendObject@@MAEXXZ @ 50 NONAME ; void CSendObject::ServiceL(void) + ?Request@CRequestProcessor@@MBEABVTMTPTypeRequest@@XZ @ 51 NONAME ; class TMTPTypeRequest const & CRequestProcessor::Request(void) const + ?CheckRequestL@CGetPartialObject@@MAE?AW4TMTPResponseCode@@XZ @ 52 NONAME ; enum TMTPResponseCode CGetPartialObject::CheckRequestL(void) + ?DoCancel@CRequestProcessor@@MAEXXZ @ 53 NONAME ; void CRequestProcessor::DoCancel(void) + ?NewL@CRequestUnknown@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@@Z @ 54 NONAME ; class MMmRequestProcessor * CRequestUnknown::NewL(class MMTPDataProviderFramework &, class MMTPConnection &) + ?ConstructL@CGetObjectInfo@@AAEXXZ @ 55 NONAME ; void CGetObjectInfo::ConstructL(void) + ?UsbDisconnect@CRequestProcessor@@MAEXXZ @ 56 NONAME ; void CRequestProcessor::UsbDisconnect(void) + ??1CMoveObject@@UAE@XZ @ 57 NONAME ; CMoveObject::~CMoveObject(void) + ?CheckRequestL@CSendObject@@MAE?AW4TMTPResponseCode@@XZ @ 58 NONAME ; enum TMTPResponseCode CSendObject::CheckRequestL(void) + ??1CRequestProcessor@@MAE@XZ @ 59 NONAME ; CRequestProcessor::~CRequestProcessor(void) + ?DoCancel@CDeleteObject@@MAEXXZ @ 60 NONAME ; void CDeleteObject::DoCancel(void) + ??1CGetObject@@UAE@XZ @ 61 NONAME ; CGetObject::~CGetObject(void) + ?NewL@CGetInterdependentPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 62 NONAME ; class MMmRequestProcessor * CGetInterdependentPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?AddObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@@Z @ 63 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddObjectL(class CMTPObjectMetaData const &) + ?DoHandleResponsePhaseL@CSetObjectReferences@@EAEHXZ @ 64 NONAME ; int CSetObjectReferences::DoHandleResponsePhaseL(void) + ?GetAccessWrapperL@CMmMtpDpAccessSingleton@@SAAAVCMmMtpDpMetadataAccessWrapper@@XZ @ 65 NONAME ; class CMmMtpDpMetadataAccessWrapper & CMmMtpDpAccessSingleton::GetAccessWrapperL(void) + ??1CGetObjectPropsSupported@@UAE@XZ @ 66 NONAME ; CGetObjectPropsSupported::~CGetObjectPropsSupported(void) + ?CheckRequestL@CGetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 67 NONAME ; enum TMTPResponseCode CGetObjectPropList::CheckRequestL(void) + ?HasDataphase@CRequestProcessor@@MBEHXZ @ 68 NONAME ; int CRequestProcessor::HasDataphase(void) const + ?NewL@CGetObjectPropsSupported@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 69 NONAME ; class MMmRequestProcessor * CGetObjectPropsSupported::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?Connection@CRequestProcessor@@MBEAAVMMTPConnection@@XZ @ 70 NONAME ; class MMTPConnection & CRequestProcessor::Connection(void) const + ??1CPropertySettingUtility@@UAE@XZ @ 71 NONAME ; CPropertySettingUtility::~CPropertySettingUtility(void) + ??1CGetPartialObject@@UAE@XZ @ 72 NONAME ; CGetPartialObject::~CGetPartialObject(void) + ?NewL@CGetObjectInfo@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 73 NONAME ; class MMmRequestProcessor * CGetObjectInfo::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?RunError@CSetObjectPropList@@MAEHH@Z @ 74 NONAME ; int CSetObjectPropList::RunError(int) + ?CheckRequestL@CGetInterdependentPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 75 NONAME ; enum TMTPResponseCode CGetInterdependentPropDesc::CheckRequestL(void) + ?Match@CRequestUnknown@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 76 NONAME ; int CRequestUnknown::Match(class TMTPTypeRequest const &, class MMTPConnection &) const + ?ServiceL@CMoveObject@@MAEXXZ @ 77 NONAME ; void CMoveObject::ServiceL(void) + ?CreateDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 78 NONAME ; void CMmMtpDpMetadataAccessWrapper::CreateDummyFile(class TDesC16 const &) + ?CheckRequestL@CGetObjectPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 79 NONAME ; enum TMTPResponseCode CGetObjectPropDesc::CheckRequestL(void) + ?DoHandleRToIPhaseL@CRequestProcessor@@MAEHXZ @ 80 NONAME ; int CRequestProcessor::DoHandleRToIPhaseL(void) + ?ServiceMetaDataToWrapperL@CSetObjectPropValue@@IAE?AW4TMTPResponseCode@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 81 NONAME ; enum TMTPResponseCode CSetObjectPropValue::ServiceMetaDataToWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) + ?FormatFromFilename@MmMtpDpUtility@@SA?AW4TMTPFormatCode@@ABVTDesC16@@@Z @ 82 NONAME ; enum TMTPFormatCode MmMtpDpUtility::FormatFromFilename(class TDesC16 const &) + ?GetAllReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 83 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &) + ?CheckRequestL@CSetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 84 NONAME ; enum TMTPResponseCode CSetObjectPropValue::CheckRequestL(void) + ??0CPropertySettingUtility@@IAE@XZ @ 85 NONAME ; CPropertySettingUtility::CPropertySettingUtility(void) + ?Match@CRequestProcessor@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 86 NONAME ; int CRequestProcessor::Match(class TMTPTypeRequest const &, class MMTPConnection &) const + ??0CCopyObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 87 NONAME ; CCopyObject::CCopyObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?CheckRequestL@CRequestProcessor@@MAE?AW4TMTPResponseCode@@XZ @ 88 NONAME ; enum TMTPResponseCode CRequestProcessor::CheckRequestL(void) + ?SendResponseL@CRequestProcessor@@IAEXW4TMTPResponseCode@@HPAK@Z @ 89 NONAME ; void CRequestProcessor::SendResponseL(enum TMTPResponseCode, int, unsigned long *) + ?CancelActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 90 NONAME ; void CMmMtpDpAccessSingleton::CancelActiveToIdleStatusChange(void) + ?DoHandleCompletingPhaseL@CRequestProcessor@@MAEHXZ @ 91 NONAME ; int CRequestProcessor::DoHandleCompletingPhaseL(void) + ?DeleteDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 92 NONAME ; void CMmMtpDpMetadataAccessWrapper::DeleteDummyFile(class TDesC16 const &) + ??1CGetObjectInfo@@UAE@XZ @ 93 NONAME ; CGetObjectInfo::~CGetObjectInfo(void) + ?ServiceL@CRequestUnknown@@MAEXXZ @ 94 NONAME ; void CRequestUnknown::ServiceL(void) + ?HasDataphase@CSetObjectPropList@@MBEHXZ @ 95 NONAME ; int CSetObjectPropList::HasDataphase(void) const + ?NewL@CGetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 96 NONAME ; class MMmRequestProcessor * CGetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?DoCancel@CRenameObject@@MAEXXZ @ 97 NONAME ; void CRenameObject::DoCancel(void) + ??1CSetObjectReferences@@UAE@XZ @ 98 NONAME ; CSetObjectReferences::~CSetObjectReferences(void) + ?Match@CSendObject@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 99 NONAME ; int CSendObject::Match(class TMTPTypeRequest const &, class MMTPConnection &) const + ?NewL@CSetObjectPropList@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 100 NONAME ; class MMmRequestProcessor * CSetObjectPropList::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ??1CCopyObject@@UAE@XZ @ 101 NONAME ; CCopyObject::~CCopyObject(void) + ?GetModifiedContentL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAHAAVCDesC16Array@@@Z @ 102 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetModifiedContentL(class TDesC16 const &, int &, class CDesC16Array &) + ?RunL@CGetObjectPropList@@MAEXXZ @ 103 NONAME ; void CGetObjectPropList::RunL(void) + ?NewRangeFormDescriptionL@CDescriptionUtility@@QAEPAVCMTPTypeObjectPropDesc@@GKKKH@Z @ 104 NONAME ; class CMTPTypeObjectPropDesc * CDescriptionUtility::NewRangeFormDescriptionL(unsigned short, unsigned long, unsigned long, unsigned long, int) + ?RunError@CRequestProcessor@@MAEHH@Z @ 105 NONAME ; int CRequestProcessor::RunError(int) + ?SessionId@CRequestProcessor@@MAEKXZ @ 106 NONAME ; unsigned long CRequestProcessor::SessionId(void) + ??0CDescriptionUtility@@IAE@XZ @ 107 NONAME ; CDescriptionUtility::CDescriptionUtility(void) + ?HandleEventL@CRequestProcessor@@MAEXABVTMTPTypeEvent@@@Z @ 108 NONAME ; void CRequestProcessor::HandleEventL(class TMTPTypeEvent const &) + ?NewL@CGetPartialObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 109 NONAME ; class MMmRequestProcessor * CGetPartialObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?HasDataphase@CSetObjectReferences@@EBEHXZ @ 110 NONAME ; int CSetObjectReferences::HasDataphase(void) const + ?RunError@CGetObjectPropList@@MAEHH@Z @ 111 NONAME ; int CGetObjectPropList::RunError(int) + ?DoHandleResponsePhaseL@CSetObjectPropList@@MAEHXZ @ 112 NONAME ; int CSetObjectPropList::DoHandleResponsePhaseL(void) + ?NewL@CRenameObject@@SAPAV1@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 113 NONAME ; class CRenameObject * CRenameObject::NewL(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &) + ?RenameObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@ABVTDesC16@@@Z @ 114 NONAME ; void CMmMtpDpMetadataAccessWrapper::RenameObjectL(class CMTPObjectMetaData const &, class TDesC16 const &) + ?GetObjectMetadataValueL@CMmMtpDpMetadataAccessWrapper@@QAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 115 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetObjectMetadataValueL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &) + ?GetAllAbstractMediaL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAVCDesC16Array@@W4TMPXGeneralCategory@@@Z @ 116 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllAbstractMediaL(class TDesC16 const &, class CDesC16Array &, enum TMPXGeneralCategory) + ?AddDummyFileL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 117 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddDummyFileL(class TDesC16 const &) + ??1CGetObjectPropDesc@@UAE@XZ @ 118 NONAME ; CGetObjectPropDesc::~CGetObjectPropDesc(void) + ?ServiceL@CGetObjectPropDesc@@MAEXXZ @ 119 NONAME ; void CGetObjectPropDesc::ServiceL(void) + ?HasDataphase@CSetObjectPropValue@@MBEHXZ @ 120 NONAME ; int CSetObjectPropValue::HasDataphase(void) const + ?ServiceL@CCopyObject@@MAEXXZ @ 121 NONAME ; void CCopyObject::ServiceL(void) + ?CheckRequestL@CGetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 122 NONAME ; enum TMTPResponseCode CGetObjectPropValue::CheckRequestL(void) + ?CloseSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 123 NONAME ; void CMmMtpDpAccessSingleton::CloseSessionL(void) + ?NewL@CGetFormatCapabilities@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 124 NONAME ; class MMmRequestProcessor * CGetFormatCapabilities::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?ReceiveDataL@CRequestProcessor@@IAEXAAVMMTPType@@@Z @ 125 NONAME ; void CRequestProcessor::ReceiveDataL(class MMTPType &) + ??1CDescriptionUtility@@UAE@XZ @ 126 NONAME ; CDescriptionUtility::~CDescriptionUtility(void) + ?ConstructL@CMoveObject@@IAEXXZ @ 127 NONAME ; void CMoveObject::ConstructL(void) + ?NewL@CSendObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 128 NONAME ; class MMmRequestProcessor * CSendObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ?RunL@CSetObjectPropList@@MAEXXZ @ 129 NONAME ; void CSetObjectPropList::RunL(void) + ??1CGetObjectReferences@@UAE@XZ @ 130 NONAME ; CGetObjectReferences::~CGetObjectReferences(void) + ?HasDataphase@CSendObject@@MBEHXZ @ 131 NONAME ; int CSendObject::HasDataphase(void) const + ??1CSetObjectPropValue@@UAE@XZ @ 132 NONAME ; CSetObjectPropValue::~CSetObjectPropValue(void) + ?ConstructL@CRenameObject@@IAEXXZ @ 133 NONAME ; void CRenameObject::ConstructL(void) + ?DoHandleResponsePhaseL@CSendObject@@MAEHXZ @ 134 NONAME ; int CSendObject::DoHandleResponsePhaseL(void) + ?SendDataL@CRequestProcessor@@IAEXABVMMTPType@@@Z @ 135 NONAME ; void CRequestProcessor::SendDataL(class MMTPType const &) + ?SetReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 136 NONAME ; void CMmMtpDpMetadataAccessWrapper::SetReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &) + ?DoCancel@CGetObjectPropList@@MAEXXZ @ 137 NONAME ; void CGetObjectPropList::DoCancel(void) + ?ServiceL@CGetInterdependentPropDesc@@MAEXXZ @ 138 NONAME ; void CGetInterdependentPropDesc::ServiceL(void) + ?DoHandleRequestPhaseL@CRequestProcessor@@MAEHXZ @ 139 NONAME ; int CRequestProcessor::DoHandleRequestPhaseL(void) + ?ServiceL@CSetObjectPropValue@@MAEXXZ @ 140 NONAME ; void CSetObjectPropValue::ServiceL(void) + ?RunError@CRenameObject@@MAEHH@Z @ 141 NONAME ; int CRenameObject::RunError(int) + ??1CDeleteObject@@UAE@XZ @ 142 NONAME ; CDeleteObject::~CDeleteObject(void) + ?DoHandleResponsePhaseL@CGetPartialObject@@MAEHXZ @ 143 NONAME ; int CGetPartialObject::DoHandleResponsePhaseL(void) + ??0CSetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 144 NONAME ; CSetObjectPropValue::CSetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &) + ??1CGetObjectPropList@@UAE@XZ @ 145 NONAME ; CGetObjectPropList::~CGetObjectPropList(void) + ?CheckRequestL@CGetFormatCapabilities@@MAE?AW4TMTPResponseCode@@XZ @ 146 NONAME ; enum TMTPResponseCode CGetFormatCapabilities::CheckRequestL(void) + ??0CRenameObject@@IAE@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 147 NONAME ; CRenameObject::CRenameObject(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &) ?ServiceL@CGetObjectPropList@@MAEXXZ @ 148 NONAME ; void CGetObjectPropList::ServiceL(void) - ??0CRenameObject@@IAE@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 149 NONAME ; CRenameObject::CRenameObject(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &) diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/eabi/mmmtpdprequestprocessoru.def --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/eabi/mmmtpdprequestprocessoru.def Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/eabi/mmmtpdprequestprocessoru.def Wed Oct 13 15:06:09 2010 +0300 @@ -262,5 +262,4 @@ _ZThn28_NK17CRequestProcessor5MatchERK13TMTPTypeEventR14MMTPConnection @ 261 NONAME _ZThn28_NK17CRequestProcessor5MatchERK15TMTPTypeRequestR14MMTPConnection @ 262 NONAME _ZThn28_NK17CRequestProcessor7RequestEv @ 263 NONAME - _ZN13CDeleteObject24DoHandleCompletingPhaseLEv @ 264 NONAME diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/inc/cdeleteobject.h --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/inc/cdeleteobject.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/inc/cdeleteobject.h Wed Oct 13 15:06:09 2010 +0300 @@ -77,11 +77,6 @@ */ IMPORT_C void DoCancel(); - /** - * Completeing phase Handler - */ - IMPORT_C TBool DoHandleCompletingPhaseL(); - private: void ConstructL(); /** @@ -119,12 +114,6 @@ // Keeps track of whether any files where deleted TBool iIsMultiDelete; - // Keeps track of the respone code when it is EMTPRespCodeDeviceBusy - TBool iDeviceBusy; - - // Keeps track of the count of EMTPRespCodeDeviceBusy that return to PC - TInt iCountDeviceBusyError; - // Accessor of DB MMmMtpDpConfig& iDpConfig; diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -310,9 +310,9 @@ SetPreviousPropertiesL(); CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() ); - CleanupStack::PushL( fileMan ); // + fileMan User::LeaveIfError( fileMan->Copy( oldFileName, aNewFileName ) ); - CleanupStack::PopAndDestroy( fileMan ); // - fileMan + delete fileMan; + fileMan = NULL; PRINT( _L( "MM MTP <= CCopyObject::CopyFileL" ) ); return handle; @@ -417,6 +417,8 @@ { PRINT( _L( "MM MTP => CCopyObject::SetPreviousPropertiesL" ) ); + TMTPResponseCode respcode = EMTPRespCodeOK; + iPropertyList->ResetCursor(); const TInt count = iPropertyList->NumberOfElements(); for ( TInt i = 0; i < count; i++ ) @@ -458,7 +460,7 @@ { CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData - iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, + respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, propertyCode, *stringData, *iTargetObject ); @@ -469,7 +471,7 @@ default: { - iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, + respcode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, propertyCode, *iTargetObject, element ); @@ -478,7 +480,13 @@ } } // end of for loop - PRINT( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL" ) ); + // ignore errors + if ( respcode == EMTPRespCodeOK ) + { + // do nothing, just to get rid of build warning + } + + PRINT1( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode ); } // ----------------------------------------------------------------------------- diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -26,7 +26,6 @@ #include "mmmtpdputility.h" const TInt KMaxDeletionTimes = 10; -const TInt KMaxDeviceBusyTimes = 3; const TInt KDeletionThreshold = 100 * 1000; // (100 millisec) // ----------------------------------------------------------------------------- @@ -295,25 +294,6 @@ } // ----------------------------------------------------------------------------- -// CDeleteObject::DoHandleCompletingPhaseL -// Completeing phase Handler -// ----------------------------------------------------------------------------- -// -EXPORT_C TBool CDeleteObject::DoHandleCompletingPhaseL() - { - CRequestProcessor::DoHandleCompletingPhaseL(); - - // If the response code is EMTPRespCodeDeviceBusy, don't release this object - TBool result = !iDeviceBusy; - - PRINT2( _L( "MM MTP <> CDeleteObject::DoHandleCompletingPhaseL iDeleteError= %d, result = %d" ), - iDeleteError, - result ); - - return result; - } - -// ----------------------------------------------------------------------------- // CDeleteObject::ProcessFinalPhaseL // Delete all of the associations if file deletion was successful // Then signals that the deletion has been completed @@ -325,7 +305,6 @@ TInt num = iObjectsToDelete.Count(); TBool isOk = iDeleteError == KErrNone || iDeleteError == KErrNotFound; - iDeviceBusy = EFalse; if ( num == 0 && isOk ) { @@ -336,15 +315,12 @@ SendResponseL( EMTPRespCodePartialDeletion ); } else if ( !iIsMultiDelete && iDeleteError == KErrAccessDenied ) - { + { SendResponseL( EMTPRespCodeObjectWriteProtected ); } - else if ( iDeleteError == KErrInUse - && iCountDeviceBusyError < KMaxDeviceBusyTimes ) + else if ( iDeleteError == KErrInUse ) { - iCountDeviceBusyError++; SendResponseL( EMTPRespCodeDeviceBusy ); - iDeviceBusy = ETrue; } else { diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectinfo.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectinfo.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectinfo.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -95,6 +95,7 @@ // EXPORT_C void CGetObjectInfo::ConstructL() { + CActiveScheduler::Add( this ); } // ----------------------------------------------------------------------------- @@ -105,7 +106,7 @@ void CGetObjectInfo::ServiceL() { PRINT( _L( "MM MTP => CGetObjectInfo::ServiceL" ) ); - + MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive); delete iObjectInfo; @@ -173,13 +174,8 @@ // Image Bit Depth iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EImageBitDepth, 0 ); // Parent Object - TUint32 parentHandle = object->Uint( CMTPObjectMetaData::EParentHandle ); - // refer to 5.3.1.9 of MTP Spec 1.0 - if ( parentHandle == KMTPHandleNoParent ) - { - parentHandle = KMTPHandleNone; - } - iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EParentObject, parentHandle ); + iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EParentObject, + object->Uint( CMTPObjectMetaData::EParentHandle ) ); // Association Type iObjectInfo->SetUint16L( CMTPTypeObjectInfo::EAssociationType, 0 ); // Association Description diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectproplist.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectproplist.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectproplist.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -500,11 +500,29 @@ properties = iDpConfig.GetSupportedPropertiesL( formatCode ); const TInt count = properties->Count(); + + TInt err = KErrNone; + TBool successQuery = EFalse; for ( TInt i = 0; i < count; i++ ) { - ServiceOneObjectPropertyL( aHandle, (*properties)[i] ); + // no need to do the trap anymore, this is being handle internally in Media DP's ServiceSpecificObjectPropertyL, + // also, this base class should not know too much of different handling between different formats + err = ServiceOneObjectPropertyL( aHandle, (*properties)[i] ); + if ( err == KErrNone ) + successQuery = ETrue; + if ( err == KErrNotSupported || err == KErrNotFound ) // Skip + err = KErrNone; + if ( err != KErrNone ) + break; } - return KErrNone; + + // In PC Suite combined mode, a file that was found at the beginning could be deleted by PC Suite protocol + // Need to fail it here. + if ( successQuery == EFalse ) + err = KErrNotFound; + + PRINT1( _L( "MM MTP <= CGetObjectPropList::ServiceAllPropertiesL err = %d" ), err ); + return err; } // ----------------------------------------------------------------------------- @@ -608,10 +626,17 @@ // Filename case EMTPObjectPropCodeObjectFileName: { +#ifdef _DEBUG + HBufC* log = iObject->DesC( CMTPObjectMetaData::ESuid ).Alloc(); + PRINT1( _L( "MM MTP <> CGetObjectPropList::ServiceOneObjectPropertyL FileName = %S" ), log ); + delete log; + log = NULL; +#endif // _DEBUG TParsePtrC parse( iObject->DesC( CMTPObjectMetaData::ESuid ) ); - PRINT1( _L( "MM MTP <> CGetObjectPropList::ServiceOneObjectPropertyL FileName = %S" ), &parse.FullName() ); + textData = CMTPTypeString::NewLC( parse.NameAndExt() ); // + textData iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode) ); - iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue, parse.NameAndExt() ); + iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue, textData->StringChars() ); + CleanupStack::PopAndDestroy( textData ); // - textData } break; @@ -619,13 +644,7 @@ case EMTPObjectPropCodeParentObject: { iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) ); - TUint32 parentHandle = iObject->Uint( CMTPObjectMetaData::EParentHandle ); - // refer to 5.3.1.9 of MTP Spec 1.0 - if ( parentHandle == KMTPHandleNoParent ) - { - parentHandle = KMTPHandleNone; - } - iPropertyElement->SetUint32L( CMTPTypeObjectPropListElement::EValue, parentHandle ); + iPropertyElement->SetUint32L( CMTPTypeObjectPropListElement::EValue, iObject->Uint( CMTPObjectMetaData::EParentHandle ) ); } break; diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -205,15 +205,8 @@ // Parent case EMTPObjectPropCodeParentObject: { - iMTPTypeUint32.Set( KMTPHandleNone ); - - TUint32 parentHandle = iObjectInfo->Uint( CMTPObjectMetaData::EParentHandle ); - // refer to 5.3.1.9 of MTP Spec 1.0 - if ( parentHandle != KMTPHandleNoParent ) - { - iMTPTypeUint32.Set( parentHandle ); - } - + iMTPTypeUint32.Set( 0 ); + iMTPTypeUint32 = iObjectInfo->Uint( CMTPObjectMetaData::EParentHandle ); SendDataL( iMTPTypeUint32 ); } break; diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectreferences.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectreferences.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectreferences.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -204,10 +204,12 @@ PRINT2( _L("MM MTP => CGetObjectReferences::AddReferencesL aRefOwnerSuid = %S, ref count = %d"), &aRefOwnerSuid, count ); // check if references are valid - for ( TInt i = count-1; i >= 0; i-- ) + TInt removeCount = 0; + for ( TInt i = 0; i < count; i++ ) { - TPtrC temp( aReferences[i] ); - PRINT2( _L( "MM MTP <> CGetObjectReferences::AddReferencesL ref[%d]'s name = %S" ), i, &temp ); + TInt index = i - removeCount; + TPtrC temp( aReferences[index] ); + PRINT2( _L( "MM MTP <> CGetObjectReferences::AddReferencesL ref[%d]'s name = %S" ), index, &temp ); PERFLOGSTART( KObjectManagerHandle ); TUint32 handle = iFramework.ObjectMgr().HandleL( temp ); PERFLOGSTOP( KObjectManagerHandle ); @@ -216,7 +218,8 @@ PRINT1( _L( "MM MTP <> CGetObjectReferences::AddReferencesL, [%S] doesn't existed in handle db, remove this from reference array" ), &temp ); // if handle is invalid, remove from reference array - aReferences.Delete( i ); + aReferences.Delete( index, 1 ); + removeCount++; } } diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -292,15 +292,15 @@ // Move the file first no matter if it will fail in Get/SetPreviousPropertiesL // Already trapped inside GetPreviousPropertiesL( *iObjectInfo ); - TRAP_IGNORE( SetPropertiesL( aNewFileName ) ); + TRAPD( err, SetPropertiesL( aNewFileName ) ); CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() ); - CleanupStack::PushL( fileMan ); // + fileMan - TInt err = fileMan->Move( *oldFileName, aNewFileName ); - PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err ); - User::LeaveIfError( err ); - CleanupStack::PopAndDestroy( fileMan ); // - fileMan - CleanupStack::PopAndDestroy( oldFileName ); // - oldFileName + err = fileMan->Move( *oldFileName, aNewFileName ); + + CleanupStack::PopAndDestroy( oldFileName ); // - oldFileName + + if ( err != KErrNone ) + PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err ); PRINT( _L( "MM MTP <= CMoveObject::MoveFileL" ) ); } @@ -408,6 +408,8 @@ { PRINT( _L( "MM MTP => CMoveObject::SetPreviousPropertiesL" ) ); + TMTPResponseCode respcode = EMTPRespCodeOK; + iPropertyList->ResetCursor(); const TInt count = iPropertyList->NumberOfElements(); for ( TInt i = 0; i < count; i++ ) @@ -447,7 +449,7 @@ { CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData - iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, + respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, propertyCode, *stringData, *iObjectInfo ); @@ -458,7 +460,7 @@ default: { - iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, + respcode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, propertyCode, *iObjectInfo, element ); @@ -467,7 +469,13 @@ } } // end of for loop - PRINT( _L( "MM MTP <= CMoveObject::SetPreviousPropertiesL" ) ); + // ignore errors + if ( respcode == EMTPRespCodeOK ) + { + // do nothing, just to get rid of build warning + } + + PRINT1( _L( "MM MTP <= CMoveObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode ); } // ----------------------------------------------------------------------------- diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crenameobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crenameobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crenameobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -269,7 +269,7 @@ PRINT1( _L( "MM MTP <> CRenameObject::GetParentSuidL new folder full file name(%S)" ), &iNewFolderName ); iOldFolderFullName.Zero(); - iOldFolderFullName.Append( aFolderName ); + iOldFolderFullName.Append( aFolderName ); // just name not suid PRINT1( _L( "MM MTP <> CRenameObject::GetParentSuidL = %S" ), &iOldFolderFullName ); } diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -243,6 +243,10 @@ CMTPObjectMetaData* object( CMTPObjectMetaData::NewLC() ); TBool result( iFramework.ObjectMgr().ObjectL( aHandle, *object ) ); + iObjectArray.AppendL( object ); + CleanupStack::Pop( object ); + iHandles.AppendL( aHandle ); + // Obj handle exists if ( result ) { @@ -273,18 +277,8 @@ ret = EMTPRespCodeInvalidParentObject; } } - - if ( result ) - { - iObjectArray.AppendL( object ); - CleanupStack::Pop( object ); - iHandles.AppendL( aHandle ); - } else - { - CleanupStack::PopAndDestroy( object ); ret = EMTPRespCodeInvalidObjectHandle; - } PRINT1( _L( "MM MTP <= CRequestChecker::VerifyObjectHandleL ret = 0x%x" ), ret ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -1075,17 +1075,6 @@ // might happen if function is called before physical file arrives // do nothing } - else if ( iObjectFormat == EMTPFormatCodeASF ) - { - // happens on some buggy PC implementation, default formatcode to WMA or WMV if extension matches - PRINT( _L( "MM MTP <> happens on some buggy PC implementation, default formatcode to WMA or WMV if extension matches" ) ); - if ( parser.Ext().CompareF( KTxtExtensionWMA ) == 0 ) - iObjectFormat = EMTPFormatCodeWMA; - else if ( parser.Ext().CompareF( KTxtExtensionWMV ) == 0 ) - iObjectFormat = EMTPFormatCodeWMV; - else - result = EFalse; - } else { PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectproplist.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectproplist.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectproplist.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -188,105 +188,103 @@ if ( protectionStatus != EMTPProtectionNoProtection ) { // NOTE: P4S expects AccessDenied response instead of ObjectWriteProtected - responseCode = EMTPRespCodeAccessDenied; // EMTPRespCodeObjectWriteProtected; + return EMTPRespCodeAccessDenied; // EMTPRespCodeObjectWriteProtected; } - else + + switch ( propertyCode ) { - switch ( propertyCode ) + case EMTPObjectPropCodeStorageID: + case EMTPObjectPropCodeObjectFormat: + case EMTPObjectPropCodeProtectionStatus: + case EMTPObjectPropCodeObjectSize: + case EMTPObjectPropCodeParentObject: + case EMTPObjectPropCodePersistentUniqueObjectIdentifier: + case EMTPObjectPropCodeDateAdded: + case EMTPObjectPropCodeDateCreated: + case EMTPObjectPropCodeDateModified: { - case EMTPObjectPropCodeStorageID: - case EMTPObjectPropCodeObjectFormat: - case EMTPObjectPropCodeProtectionStatus: - case EMTPObjectPropCodeObjectSize: - case EMTPObjectPropCodeParentObject: - case EMTPObjectPropCodePersistentUniqueObjectIdentifier: - case EMTPObjectPropCodeDateAdded: - case EMTPObjectPropCodeDateCreated: - case EMTPObjectPropCodeDateModified: + responseCode = EMTPRespCodeAccessDenied; + } + break; + + case EMTPObjectPropCodeNonConsumable: + object->SetUint( CMTPObjectMetaData::ENonConsumable, + aPropListElement.Uint8L( CMTPTypeObjectPropListElement::EValue ) ); + // TODO: need to reconsider, + // if propList comprise both non-consumable and objectFileName, + // ModifyObjectL would be called twice, need to investigate if it won't affect + // performance + iFramework.ObjectMgr().ModifyObjectL( *object ); + break; + + case EMTPObjectPropCodeObjectFileName: + { + TPtrC suid( object->DesC( CMTPObjectMetaData::ESuid ) ); + TPtrC ptr( aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) ); + if ( KMaxFileName < ptr.Length() ) + responseCode = EMTPRespCodeInvalidDataset; + else { - responseCode = EMTPRespCodeAccessDenied; - } - break; + TFileName newSuid( ptr ); + TInt err = MmMtpDpUtility::UpdateObjectFileName( iFramework.Fs(), suid, newSuid ); + PRINT1( _L( "MM MTP <> Update object file name err = %d" ), err ); + if ( KErrOverflow == err ) // full path name is too long + { + responseCode = EMTPRespCodeInvalidDataset; + } + else if ( KErrNone == err ) // TODO: ( KErrAlreadyExists == err ) + { + TRAP( err, iDpConfig.GetWrapperL().RenameObjectL( *object, newSuid ) ); //Update MPX DB - case EMTPObjectPropCodeNonConsumable: - object->SetUint( CMTPObjectMetaData::ENonConsumable, - aPropListElement.Uint8L( CMTPTypeObjectPropListElement::EValue ) ); - // TODO: need to reconsider, - // if propList comprise both non-consumable and objectFileName, - // ModifyObjectL would be called twice, need to investigate if it won't affect - // performance - iFramework.ObjectMgr().ModifyObjectL( *object ); - break; + PRINT1( _L( "MM MTP <> Rename MPX object file name err = %d" ), err ); + // it is ok if file is not found in DB, following S60 solution + if ( KErrNotFound == err ) + { + TRAP( err, iDpConfig.GetWrapperL().AddObjectL( *object ) ); + PRINT1( _L( "MM MTP <> Add MPX object file name err = %d" ), err ); + } - case EMTPObjectPropCodeObjectFileName: - { - TPtrC suid( object->DesC( CMTPObjectMetaData::ESuid ) ); - TPtrC ptr( aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) ); - if ( KMaxFileName < ptr.Length() ) - responseCode = EMTPRespCodeInvalidDataset; + object->SetDesCL( CMTPObjectMetaData::ESuid, newSuid ); + iFramework.ObjectMgr().ModifyObjectL( *object ); + } + else if ( KErrInUse == err ) // object file is being used by other program + { + responseCode = EMTPRespCodeDeviceBusy; + } else { - TFileName newSuid( ptr ); - TInt err = MmMtpDpUtility::UpdateObjectFileName( iFramework.Fs(), suid, newSuid ); - PRINT1( _L( "MM MTP <> Update object file name err = %d" ), err ); - if ( KErrOverflow == err ) // full path name is too long - { - responseCode = EMTPRespCodeInvalidDataset; - } - else if ( KErrNone == err ) // TODO: ( KErrAlreadyExists == err ) - { - TRAP( err, iDpConfig.GetWrapperL().RenameObjectL( *object, newSuid ) ); //Update MPX DB - - PRINT1( _L( "MM MTP <> Rename MPX object file name err = %d" ), err ); - // it is ok if file is not found in DB, following S60 solution - if ( KErrNotFound == err ) - { - TRAP( err, iDpConfig.GetWrapperL().AddObjectL( *object ) ); - PRINT1( _L( "MM MTP <> Add MPX object file name err = %d" ), err ); - } - - object->SetDesCL( CMTPObjectMetaData::ESuid, newSuid ); - iFramework.ObjectMgr().ModifyObjectL( *object ); - } - else if ( KErrInUse == err ) // object file is being used by other program - { - responseCode = EMTPRespCodeDeviceBusy; - } - else - { - responseCode = EMTPRespCodeGeneralError; - } + responseCode = EMTPRespCodeGeneralError; } } - break; + } + break; - case EMTPObjectPropCodeName: - case EMTPObjectPropCodeAlbumArtist: - { - CMTPTypeString* stringData = CMTPTypeString::NewLC( - aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );// + stringData + case EMTPObjectPropCodeName: + case EMTPObjectPropCodeAlbumArtist: + { + CMTPTypeString* stringData = CMTPTypeString::NewLC( + aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );// + stringData - responseCode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, - propertyCode, - *stringData, - *object ); + responseCode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig, + propertyCode, + *stringData, + *object ); - CleanupStack::PopAndDestroy( stringData );// - stringData - } - break; + CleanupStack::PopAndDestroy( stringData );// - stringData + } + break; - default: - { - responseCode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, - propertyCode, - *object, - aPropListElement ); - } - break; + default: + { + responseCode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig, + propertyCode, + *object, + aPropListElement ); } + break; + } - CleanupStack::PopAndDestroy( object ); // - object - } + CleanupStack::PopAndDestroy( object ); // - object } PRINT1( _L( "MM MTP <= CSetObjectPropList::SetObjectPropListL responseCode = 0x%x" ), responseCode ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -148,11 +148,17 @@ TUint32 objectHandle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 ); CMTPObjectMetaData* objectInfo = iRequestChecker->GetObjectInfo( objectHandle ); + if ( objectInfo == NULL ) + { + PRINT( _L("MM MTP <> CSetObjectPropValue::CheckRequestL, objectInfo is NULL" ) ); + return EMTPRespCodeInvalidObjectHandle; + } + TPtrC fileName = objectInfo->DesC( CMTPObjectMetaData::ESuid ); TUint32 formatCode = objectInfo->Uint( CMTPObjectMetaData::EFormatCode ); PRINT3( _L( "MM MTP <> CSetObjectPropValue::CheckRequestL, handle = 0x%x, filename = %S, formatCode = 0x%x" ), objectHandle, - &(objectInfo->DesC( CMTPObjectMetaData::ESuid )), + &fileName, formatCode ); const RArray* properties = iDpConfig.GetSupportedPropertiesL( formatCode ); TInt count = properties->Count(); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp --- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -155,7 +155,7 @@ break; } // else - // Fall through on purpoe to get from mpx + // get from mpx case EMPXPlaylist: case EMPXSong: { diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatampxaccess.cpp --- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatampxaccess.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatampxaccess.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -902,7 +902,7 @@ delete iSampleData; iSampleData = NULL; - iSampleData = HBufC8::NewL( numElements ); + iSampleData = HBufC8::NewL( numElements * sizeof( TUint8 ) ); TPtr8 samplePtr = iSampleData->Des(); mtpTypeArray.ToDes( samplePtr ); RFile sampleFile; @@ -1522,6 +1522,12 @@ PRINT( _L( "MM MTP <> Modified contents are:" ) ); foundMedia = FindWMPMediaLC( KMPXMediaGeneralModified, ETrue ); // + foundMedia + + if ( !foundMedia->IsSupported( KMPXMediaArrayCount ) ) + { + User::Leave( KErrNotSupported ); + } + foundItemCount = *foundMedia->Value( KMPXMediaArrayCount ); PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetModifiedContentL() found %d Media Objects" ), foundItemCount ); @@ -1594,14 +1600,14 @@ CleanupStack::PopAndDestroy( &playlistAttributes ); // - playlistAttributes CleanupStack::PopAndDestroy( searchMedia ); // - searchMedia - CleanupStack::PushL( foundMedia ); // + foundMedia if ( !foundMedia->IsSupported( KMPXMediaArrayCount ) ) User::Leave( KErrNotSupported ); TInt foundItemCount = *foundMedia->Value( KMPXMediaArrayCount ); - CleanupStack::PopAndDestroy( foundMedia ); // - foundMedia + delete foundMedia; + foundMedia = NULL; PRINT1( _L( "MM MTP <= CMmMtpDpMetadataMpxAccess::IsExist foundItemCount(%d)" ), foundItemCount ); return ( foundItemCount > 0 ? ETrue : EFalse ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp --- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -40,7 +40,7 @@ #include "mmmtpvideodbdefs.h" #include "tobjectdescription.h" -_LIT( KMTPNoBackupFolder, "nobackup\\" ); +const TInt KStorageRootMaxLength = 10; #ifdef _DEBUG static const TInt KMtpMaxStringDescLength = KMtpMaxStringLength - 1; @@ -89,8 +89,6 @@ User::LeaveIfError( iDbsSession.Connect() ); TInt err = DriveInfo::GetDefaultDrive( DriveInfo::EDefaultPhoneMemory, iStoreNum ); - PRINT1( _L( "MM MTP <> CMmMtpDpMetadataVideoAccess::ConstructL, EDefaultPhoneMemory err = %d" ), err ); - User::LeaveIfError( err ); err = OpenDatabase(); @@ -109,17 +107,12 @@ { PRINT( _L( "MM MTP => CMmMtpDpMetadataVideoAccess::OpenDatabase" ) ); - TFileName dbFileName; - TDriveUnit dbDrive( iStoreNum ); - iRfs.PrivatePath( dbFileName ); - dbFileName.Insert( 0, dbDrive.Name() ); - dbFileName.Append( KMTPNoBackupFolder ); - dbFileName.Append( KMtpVideoDb ); - TInt err = iRfs.MkDirAll( dbFileName ); + iRfs.CreatePrivatePath( iStoreNum ); + TInt err = iRfs.SetSessionToPrivate( iStoreNum ); - if ( err == KErrNone || err == KErrAlreadyExists ) + if ( err == KErrNone ) { - TRAP( err, iFileStore = CPermanentFileStore::OpenL( iRfs, dbFileName, EFileRead | EFileWrite ) ); + TRAP( err, iFileStore = CPermanentFileStore::OpenL( iRfs, KMtpVideoDb, EFileRead | EFileWrite ) ); if ( err == KErrNone ) TRAP( err, iFileStore->SetTypeL( iFileStore->Layout() ) ); @@ -132,8 +125,8 @@ if ( err != KErrNone ) { - iRfs.Delete( dbFileName ); // delete first before creating a new one - TRAP( err, iFileStore = CPermanentFileStore::CreateL( iRfs, dbFileName, EFileRead | EFileWrite ) ); + iRfs.Delete( KMtpVideoDb ); // delete first before creating a new one + TRAP( err, iFileStore = CPermanentFileStore::CreateL( iRfs, KMtpVideoDb, EFileRead | EFileWrite ) ); PRINT1( _L( "MM MTP <> OpenDatabase RDbNamedDatabase::CreateL, err = %d" ), err ); if ( err == KErrNone ) @@ -154,18 +147,22 @@ if ( KErrNone != err ) { iDatabase.Close(); - iRfs.Delete( dbFileName ); + iRfs.Delete( KMtpVideoDb ); } } } } + TBuf storeRoot; + err = PathInfo::GetRootPath( storeRoot, iStoreNum ); + iRfs.SetSessionPath( storeRoot ); + if ( err == KErrNone ) { iDbOpened = ETrue; } - PRINT1( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase err = %d" ), err ); + PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase" ) ); return err; } @@ -352,14 +349,12 @@ for ( iRecordSet.FirstL(); iRecordSet.AtRow(); iRecordSet.NextL() ) { -#ifdef _DEBUG HBufC* data = ReadLongTextL( KMtpVideoLocation ); + CleanupStack::PushL( data ); PRINT1( _L( "MM MTP <> CleanupDbIfNecessaryL removing %S from database" ), data ); - delete data; - data = NULL; -#endif iRecordSet.DeleteL(); + CleanupStack::PopAndDestroy( data ); } delete iColSet; @@ -711,8 +706,9 @@ OpenDatabaseL(); // File Path - const TDesC& suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid ); - SetRecordL( suid, ERecordRead ); + HBufC* suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid ).AllocLC(); // + suid + SetRecordL( *suid, ERecordRead ); + CleanupStack::PopAndDestroy( suid ); // - suid HBufC* data = NULL; TDbColNo num; @@ -783,14 +779,16 @@ { PRINT( _L( "MM MTP <> EMTPObjectPropCodeDescription-MD" ) ); data = ReadLongTextL( KMtpVideoComment ); - CleanupStack::PushL( data ); // + data TInt len = data->Length(); PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetObjectMetadataValue len = %d" ),len ); - for ( TInt i = 0; i < len; i++ ) - ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] ); + if ( len != 0 ) + { + for ( TInt i = 0; i < len; i++ ) + ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] ); + } - CleanupStack::PopAndDestroy( data ); // - data + delete data; data = NULL; } break; @@ -1027,7 +1025,6 @@ // Pack the info to aNewData if ( data ) { - CleanupStack::PushL( data ); // + data #ifdef _DEBUG if ( data->Length() > KMtpMaxStringDescLength ) // Have to concatenate for MTP { @@ -1043,7 +1040,8 @@ { User::Leave( KErrArgument ); } - CleanupStack::PopAndDestroy( data ); // - data + delete data; + data = NULL; } PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::GetObjectMetadataValue" ) ); diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp --- a/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -110,8 +110,14 @@ if ( mime->CompareF( KMimeTypeAudio3gpp ) == 0 || mime->CompareF( KMimeTypeVideo3gpp ) == 0 ) { + delete mime; + mime = NULL; format = EMTPFormatCode3GPContainer; } + } + + if ( mime != NULL ) + { delete mime; mime = NULL; } @@ -519,15 +525,34 @@ HBufC8* MmMtpDpUtility::OdfMimeTypeL( const TDesC& aFullPath ) { PRINT( _L( "MM MTP => MmMtpDpUtility::OdfMimeTypeL" ) ); + HBufC8* mimebuf = NULL; - CContent* content = CContent::NewLC( aFullPath ); // + content - HBufC* buffer = HBufC::NewLC( KMimeTypeMaxLength ); // + buffer + CContent* content = CContent::NewL( aFullPath ); + CleanupStack::PushL( content ); // + content + + HBufC* buffer = HBufC::NewL( KMimeTypeMaxLength ); + CleanupStack::PushL( buffer ); // + buffer TPtr data = buffer->Des(); - User::LeaveIfError( content->GetStringAttribute( EMimeType, data ) ); + TInt err = content->GetStringAttribute( EMimeType, data ); + + if ( err == KErrNone ) + { + mimebuf = HBufC8::New( buffer->Length() ); - HBufC8* mimebuf = HBufC8::NewL( buffer->Length() ); - mimebuf->Des().Copy( *buffer ); + if ( mimebuf == NULL ) + { + User::LeaveIfError( KErrNotFound ); + } + + mimebuf->Des().Copy( *buffer ); + } + + // leave if NULL + if ( mimebuf == NULL ) + { + User::Leave( KErrNotFound ); + } CleanupStack::PopAndDestroy( buffer ); // - buffer CleanupStack::PopAndDestroy( content ); // - content diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/playbackhelper/src/streaminglinkmodel.cpp --- a/mmappcomponents/playbackhelper/src/streaminglinkmodel.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/playbackhelper/src/streaminglinkmodel.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 5 % +// Version : %version: 4 % @@ -559,8 +559,6 @@ TInt size = 0; TInt result = KErrNone; - - TBool linkadded = EFalse; if ( aRamFile.Size( size ) == KErrNone && size <= KMaxLinkFileSize ) { @@ -578,8 +576,6 @@ // Get links from buffer while ( ret == KErrNone ) { - linkadded = EFalse; - // Create a linkitem ptr LinkStruct* linkItem = new( ELeave ) LinkStruct; CleanupStack::PushL( linkItem ); @@ -597,23 +593,14 @@ { ptr2.TrimRight(); iLinkArray.Append( linkItem ); - linkadded = ETrue; } } else { iLinkArray.Append( linkItem ); - linkadded = ETrue; } - if ( linkadded ) - { - CleanupStack::Pop(2); // pop the linkItem and the HbufC created for linkItem->link - } - else - { - CleanupStack::PopAndDestroy(2); //pop and destroy linkItem and the HbufC created for linkItem->link - } + CleanupStack::Pop(2); // pop the linkItem and the HbufC created for linkItem->link } CleanupStack::PopAndDestroy(2); // buffer, recognizer @@ -649,8 +636,6 @@ iLinkCount = 0; TInt ret = KErrNone; - - TBool linkadded = EFalse; if ( aAsxParser ) { @@ -665,9 +650,6 @@ for (TInt i=1; i <= urlCount; i++) { - - linkadded = EFalse; - // Get the asx struct from the parser asxItem = aAsxParser->GetUrl(i); // Set the url to the bufferptr @@ -695,23 +677,15 @@ { ptr2.TrimRight(); iLinkArray.Append( linkItem ); - linkadded = ETrue; } } else { iLinkArray.Append( linkItem ); - linkadded = ETrue; } - - if ( linkadded ) - { - CleanupStack::Pop(2); // pop the linkItem and the HbufC created for linkItem->link - } - else - { - CleanupStack::PopAndDestroy(2); //pop and destroy linkItem and the HbufC created for linkItem->link - } + + CleanupStack::Pop(2); // pop the linkItem and the HbufC created for linkItem->link + } CleanupStack::PopAndDestroy(); //recognizer diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/harvester_utility_api/tsrc/Conf/mpxharvestertest.cfg --- a/mmappfw_plat/harvester_utility_api/tsrc/Conf/mpxharvestertest.cfg Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/harvester_utility_api/tsrc/Conf/mpxharvestertest.cfg Wed Oct 13 15:06:09 2010 +0300 @@ -142,8 +142,8 @@ [Test] title Delete files synchronously create mpxharvestertest utility +pause 2000 utility CopyTestFile mpxtest1.mp3 mpxtest2.mp3 -pause 2000 utility CreateUtility utility AddFileByPath mpxtest1.mp3 waittestclass utility diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/conf/mpxplaybackutilitytest.cfg --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/conf/mpxplaybackutilitytest.cfg Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/conf/mpxplaybackutilitytest.cfg Wed Oct 13 15:06:09 2010 +0300 @@ -26,12 +26,6 @@ // Timers KTimerEndTest 5000 // 5 sec -// Properties for SetL -EPbPropertyVolume 0 -EPbPropertyPosition 10 - - - [Enddefine] @@ -257,526 +251,3 @@ delete pbutil [Endtest] -[Test] -// -// Test Video play -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play -// -title 14 MMPXPlaybackUtilityVideoCommandPlayL(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video play, then stop -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Stop -// -title 15 MMPXPlaybackUtilityVideoCommandPlayClose(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video play, then pause -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Pause -// -title 16 MMPXPlaybackUtilityVideoCommandPlayandPause(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video play, then playpause -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, PlayPause -// -title 17 MMPXPlaybackUtilityVideoCommandPlayPause(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video play, then playpause twice -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, PlayPause, PlayPause -// -title 18 MMPXPlaybackUtilityVideoCommandPlayPausePlay(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayPauseL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video playcomplete -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Play Complete -// -title 19 MMPXPlaybackUtilityVideoCommandPlayComplete(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayCompleteL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video seeking forward -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Seek Forward -// -title 20 MMPXPlaybackUtilityVideoCommandSeekForwardPlayState(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandSeekForwardL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video seeking backward -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Seek Backward -// -title 21 MMPXPlaybackUtilityVideoCommandSeekBackwardPlayState(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandSeekBackwardL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video seeking forward while paused -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Pause, Seek Forward -// -title 22 MMPXPlaybackUtilityVideoCommandSeekForwardPauseState(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause 1000 -pbutil MMPXPlaybackUtilityCommandSeekForwardL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video seeking backward while paused -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Pause, Seek Backward -// -title 23 MMPXPlaybackUtilityVideoCommandSeekBackwardPauseState(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause 1000 -pbutil MMPXPlaybackUtilityCommandSeekBackwardL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video play with RFile64 -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - Init64L with RFile64, File MPEG4_VBR_176x144_15fps.3gp -// - File64L to get RFile64 file handler -// -title 24 MMPXPlaybackUtilityVideoFile64PlayL -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInit64L MPEG4_VBR_176x144_15fps.3gp -pause 1000 -pbutil MMPXPlaybackUtilityFile64L -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video close after stop -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Stop, close -// -title 25 MMPXPlaybackUtilityVideoCommandPlayStopClose(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause 1000 -pbutil MMPXPlaybackUtilityCommandCloseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video close -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Close -// -title 26 MMPXPlaybackUtilityVideoCommandPlayClose(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandCloseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video set position (jump while playing) -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Set Position -// -title 27 MMPXPlaybackUtilityVideoSetPosition(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilitySetL EPbPropertyPosition 100 -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - - -[Test] -// -// Test Video set volume -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Set Volume -// -title 28 MMPXPlaybackUtilityVideoSetVolume(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilitySetL EPbPropertyVolume 15 -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video play command while already playing -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play -// -title 29 MMPXPlaybackUtilityVideoCommandPlayPlayL(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video playpause command in stopped state -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Stop, PlayPause -// -title 30 MMPXPlaybackUtilityVideoCommandStopPlayPause(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video pause command while already paused -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Pause, Pause -// -title 31 MMPXPlaybackUtilityVideoCommandPausePauseL(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video pause command in stopped state -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Stop, Pause -// -title 32 MMPXPlaybackUtilityVideoCommandStopPause(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause 1000 -pbutil MMPXPlaybackUtilityCommandPauseL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video stop command in stopped state -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Play, Stop, Stop -// -title 33 MMPXPlaybackUtilityVideoCommandStopStop(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandPlayL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] - -[Test] -// -// Test Video stop command while in buffering state -// - UtilityL with Mode NewPlayer, Category Video -// - Add Observer -// - SelectPlayerL with HelixPlugin UID -// - InitL with URI, File Battle_160x100_30kbps.rm -// - Init, Stop -// -title 34 MMPXPlaybackUtilityVideoCommandInitStop(uri) -create mpxplaybackutilitytest pbutil -pbutil MMPXPlaybackUtilityUtilityWithCatL KMPXCategoryVideo KPbModeNewPlayer -pbutil MMPXPlaybackUtilityAddObserverL -pbutil MMPXPlaybackUtilityPlayerManagerSelectPlayerL KVideoHelixPlaybackPluginUid -pbutil MMPXPlaybackUtilityInitWithUriL Battle_160x100_30kbps.rm -pause 1000 -pbutil MMPXPlaybackUtilityCommandStopL -pause KTimerEndTest -pbutil EndTest -delete pbutil -[Endtest] \ No newline at end of file diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/group/bld.inf --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/group/bld.inf Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 @@ -28,6 +28,5 @@ PRJ_TESTMMPFILES #include "../mpxplaybackutilitytest/group/bld.inf" -#include "../testvideoplaybackplugin/group/bld.inf" // End of File diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testcollectionplugintype.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testcollectionplugintype.h Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: define collection collection plugin type enum -* -*/ - -#ifndef TESTCOLLECTIONPLUGINTYPE_H -#define TESTCOLLECTIONPLUGINTYPE_H - -#include "testcommonpluginuids.h" - -// Collection Plugin Test Types. -// -enum TCollectionTestPluginType - { - ECollectionTestPluginType = KCollectionTestPluginType, - ECollectionTestPluginType2 = KCollectionTestPluginType2, - ECollectionTestPluginType3 = KCollectionTestPluginType3 - }; - - -#endif // TESTCOLLECTIONPLUGINTYPE_H diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testcommonpluginuids.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testcommonpluginuids.h Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: define commonly used uids -* -*/ - -#ifndef TESTCOMMONPLUGINUIDS_H -#define TESTCOMMONPLUGINUIDS_H - -#define KCollectionTestPlugin 0xE0000101 // dll uid -#define KCollectionTestPluginImpId 0xE0000102 // implementation uid -#define KCollectionTestPluginType 0xE0000103 // refer TCollectionTestPluginType -#define KCollectionTestPlugin2 0xE0000111 // dll uid -#define KCollectionTestPluginImpId2 0xE0000112 // implementation uid -#define KCollectionTestPluginType2 0xE0000113 // refer TCollectionTestPluginType -#define KCollectionTestPlugin3 0xE0000121 // dll uid -#define KCollectionTestPluginImpId3 0xE0000122 // implementation uid -#define KCollectionTestPluginType3 0xE0000123 // refer TCollectionTestPluginType - -#define KPlaybackTestVideoPlugin 0xE0000201 // dll uid -#define KPlaybackTestVideoPluginImpId 0xE0000202 // implementation uid -#define KPlaybackTestPluginType 0xE0000203 // refer TPlaybackTestPluginType -#define KPlaybackTestPlugin2 0xE0000211 // dll uid -#define KPlaybackTestPluginImpId2 0xE0000212 // implementation uid -#define KPlaybackTestPluginType2 0xE0000213 // refer TPlaybackTestPluginType -#define KPlaybackTestPlugin3 0xE0000221 // dll uid -#define KPlaybackTestPluginImpId3 0xE0000222 // implementation uid -#define KPlaybackTestPluginType3 0xE0000223 // refer TPlaybackTestPluginType - -#define KViewTestPlugin 0xE0000301 // dll uid -#define KViewTestPluginImpId 0xE0000302 // implementation uid -#define KViewTestPluginType 0xE0000303 - -#define KViewTestPlugin2 0xE0000304 // dll uid -#define KViewTestPlugin2ImpId 0xE0000305 // implementation uid -#define KViewTestPluginType2 0xE0000306 - -#define KViewTestPlugin3 0xE0000307 // dll uid -#define KViewTestPlugin3ImpId 0xE0000308 // implementation uid -#define KViewTestPluginType3 0xE0000309 - -#define KViewTestPlugin4 0xE000030A // dll uid -#define KViewTestPlugin4ImpId 0xE000030B // implementation uid -#define KViewTestPluginType4 0xE000030C -#define KViewTestPlugin4BetterMatch 0xE000030D // dll uid -#define KViewTestPlugin4BetterMatchImpId 0xE000030E // implementation uid -#define KViewTestPlugin4BetterMatchCriteria 0xE000030F - -#define KViewTestPlugin5Low 0xE0000311 // dll uid -#define KViewTestPlugin5LowImpId 0xE0000312 // implementation uid -#define KViewTestPluginType5 0xE0000313 -#define KViewTestPlugin5High 0xE0000314 // dll uid -#define KViewTestPlugin5HighImpId 0xE0000315 // implementation uid - -#define KViewTestPlugin6 0xE0000317 // dll uid -#define KViewTestPlugin6ImpId 0xE0000318 // implementation uid -#define KViewTestPluginType6 0xE0000319 - - -#define KPlaylistTestPluginM3u 0xE000031A // dll uid -#define KPlaylistTestPluginM3uImpId 0xE000031B // implementation uid - -#endif // TESTCOMMONPLUGINUIDS_H - diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testplaybackplugintype.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testplaybackplugintype.h Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: define playback plugin type enum -* -*/ - -#ifndef TESTPLAYBACKPLUGINTYPE_H -#define TESTPLAYBACKPLUGINTYPE_H - -#include "testcommonpluginuids.h" - -// Collection Plugin Test Types. -// -enum TPlaybackTestPluginType - { - EPlaybackTestPluginType = KPlaybackTestPluginType, - EPlaybackTestPluginType2 = KPlaybackTestPluginType2, - EPlaybackTestPluginType3 = KPlaybackTestPluginType3 - }; - - -#endif // TESTPLAYBACKPLUGINTYPE_H - diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testviewplugintype.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/inc/testviewplugintype.h Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: define view plugin type enum -* -*/ - -#ifndef TESTVIEWPLUGINTYPE_H -#define TESTVIEWPLUGINTYPE_H - -#include "testcommonpluginuids.h" - -// View Plugin Test Types. -// -enum TViewTestPluginType - { - EViewPluginTypeTest = KViewPluginTypeTest, - EViewPluginTypeTest2 = KViewPluginTypeTest2, - EViewPluginTypeTest3 = KViewPluginTypeTest3, - EViewPluginTypeTest4 = KViewPluginTypeTest4, - EViewPluginTypeTest5 = KViewPluginTypeTest5, - EViewPluginTypeTest6 = KViewPluginTypeTest6 - }; - -enum TViewTestPluginMatchCriteria - { - EViewPluginMatchCriteria4 = KViewTestPlugin4BetterMatchCriteria - }; - -#endif // TESTVIEWPLUGINTYPE_H diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/bld.inf --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/bld.inf Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 @@ -25,9 +25,6 @@ PRJ_TESTEXPORTS // NOTE: If using ARS requirements all export operations should be done under this. // 'abld test export' -../../conf/mpxplaybackutilitytest.cfg /epoc32/winscw/c/testframework/mpxplaybackutilitytest.cfg -../../init/Testframework.ini /epoc32/winscw/c/testframework/testframework.ini - PRJ_EXPORTS // Specify the source file followed by its destination here diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.mmp --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.mmp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.mmp Wed Oct 13 15:06:09 2010 +0300 @@ -38,8 +38,6 @@ USERINCLUDE ../inc -USERINCLUDE ../../inc - SOURCEPATH ../src @@ -56,9 +54,7 @@ LIBRARY stiftestengine.lib LIBRARY mpxplaybackutility.lib LIBRARY mpxcommon.lib -LIBRARY mpxcollectionutility.lib -LIBRARY bafl.lib - +LIBRARY mpxcollectionutility.lib LANG SC diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.pkg --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.pkg Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/group/mpxplaybackutilitytest.pkg Wed Oct 13 15:06:09 2010 +0300 @@ -34,8 +34,14 @@ ; Install files "\epoc32\release\armv5\udeb\mpxplaybackutilitytest.dll" - "!:\Sys\Bin\mpxplaybackutilitytest.dll" -"\epoc32\release\armv5\udeb\testvideoplaybackplugin.dll" - "!:\Sys\Bin\testvideoplaybackplugin.dll" -"\epoc32\data\z\resource\plugins\testvideoplaybackplugin.rsc" - "!:\resource\plugins\testvideoplaybackplugin.rsc" - "..\..\init\TestFramework.ini" - "c:\testframework\TestFramework.ini" "..\..\conf\mpxplaybackutilitytest.cfg" - "c:\testframework\mpxplaybackutilitytest.cfg" + +"..\..\data\mmc\Battle_160x100_30kbps.rm" - "f:\testing\data\Battle_160x100_30kbps.rm" +"..\..\data\mmc\20k_H263_WB_176x144_15fps.3gp" - "f:\testing\data\20k_H263_WB_176x144_15fps.3gp" +"..\..\data\mmc\30k_MPEG4_AAC_8Khz_176x144_15fps_30secs.mp4" - "f:\testing\data\30k_MPEG4_AAC_8Khz_176x144_15fps_30secs.mp4" +"..\..\data\mmc\80k_H264_AAC16M22_176x144_15fps.3gp" - "f:\testing\data\80k_H264_AAC16M22_176x144_15fps.3gp" +"..\..\data\mmc\DivX_MP3_256x112_30fps_300Kbps.avi" - "f:\testing\data\DivX_MP3_256x112_30fps_300Kbps.avi" +"..\..\data\mmc\honey_im_home_horror_ad.avi" - "f:\testing\data\honey_im_home_horror_ad.avi" +"..\..\data\mmc\MPEG4_VBR_176x144_15fps.3gp" - "f:\testing\data\MPEG4_VBR_176x144_15fps.3gp" +"..\..\data\mmc\XVID_176x144_15fps_261Kbps.avi" - "f:\testing\data\XVID_176x144_15fps_261Kbps.avi" diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytest.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytest.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytest.h Wed Oct 13 15:06:09 2010 +0300 @@ -40,14 +40,14 @@ _LIT( KmpxplaybackutilitytestLogFile, "mpxplaybackutilitytest.txt" ); _LIT( KmpxplaybackutilitytestLogFileWithTitle, "mpxplaybackutilitytest_[%S].txt" ); // data file -_LIT( KmpxplaybackutilityTestFilePath, "C:\\" ); +_LIT( KmpxplaybackutilityTestFilePath, "C:\\testing\\data\\" ); #else -_LIT( KmpxplaybackutilitytestLogPath, "c:\\logs\\testframework\\mpxplaybackutilitytest\\" ); +_LIT( KmpxplaybackutilitytestLogPath, "f:\\logs\\testframework\\mpxplaybackutilitytest\\" ); // Log file _LIT( KmpxplaybackutilitytestLogFile, "mpxplaybackutilitytest.txt" ); _LIT( KmpxplaybackutilitytestLogFileWithTitle, "mpxplaybackutilitytest_[%S].txt" ); // data file -_LIT( KmpxplaybackutilityTestFilePath, "c:\\" ); +_LIT( KmpxplaybackutilityTestFilePath, "f:\\testing\\data\\" ); #endif // FUNCTION PROTOTYPES @@ -204,17 +204,6 @@ TInt MMPXPlaybackUtilityAddObserverL(CStifItemParser& /*aItem*/); TInt MMPXPlaybackUtilityRemoveObserverL(CStifItemParser& /*aItem*/); TInt MMPXPlaybackUtilityPlayerManagerSelectPlayerL(CStifItemParser& /*aItem*/); - - TInt MMPXPlaybackUtilityCommandPlayL ( CStifItemParser & /*aItem*/ ); - TInt MMPXPlaybackUtilityCommandStopL ( CStifItemParser & /*aItem*/ ); - TInt MMPXPlaybackUtilityCommandPauseL ( CStifItemParser & /*aItem*/); - TInt MMPXPlaybackUtilityCommandPlayPauseL ( CStifItemParser & /*Item*/); - TInt MMPXPlaybackUtilityCommandPlayCompleteL ( CStifItemParser & /*Item*/); - TInt MMPXPlaybackUtilityCommandSeekForwardL ( CStifItemParser & /*Item*/); - TInt MMPXPlaybackUtilityCommandSeekBackwardL ( CStifItemParser & /*Item*/); - TInt MMPXPlaybackUtilityCommandCloseL ( CStifItemParser & /*Item*/); - TInt MMPXPlaybackUtilitySetL(CStifItemParser& /*aItem*/ ); - TInt EndTest(CStifItemParser& /*aItem*/); /** @@ -230,8 +219,6 @@ RFs iFs; TInt iCallbackError; RFile iFile; - TFileName iFileName; - #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API RFile64 iFile64; #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytestdefs.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytestdefs.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/inc/mpxplaybackutilitytestdefs.h Wed Oct 13 15:06:09 2010 +0300 @@ -21,26 +21,8 @@ const TInt KGeneralPlaybackMsgOffset = 0; const TInt KVideoPlaybackMsgOffset = 100; const TInt KStifPlaybackMsgOffset = 200; - - - - const TInt KMPXMessageStif = 0x20011397; -// -// TInt for Command Id -// -const TMPXAttributeData KMPXStifPlaybackCommand = { KMPXMessageStif, 0x01 }; - - -enum TMPXStifCommand -{ - EPbStifPlayComplete, - EPbStifSeekForward, - EPbStifSeekBackward - -}; - #endif // MPXPLAYBACKUTILITYTESTDEFS_H diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/src/mpxplaybackutilitytestBlocks.cpp --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/src/mpxplaybackutilitytestBlocks.cpp Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappfw_plat/mpx_playback_utility_api/tsrc/mpxplaybackutilitytest/src/mpxplaybackutilitytestBlocks.cpp Wed Oct 13 15:06:09 2010 +0300 @@ -18,10 +18,6 @@ // [INCLUDE FILES] - do not remove -#include -#include -#include - #include #include #include @@ -36,9 +32,6 @@ #include #include "mpxplaybackutilitytest.h" #include "mpxplaybackutilitytestdefs.h" -#include "testcommonpluginuids.h" - -const TUid KPbTestVideoPlugin = {KPlaybackTestVideoPluginImpId}; // ============================ MEMBER FUNCTIONS =============================== // --------------------------------------------------------------------------- @@ -47,54 +40,52 @@ // --------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::HandlePlaybackMessage( CMPXMessage* aMessage, TInt aError ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::HandlePlaybackMessage( CMPXMessage* aMessage, TInt aError )"); - iLog->Log(_L("Cmpxplaybackutilitytest::HandlePlaybackMessage: Error %d"), aError); + { + iLog->Log(_L("Cmpxharvestertest::HandlePlaybackMessage: Error %d"), aError); if ( !aError ) - { + { TMPXMessageId id( *(aMessage->Value(KMPXMessageGeneralId)) ); TInt event( *aMessage->Value( KMPXMessageGeneralEvent ) ); TInt type( *aMessage->Value( KMPXMessageGeneralType ) ); TInt data( *aMessage->Value( KMPXMessageGeneralData ) ); if ( KMPXMessageGeneral == id ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::HandlePlaybackMessage() General event = %d type = %d value = %d"), event, type, data ); RemoveExpectedEventL( KGeneralPlaybackMsgOffset + event, type, data ); - } + } else if ( KMPXMediaIdVideoPlayback == id ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::HandlePlaybackMessage() Video event = %d type = %d value = %d"), event, type, data ); RemoveExpectedEventL( KVideoPlaybackMsgOffset + event, type, data ); - } + } else if ( KMPXMessageStif ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::HandlePlaybackMessage() STIF event = %d type = %d value = %d"), event, type, data ); RemoveExpectedEventL( KStifPlaybackMsgOffset + event, type, data ); + } + } + else + { + if ( !iCallbackError ) + { + iCallbackError = aError; + } } } - else - { - if ( !iCallbackError ) - { - iCallbackError = aError; - } - } -} // --------------------------------------------------------------------------- // Handle playback property. // --------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError )"); - iLog->Log(_L("Cmpxplaybackutilitytest::HandlePropertyL: Property %d, Value %d, Error %d"), + { + iLog->Log(_L("Cmpxharvestertest::HandlePropertyL: Property %d, Value %d, Error %d"), aProperty, aValue, aError); -} + } // --------------------------------------------------------------------------- // Method is called continously until aComplete=ETrue, signifying that @@ -106,20 +97,18 @@ const MDesCArray* aSubPlayers, TBool aComplete, TInt aError ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::HandleSubPlayerNamesL( TUid aPlayer, const MDesCArray* aSubPlayers, TBool aComplete, TInt aError)"); - iLog->Log(_L("Cmpxplaybackutilitytest::HandleSubPlayerNamesL: Complete %d, Error %d"), aComplete, aError); -} + { + iLog->Log(_L("Cmpxharvestertest::HandleSubPlayerNamesL: Complete %d, Error %d"), aComplete, aError); + } // --------------------------------------------------------------------------- // Call back of media request. // --------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::HandleMediaL( const CMPXMedia& aProperties, TInt aError ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::HandleMediaL( const CMPXMedia& aProperties, TInt aError )"); - iLog->Log(_L("Cmpxplaybackutilitytest::HandleMediaL: Error %d"), aError); -} + { + iLog->Log(_L("Cmpxharvestertest::HandleMediaL: Error %d"), aError); + } // --------------------------------------------------------------------------- // Handle completion of a asynchronous command. @@ -127,10 +116,9 @@ // --------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::HandlePlaybackCommandComplete( CMPXCommand* aCommandResult, TInt aError ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::HandlePlaybackCommandComplete( CMPXCommand* aCommandResult, TInt aError )"); - iLog->Log(_L("Cmpxplaybackutilitytest::HandlePlaybackCommandComplete: Error %d"), aError); -} + { + iLog->Log(_L("Cmpxharvestertest::HandlePlaybackCommandComplete: Error %d"), aError); + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::Delete @@ -139,26 +127,15 @@ // ----------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::Delete() -{ - TInt delerr = KErrNone; - - iMPXPlaybackUtility->Close(); + { + iMPXPlaybackUtility->Close(); #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API iFile64.Close(); #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API iFile.Close(); - - if ( BaflUtils::FileExists( iFs, iFileName ) ) - { - User::After( 1000000 * 10 ); - delerr = BaflUtils::DeleteFile(iFs,iFileName); - iLog->Log(_L("deleting tempfile delerr=%d"),delerr); - } iFs.Close(); iExpectedEventArray->ResetAndDestroy(); - -} - + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::CreateL @@ -167,22 +144,21 @@ // ----------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::CreateL() -{ + { iFs.Connect(); iFs.ShareProtected(); iExpectedEventArray = new (ELeave) CArrayPtrFlat( 1 ); iCallbackError = KErrNone; iMPXPlaybackUtility = NULL; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::AddExpectedEventL // ----------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::AddExpectedEventL( TInt aEvent, TInt aType, TInt aData ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::AddExpectedEventL( TInt aEvent, TInt aType, TInt aData )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::AddExpectedEventL() event = %d type = %d value = %d"), aEvent, aType, aData ); @@ -191,25 +167,24 @@ event->iType = aType; event->iData = aData; iExpectedEventArray->AppendL( event ); -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::RemoveExpectedEventL // ----------------------------------------------------------------------------- // void Cmpxplaybackutilitytest::RemoveExpectedEventL( TInt aEvent, TInt aType, TInt aData ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::RemoveExpectedEventL( TInt aEvent, TInt aType, TInt aData )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::RemoveExpectedEventL() event = %d type = %d value = %d"), aEvent, aType, aData ); if ( (iExpectedEventArray->Count() > 0) && - ((*iExpectedEventArray)[0]->iEvent == aEvent) && ((*iExpectedEventArray)[0]->iType == aType)) - { + ((*iExpectedEventArray)[0]->iEvent == aEvent) ) + { iLog->Log(_L("Cmpxplaybackutilitytest::RemoveExpectedEventL() event = %d removed."), aEvent); iExpectedEventArray->Delete( 0 ); + } } -} // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::RunMethodL @@ -217,9 +192,9 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::RunMethodL( CStifItemParser& aItem ) -{ + { static TStifFunctionInfo const KFunctions[] = - { + { // Copy this line for every implemented function. // First string is the function name used in TestScripter script file. // Second is the actual implementation member function. @@ -241,25 +216,14 @@ ENTRY( "MMPXPlaybackUtilityAddObserverL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL ), ENTRY( "MMPXPlaybackUtilityRemoveObserverL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL ), ENTRY( "MMPXPlaybackUtilityPlayerManagerSelectPlayerL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL ), - - ENTRY( "MMPXPlaybackUtilityCommandPlayL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayL ), - ENTRY( "MMPXPlaybackUtilityCommandStopL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandStopL ), - ENTRY( "MMPXPlaybackUtilityCommandPauseL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPauseL ), - ENTRY( "MMPXPlaybackUtilityCommandPlayPauseL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayPauseL ), - ENTRY( "MMPXPlaybackUtilityCommandPlayCompleteL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayCompleteL ), - ENTRY( "MMPXPlaybackUtilityCommandSeekForwardL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekForwardL ), - ENTRY( "MMPXPlaybackUtilityCommandSeekBackwardL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekBackwardL ), - ENTRY( "MMPXPlaybackUtilityCommandCloseL", Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandCloseL ), - ENTRY( "MMPXPlaybackUtilitySetL", Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL), - ENTRY( "EndTest", Cmpxplaybackutilitytest::EndTest ), - }; + }; const TInt count = sizeof( KFunctions ) / sizeof( TStifFunctionInfo ); return RunInternalL( KFunctions, count, aItem ); -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL @@ -268,29 +232,28 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL( CStifItemParser& aItem )"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL")); + { + iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL")); TInt err = KErrNone; TInt mode; if ( aItem.GetNextInt(mode) != KErrNone ) - { + { iLog->Log(_L("MMPXPlaybackUtilityNewL - Missing playback mode.")); err = KErrArgument; return err; - } + } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL: mode %d"), mode); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityNewL: mode %d"), mode); TRAP( err,iMPXPlaybackUtility = MMPXPlaybackUtility::NewL(TUid::Uid(mode), this )); if (err!= KErrNone) - { - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewL: error %d"), err); - } + { + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityNewL: error %d"), err); + } return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL @@ -299,36 +262,35 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL")); TInt err = KErrNone; TInt mode; TInt category; if ( aItem.GetNextInt(category) != KErrNone ) - { + { iLog->Log(_L("MMPXPlaybackUtilityNewWithCatL - Missing category.")); err = KErrArgument; return err; - } + } if ( aItem.GetNextInt(mode) != KErrNone ) - { + { iLog->Log(_L("MMPXPlaybackUtilityNewWithCatL - Missing playback mode.")); err = KErrArgument; return err; - } + } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL: category %d"), category); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL: mode %d"), mode); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityNewWithCatL: category %d"), category); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityNewWithCatL: mode %d"), mode); TRAP( err,iMPXPlaybackUtility = MMPXPlaybackUtility::NewL((TMPXCategory)category, TUid::Uid(mode), this )); if (err!= KErrNone) - { - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityNewWithCatL: error %d"), err); + { + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityNewWithCatL: error %d"), err); + } + return err; } - return err; -} // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL @@ -337,27 +299,26 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL")); TInt err = KErrNone; TInt mode = 0; aItem.GetNextInt(mode); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL: mode %d"), mode); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityUtilityL: mode %d"), mode); if ( mode ) - { + { TRAP(err,iMPXPlaybackUtility = MMPXPlaybackUtility::UtilityL(TUid::Uid(mode))); - } + } else - { + { TRAP(err,iMPXPlaybackUtility = MMPXPlaybackUtility::UtilityL()); - } + } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityL: error %d"), err); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityUtilityL: error %d"), err); return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL @@ -366,36 +327,35 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL")); TInt err = KErrNone; TInt category; TInt mode = 0; if ( aItem.GetNextInt(category) != KErrNone ) - { + { iLog->Log(_L("MMPXPlaybackUtilityNewWithCatL - Missing category.")); err = KErrArgument; return err; - } + } aItem.GetNextInt(mode); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL: category %d"), category); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL: mode %d"), mode); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityUtilityWithCatL: category %d"), category); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityUtilityWithCatL: mode %d"), mode); if ( mode ) - { + { TRAP(err,iMPXPlaybackUtility = MMPXPlaybackUtility::UtilityL((TMPXCategory)category, TUid::Uid(mode))); - } + } else - { + { TRAP(err,iMPXPlaybackUtility = MMPXPlaybackUtility::UtilityL((TMPXCategory)category)); - } + } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityUtilityWithCatL: error %d"), err); + iLog->Log(_L("Cmpxharvestertest::MMPXPlaybackUtilityUtilityWithCatL: error %d"), err); return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithPlaylistL @@ -404,8 +364,7 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithPlaylistL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithPlaylistL( CStifItemParser& )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithPlaylistL")); TInt err = KErrNone; CMPXCollectionPlaylist* playlist = CMPXCollectionPlaylist::NewL(); @@ -414,7 +373,7 @@ CleanupStack::PopAndDestroy(playlist); iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithPlaylistL - error=%d"),err); return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL @@ -423,60 +382,35 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL")); - TInt err = KErrNone; + TInt err = KErrNone; TPtrC string; - - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); - + if( aItem.GetNextString( string ) == KErrNone ) - { - //TBuf<120> uri; - TFileName uri; + { + TBuf<120> uri; uri.Append(KmpxplaybackutilityTestFilePath); uri.Append(string); iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL - uri = %S."), &uri); - iFileName = uri; - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile.Create( iFs, uri, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile.Close(); - } - TRAP(err,iMPXPlaybackUtility->InitL(uri)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } + iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL - error=%d"),err); } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithUriL - error=%d"),err); - } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInitWithUriL - Missing file name.")); err = KErrArgument; + } + return err; } - - return err; -} // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL @@ -485,68 +419,43 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL")); TInt err = KErrNone; TPtrC string; - - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); if( aItem.GetNextString( string ) == KErrNone ) - { + { TBuf<120> KFrom; KFrom.Append(KmpxplaybackutilityTestFilePath); KFrom.Append(string); - iFileName = KFrom; - if ( iFile.SubSessionHandle() ) - { + { iFile.Close(); - } - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile.Create( iFs, KFrom, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile.Close(); - } - + } err = iFile.Open(iFs, KFrom, EFileRead | EFileShareReadersOrWriters); - if ( err == KErrNone ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL - Open passed.")); TRAP(err,iMPXPlaybackUtility->InitL(iFile)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } } + iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL - error=%d"),err); } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitWithRFileL - error=%d"),err); - } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInitWithRFileL - Missing file name.")); err = KErrArgument; - } + } return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL @@ -555,60 +464,36 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL")); TInt err = KErrNone; TPtrC string; TInt accessPoint = 1; - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); - if( aItem.GetNextString( string ) == KErrNone ) - { + { TBuf<120> uri; uri.Append(KmpxplaybackutilityTestFilePath); uri.Append(string); iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL - uri = %S."), &uri); - iFileName = uri; - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile.Create( iFs, uri, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile.Close(); - } - TRAP(err,iMPXPlaybackUtility->InitStreamingL(uri, NULL, accessPoint)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } - + iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL - error=%d"),err); } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithUriL - error=%d"),err); - } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInitStreamingWithUriL - Missing file name.")); err = KErrArgument; - } + } return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL @@ -617,69 +502,44 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL")); TInt err = KErrNone; TPtrC string; TInt accessPoint = 1; - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); - if( aItem.GetNextString( string ) == KErrNone ) - { + { TBuf<120> KFrom; KFrom.Append(KmpxplaybackutilityTestFilePath); KFrom.Append(string); - iFileName = KFrom; - if ( iFile.SubSessionHandle() ) - { + { iFile.Close(); - } - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile.Create( iFs, KFrom, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile.Close(); - } - + } err = iFile.Open(iFs, KFrom, EFileRead | EFileShareReadersOrWriters); if ( err == KErrNone ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL - Open passed.")); TRAP(err,iMPXPlaybackUtility->InitStreamingL(iFile, accessPoint)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } - } - } iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreamingWithRFileL - error=%d"),err); - } + } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInitStreamingWithRFileL - Missing file name.")); err = KErrArgument; - } + } return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L @@ -688,8 +548,7 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L")); TInt err = KErrNone; #ifndef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API @@ -698,64 +557,39 @@ #else // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API TPtrC string; - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); - if( aItem.GetNextString( string ) == KErrNone ) - { + { TBuf<120> KFrom; KFrom.Append(KmpxplaybackutilityTestFilePath); KFrom.Append(string); - iFileName = KFrom; - if ( iFile64.SubSessionHandle() ) - { + { iFile64.Close(); - } - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile64.Create( iFs, KFrom, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile64.Close(); - } - + } err = iFile64.Open(iFs, KFrom, EFileRead | EFileShareReadersOrWriters); - if ( err == KErrNone ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L - Open passed.")); TRAP(err,iMPXPlaybackUtility->Init64L(iFile64)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } - } - } iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInit64L - error=%d"),err); - } + } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInit64L - Missing file name.")); err = KErrArgument; - } + } #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L @@ -764,8 +598,7 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L( CStifItemParser& aItem )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L")); TInt err = KErrNone; #ifndef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API @@ -775,63 +608,39 @@ TPtrC string; TInt accessPoint = 1; - MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - MMPXPlayer* player = manager.CurrentPlayer(); - if( aItem.GetNextString( string ) == KErrNone ) - { + { TBuf<120> KFrom; KFrom.Append(KmpxplaybackutilityTestFilePath); KFrom.Append(string); - iFileName = KFrom; - if ( iFile64.SubSessionHandle() ) - { + { iFile64.Close(); - } - - if ( ! BaflUtils::FileExists( iFs, iFileName ) ) - { - err = iFile64.Create( iFs, KFrom, EFileShareAny ); - iLog->Log(_L("creating tempfile error=%d"),err); - iFile64.Close(); - } - + } err = iFile64.Open(iFs, KFrom, EFileRead | EFileShareReadersOrWriters); - if ( err == KErrNone ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L - Open passed.")); TRAP(err,iMPXPlaybackUtility->InitStreaming64L(iFile64, accessPoint)); if ( !err ) - { + { TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPlayerChanged; AddExpectedEventL(event, 0, 0); - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EInitializeComplete; AddExpectedEventL(event, 0, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateInitialised, 0); - - if ( player->UidL() == KPbTestVideoPlugin ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateBuffering, 0); } } + iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L - error=%d"),err); } - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityInitStreaming64L - error=%d"),err); - } else - { + { iLog->Log(_L("MMPXPlaybackUtilityInitStreaming64L - Missing file name.")); err = KErrArgument; - } + } #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityFile64L @@ -840,8 +649,7 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityFile64L( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityFile64L( CStifItemParser& )"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityFile64L")); TInt err = KErrNone; #ifndef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API @@ -851,13 +659,13 @@ RFile64* file64Ptr=NULL; TRAP(err, file64Ptr=iMPXPlaybackUtility->Source()->File64L()); if ( !file64Ptr->SubSessionHandle() ) - { + { iLog->Log(_L("MMPXPlaybackUtilityFile64L - file64 = NULL.")); - } + } iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityFile64L - error=%d"),err); #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL @@ -866,14 +674,13 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL( CStifItemParser&)"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL")); TInt err = KErrNone; TRAP(err, iMPXPlaybackUtility->AddObserverL(*this)); iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityAddObserverL - error=%d"),err); return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL @@ -882,14 +689,13 @@ // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL( CStifItemParser&)"); + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL")); TInt err = KErrNone; TRAP(err, iMPXPlaybackUtility->RemoveObserverL(*this)); iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityRemoveObserverL - error=%d"),err); return err; -} + } // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL @@ -897,499 +703,51 @@ // (other items were commented in a header). // ----------------------------------------------------------------------------- // -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL(CStifItemParser& aItem)"); +TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL(CStifItemParser& aItem) + { iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityPlayerManagerSelectPlayerL")); TInt uidInt; TInt err = KErrNone; // read in UID if ( aItem.GetNextInt(uidInt) != KErrNone ) - { + { iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - Missing UID.")); err = KErrArgument; return err; - } + } iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - UID = 0x%x."), uidInt); if ( iMPXPlaybackUtility ) - { + { MMPXPlayerManager& manager = iMPXPlaybackUtility->PlayerManager(); - - if (uidInt == 0x10282551) - { - iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL video uid")); - MPX_DEBUG2(("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - uidInt = %d."), uidInt); - TRAP( err, manager.SelectPlayerL( KPbTestVideoPlugin ) ); + TRAP( err, manager.SelectPlayerL( TUid::Uid(uidInt) ) ); + iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - SelectPlayer err = %d."), err); } - else + else { - iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL NOT video uid")); - MPX_DEBUG1(("MMPXPlaybackUtilityPlayerManagerSelectPlayerL NOT video uid")); - TRAP( err, manager.SelectPlayerL( TUid::Uid(uidInt) ) ); - } - iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - SelectPlayer err = %d."), err); - } - else - { iLog->Log(_L("MMPXPlaybackUtilityPlayerManagerSelectPlayerL - MPX Playback Utility not created.")); err = KErrGeneral; - } - return err; -} - - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayL")); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralType, EPbCmdPlay); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayL err from commandl: , err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandPlayL err from commandl: , err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayL no error from commandl:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPlayL no err from commandl:")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - if ( s != EPbStatePlaying ) - { - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePlaying, 0); } - } - - CleanupStack::PopAndDestroy (cmd); - return err; -} - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandStopL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandStopL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandStopL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandStopL")); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralType, EPbCmdStop); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandStopL err from commandl: , err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandStopL err from commandl: , err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandStopL no error from commandl:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandStopL no err from commandl:")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - if ( s != EPbStateStopped ) - { - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateStopped, 0); - } - - } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPauseL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPauseL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPauseL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPauseL")); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralType, EPbCmdPause); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandPauseL err from commandl: , err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandPauseL err from commandl: , err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPauseL no error from commandl:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPauseL no err from commandl:")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - if ( s == EPbStatePlaying ) - { - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePaused, 0); - } - - } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayPauseL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayPauseL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayPauseL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayPauseL")); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralType, EPbCmdPlayPause); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayPauseL err from commandl: err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandPlayPauseL err from commandl: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayPauseL no error from commandl")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPlayPauseL no error from commandl")); - - - - if (s == EPbStatePlaying) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayPauseL EPbStatePlaying:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPlayPauseL EPbStatePlaying:")); - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePaused, 0); - } - else - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayPauseL State is not playing:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPlayPauseL State is not playing:")); - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePlaying, 0); - } } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayCompleteL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayCompleteL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayCompleteL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandPlayCompleteL")); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXMessageStif); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - cmd->SetTObjectValueL( KMPXStifPlaybackCommand, - EPbStifPlayComplete ); - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayCompleteL error from commandl: err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandPlayCompleteL error from commandl: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandPlayCompleteL no error from commandl")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandPlayCompleteL no error from commandl")); - - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPropertyChanged; - AddExpectedEventL(event, EPbPropertyPosition, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateStopped, 0); - } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekForwardL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekForwardL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekForwardL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekForwardL")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXMessageStif); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL( KMPXStifPlaybackCommand, - EPbStifSeekForward ); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, s); - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandSeekForwardL error from commandl: err = %d"), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandSeekForwardL error from commandl: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandSeekForwardL no error from commandl")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandSeekForwardL no error from commandl")); - - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePluginSeeking, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPropertyChanged; - AddExpectedEventL(event, EPbPropertyPosition, 0); - - if ( s == EPbStatePlaying ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePlaying, 0); - } - else if ( s == EPbStatePaused ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePaused, 0); - } - } - CleanupStack::PopAndDestroy (cmd); - - return err; -} - - - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekBackwardL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekBackwardL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekBackwardL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandSeekBackwardL")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXMessageStif); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL( KMPXStifPlaybackCommand, - EPbStifSeekBackward ); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, s); - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandSeekBackwardL error from commandl: err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandSeekBackwardL error from commandl: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandSeekForwardL no error from commandl")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandSeekForwardL no error from commandl")); - - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePluginSeeking, 0); - - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPropertyChanged; - AddExpectedEventL(event, EPbPropertyPosition, 0); - - if ( s == EPbStatePlaying ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePlaying, 0); - } - else if ( s == EPbStatePaused ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStatePaused, 0); - } - } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandCloseL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandCloseL( CStifItemParser& /*aItem*/ ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandCloseL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilityCommandCloseL")); - - TMPXPlaybackState s = iMPXPlaybackUtility->StateL(); - - //create command - CMPXCommand* cmd = CMPXCommand::NewL(); - CleanupStack::PushL( cmd ); - - cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral); - cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralType, EPbCmdClose); - cmd->SetTObjectValueL(KMPXCommandPlaybackGeneralData, 0); - - TRAPD(err,iMPXPlaybackUtility->CommandL( *cmd )); - - iLog->Log(_L("MMPXPlaybackUtilityCommandCloseL err from commandl: err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilityCommandCloseL err from commandl: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilityCommandCloseL no error from commandl:")); - MPX_DEBUG1(("MMPXPlaybackUtilityCommandCloseL no err from commandl:")); - - TInt event; - - if ( s != EPbStateStopped ) - { - event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EStateChanged; - AddExpectedEventL(event, EPbStateStopped, 0); - } - } - - CleanupStack::PopAndDestroy (cmd); - - return err; -} - - -// ----------------------------------------------------------------------------- -// Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL -// ----------------------------------------------------------------------------- -// -TInt Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL( CStifItemParser& aItem ) -{ - MPX_FUNC_EX("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL(CStifItemParser&)"); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL")); - - TInt err = KErrNone; - TInt property; - TInt value; - - - if( aItem.GetNextInt( property ) != KErrNone ) - { - MPX_DEBUG1(("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL missing property " )); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL missing property " )); - err = KErrArgument; - return err; - } - - if ( aItem.GetNextInt( value ) != KErrNone) - { - MPX_DEBUG1(("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL missing value " )); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL missing value " )); - err = KErrArgument; - return err; - } - - MPX_DEBUG3(("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL property = %d, value = %d"), property, value ); - iLog->Log(_L("Cmpxplaybackutilitytest::MMPXPlaybackUtilitySetL property = %d, value %d") , property, value ); - - TRAP(err, iMPXPlaybackUtility->SetL((TMPXPlaybackProperty)property, value )); - - iLog->Log(_L("MMPXPlaybackUtilitySetL err from SetL: err = %d."), err); - MPX_DEBUG2(("MMPXPlaybackUtilitySetL err from SetL: err = %d."), err); - - if ( !err ) - { - iLog->Log(_L("MMPXPlaybackUtilitySetL no error from SetL")); - MPX_DEBUG1(("MMPXPlaybackUtilitySetL no err from SetL")); - - TInt event = KGeneralPlaybackMsgOffset + TMPXPlaybackMessage::EPropertyChanged; - AddExpectedEventL(event, property, value); - } - - return err; -} - // ----------------------------------------------------------------------------- // Cmpxplaybackutilitytest::EndTest // ----------------------------------------------------------------------------- // TInt Cmpxplaybackutilitytest::EndTest( CStifItemParser& /*aItem*/ ) -{ + { iLog->Log(_L("Cmpxplaybackutilitytest::EndTest")); TInt err = iCallbackError; // check if event queue is empty if ( !err && (iExpectedEventArray->Count() > 0 ) ) - { + { iLog->Log(_L("Cmpxplaybackutilitytest::EndTest error = KErrTimedOut")); err = KErrTimedOut; + } + return err; } - - return err; -} // end of file diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/data/e0000201.rss --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/data/e0000201.rss Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Resource file -* -*/ - -/* - * The opaque_data syntax is made up of three parts: - * a list of Uids for resolving the view plugin, feature flags, priority. - * - *

uid1;uid2;uid3

- * uid*: Supported plugin types. - * E.g. if podcast plugin may support music plugin as well, - * KMPXColPluginMusic - * - * uid - * uid: plugin type uid. - * E.g. for music plugin will be: 0x101FFCDA - * - * flags [optional] - * flags: sum of the required feature flags, not used now - * - * priority [optional] - * priority: a value of type TMPXCollectionPluginPriorities. This value - * determines the returning order when several plugins can - * support the same set of Uids. - * Default value of this field is EMPXCollectionPluginPriorityNormal. - */ - -#include -#include -#include "testcommonpluginuids.h" -#include "testplaybackplugintype.h" - -RESOURCE REGISTRY_INFO theInfo -{ - dll_uid = KPlaybackTestVideoPlugin; - - interfaces = - { - INTERFACE_INFO - { - interface_uid = KMPXPlaybackPluginInterfaceUid; - implementations = - { - IMPLEMENTATION_INFO - { - implementation_uid = KPlaybackTestVideoPluginImpId; - version_no = 1; - display_name = "TestVideoPlaybackPlugin"; - default_data = ""; - opaque_data = - "" - ""EPbUnknown"" - ""EMPXPlaybackPluginPriorityHighest"" - ""MPXPlaybackPluginVersion2""; - } - }; - } - }; -} - - diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/group/bld.inf --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/group/bld.inf Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Build information file for Playback test plugin -* -*/ - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS - -PRJ_TESTMMPFILES -testvideoplaybackplugin.mmp - -PRJ_MMPFILES - -// End of File - diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/group/testvideoplaybackplugin.mmp --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/group/testvideoplaybackplugin.mmp Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Playback test plugin project specification -* -*/ - -#include -#include -#include - -#include "../../inc/testcommonpluginuids.h" - -TARGET testvideoplaybackplugin.dll -TARGETTYPE PLUGIN -UID 0x10009D8D KPlaybackTestVideoPlugin - -VENDORID VID_DEFAULT -CAPABILITY CAP_ECOM_PLUGIN - -SOURCEPATH ../src -SOURCE testvideoplaybackplugin.cpp - -SOURCEPATH ../data -START RESOURCE e0000201.RSS -TARGET testvideoplaybackplugin.rsc -END - -USERINCLUDE ../inc -USERINCLUDE ../../inc -USERINCLUDE ../../mpxplaybackutilitytest/inc - - -APP_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY ecom.lib -LIBRARY efsrv.lib -LIBRARY estor.lib -LIBRARY BAFL.lib -LIBRARY flogger.lib -LIBRARY mpxcommon.lib - -SOURCEPATH ../src -SOURCE testvideoplaybackpluginproxy.cpp - -//end of file \ No newline at end of file diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/inc/testvideoplaybackplugin.h --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/inc/testvideoplaybackplugin.h Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,268 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation of testvideoplaybackplugin interface -* -*/ - -#ifndef _CTESTVIDEOPLAYBACKPLUGIN_H_ -#define _CTESTVIDEOPLAYBACKPLUGIN_H_ - -// -// INCLUDES -// -#include - -#include -#include -#include -#include - -#include "mpxplaybackutilitytest.h" - - - - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include "mpxmediavideodefs.h" - -typedef struct -{ - TInt iEvent; - TInt iData; - TInt iError; -} TTestVideoPlaybackCallbackEvent; - -typedef CArrayPtrFlat CCallbackArray; - -// -// CLASS DECLARATION -// - -/* - * CTestVideoPlaybackPlugin class - * - */ - -NONSHARABLE_CLASS( CTestVideoPlaybackPlugin ) : public CMPXPlaybackPluginVersion2 - -{ - public: - // - // Constructors and destructor - // - - /* - * Two-phased constructor. - * @param aInitParams, initialization parameter - * @return a pointer to the created instance - */ - static CTestVideoPlaybackPlugin* NewL(TAny* aInitParams); - - /* - * Destructor - * Destroy the object and release all memory objects - */ - ~CTestVideoPlaybackPlugin(); - - /* - * Returns the current file handle iFile - */ - RFile GetFileHandle(); - - /** - * Initializes a file for playback. - * - * @since S60 9.2 - * @param aUri URI of the item - * @param aType the mime type of the item - * @param aAccessPoint the access point - */ - void InitStreamingL(const TDesC& aUri, const TDesC8& aType, TInt aAccessPoint, TInt aPosition); - - /** - * Initializes a file handle for playback. - * - * @since S60 9.2 - * @param aFile file handle of a file - * @param aAccessPoint the access point - */ - void InitStreamingL(RFile& aFile, TInt aAccessPoint, TInt aPosition); - -#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API - /** - * Initializes a file handle for playback. - * - * @since S60 9.2 - * @param aFile 64 bit file handle of a file - * @param aAccessPoint the access point - */ - void InitStreaming64L(RFile64& aFile, TInt aAccessPoint, TInt aPosition); - - /** - * Initializes a song for playback. - * - * @since S60 9.2 - * @param aFile 64 bit file handle of a song - */ - void Initialise64L(RFile64& aFile, TInt aPosition); -#endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API - - /** - * Initializes a song for playback. - * - * @since S60 9.2 - * @param aSong the song path - * @param aPosition the starting position - */ - virtual void InitialiseWithPositionL(const TDesC& aSong, TInt aPosition = 0 ); - - /** - * Initializes a song for playback. - * - * @since S60 9.2 - * @param aFile file handle of a song - * @param aPosition the starting position - */ - virtual void InitialiseWithPositionL(RFile& aSong, TInt aPosition = 0); - - //runl for active object - void RunL(); - - void DoCancel(); - - private: - // - // CMPXPlaybackPlugin Implementation - // - - /* - * Set observer - * - * @param aObs observer - */ - void SetObserver( MMPXPlaybackPluginObserver& aObs ); - - /* - * Initializes a clip for playback - * @param aSong the song path - */ - void InitialiseL( const TDesC& aSong ); - - /* - * Initializes a song for playback - * @param aFile file handle of a song - */ - void InitialiseL( RFile& aFile ); - - /* - * Executes a command on the selected song - * @param aCmd a command - * @param aData, data - */ - void CommandL( CMPXCommand& aCmd ); - - // Supposedly being deprecated - // We're forced to implement this as its declared as a - // pure virtual function by the MPX framework - void CommandL(TMPXPlaybackCommand aCmd, TInt aData=0); - - /* - * Sets a property of the plugin - * @param aProperty a property - * @param aValue the value of the setting - */ - void SetL( TMPXPlaybackProperty aProperty , TInt aValue ); - - /* - * Gets a property of the plugin (async) - * @param aProperty a property - */ - void PropertyL( TMPXPlaybackProperty aProperty ) const; - - /* - * Gets a list of sub players - * @return a list of names of sub players - */ - void SubPlayerNamesL(); - - /* - * Select a sub player - * @param aIndex index to the sub player - */ - void SelectSubPlayerL( TInt aIndex ); - - /* - * Returns current sub player name - * @return friendly name of the current the sub player - */ - const TDesC& SubPlayerName(); - - /* - * Current sub player index - * @return index to the sub player - */ - TInt SubPlayerIndex() const; - - /* - * Media properties of the current file (async) - * @param aAttrs attributes requested - */ - void MediaL( const TArray& aAttrs ); - - /* - * Cancel async request - */ - void CancelRequest(); - - private: - /* - * C++ default constructor - */ - CTestVideoPlaybackPlugin(); - - /* - * the second phase constructor ConstructL to safely construct things - * that can leave - */ - void ConstructL(); - - void AddCallbackEvent( TTestVideoPlaybackCallbackEvent* event ); - static TInt SendEvent( TAny* aPtr ); - void DoSendEvent(); - - private: - - HBufC* iClipName; - RFs iFs; - RFile iFile; - CIdle* iCallback; //active object - CCallbackArray* iEventArray; -}; - -#endif diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/src/testvideoplaybackplugin.cpp --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/src/testvideoplaybackplugin.cpp Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,793 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CTestVideoPlaybackPlugin implementation -* -*/ - -// -// INCLUDE FILES -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "testvideoplaybackplugin.h" -#include "mpxplaybackutilitytestdefs.h" -#include "mpxplaybackutilitytest.h" - - -// -// CONSTANTS -// -const TUid KLocalPlaybackUid = { 0x10282556 }; - - -// ============================ MEMBER FUNCTIONS =============================== - -// ---------------------------------------------------------------------------- -// Two-phased constructor. -// ---------------------------------------------------------------------------- -// -CTestVideoPlaybackPlugin* CTestVideoPlaybackPlugin::NewL( TAny* /*aInitParams*/ ) -{ - - CTestVideoPlaybackPlugin* p = new (ELeave) CTestVideoPlaybackPlugin(); - CleanupStack::PushL(p); - p->ConstructL(); - CleanupStack::Pop(p); - return p; -} - -// ---------------------------------------------------------------------------- -// Symbian 2nd phase constructor can leave. -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::ConstructL() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::ConstructL()"); - User::LeaveIfError( iFs.Connect() ); - iFs.ShareProtected(); - - iEventArray = new (ELeave) CArrayPtrFlat( 1 ); - iCallback = CIdle::NewL( CActive::EPriorityLow ); -} - -// ---------------------------------------------------------------------------- -// C++ constructor -// ---------------------------------------------------------------------------- -// -CTestVideoPlaybackPlugin::CTestVideoPlaybackPlugin() - -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::CTestVideoPlaybackPlugin()"); -} - -// ---------------------------------------------------------------------------- -// Destructor -// ---------------------------------------------------------------------------- -// -CTestVideoPlaybackPlugin::~CTestVideoPlaybackPlugin() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::~CTestVideoPlaybackPlugin()"); - iFile.Close(); - iFs.Close(); - - if ( iCallback->IsActive() ) - { - iCallback->Cancel(); - } - - delete iCallback; - - iEventArray->ResetAndDestroy(); -} - -// ---------------------------------------------------------------------------- -// Set observer -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::SetObserver( MMPXPlaybackPluginObserver& aObs ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::SetObserver( MMPXPlaybackPluginObserver& aObs )"); - iObs = &aObs; -} - -// ---------------------------------------------------------------------------- -// Initializes a clip for playback from a file name -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::InitialiseL( const TDesC& aSong ) -{ - - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitialiseL( const TDesc& aSong)"); - - delete iClipName; - iClipName = NULL; - iClipName = aSong.AllocL(); - - iFile.Close(); - - TInt err = iFile.Open( iFs, aSong, EFileRead | EFileShareReadersOrWriters ); - - // - // Remap KErrNotReady to KErrNotFound, because it is referencing a drive - // that is not existent - // - if ( KErrNotReady == err ) - { - err = KErrNotFound; - } - - // if aSong is an streaming link and contains one of the streaming schemas - // eg. rtsp:// , http:// etc. then a file handle can not be opened - // ignore KErrBadName - if (err != KErrBadName) - { - User::LeaveIfError( err ); - } - - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -// ---------------------------------------------------------------------------- -// Initializes a clip for playback from a file handle -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::InitialiseL( RFile& aSong ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitialiseL( RFile& aSong )"); - - delete iClipName; - iClipName = NULL; - iClipName = HBufC::NewL( KMaxFileName ); - TPtr ptr = iClipName->Des(); - aSong.FullName( ptr ); - - iFile.Close(); - User::LeaveIfError( iFile.Duplicate( aSong )); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -/** -* Initializes a file for playback. -* -* @since S60 9.2 -* @param aUri URI of the item -* @param aType the mime type of the item -* @param aAccessPoint the access point -*/ -void CTestVideoPlaybackPlugin::InitStreamingL(const TDesC& /*aUri*/, - const TDesC8& /*aType*/, TInt /*aAccessPoint*/, TInt /*aPosition*/) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitStreamingL(const TDesC& /*aUri*/, const TDesC8& /*aType*/, TInt /*aAccessPoint*/, TInt /*aPosition*/)"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -/** -* Initializes a file handle for playback. -* -* @since S60 9.2 -* @param aFile file handle of a file -* @param aAccessPoint the access point -*/ -void CTestVideoPlaybackPlugin::InitStreamingL(RFile& /*aFile*/, TInt /*aAccessPoint*/, TInt /*aPosition*/) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitStreamingL(RFile& /*aFile*/, TInt /*aAccessPoint*/, TInt /*aPosition*/)"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API -/** -* Initializes a file handle for playback. -* -* @since S60 9.2 -* @param aFile 64 bit file handle of a file -* @param aAccessPoint the access point -*/ -void CTestVideoPlaybackPlugin::InitStreaming64L(RFile64& /*aFile*/, TInt /*aAccessPoint*/, TInt /*aPosition*/) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitStreaming64L(RFile64& /*aFile*/, TInt /*aAccessPoint*/, TInt /*aPosition*/)"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -/** -* Initializes a song for playback. -* -* @since S60 9.2 -* @param aFile 64 bit file handle of a song -*/ -void CTestVideoPlaybackPlugin::Initialise64L(RFile64& /*aSong*/, TInt /*aPosition*/) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::Initialise64L(RFile64& /*aSong*/, TInt /*aPosition*/)"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} -#endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API - -// ---------------------------------------------------------------------------- -// Executes a command on the selected song -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::CommandL( CMPXCommand& aCmd ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::CommandL( CMPXCommand& aCmd )"); - - if ( aCmd.IsSupported( KMPXStifPlaybackCommand ) ) - { - TMPXStifCommand cmd = static_cast(aCmd.ValueTObjectL(KMPXStifPlaybackCommand)); - TMPXPlaybackState state = static_cast(aCmd.ValueTObjectL(KMPXCommandPlaybackGeneralData)); - - MPX_DEBUG3("CTestVideoPlaybackPlugin::CommandL cmd = %d, state = %d ", cmd, state); - - switch ( cmd ) - { - case EPbStifPlayComplete: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbStifPlaybackComplete"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPlayComplete; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - case EPbStifSeekForward: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbStifSeekForward"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPluginSeeking; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPositionChanged; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - if ( state == EPbStatePlaying ) - { - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPlaying; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - } - else if ( state == EPbStatePaused ) - { - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPaused; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - } - break; - } - - case EPbStifSeekBackward: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbStifSeekBackward"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPluginSeeking; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPositionChanged; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - if ( state == EPbStatePlaying ) - { - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPlaying; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - } - else if ( state == EPbStatePaused ) - { - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPaused; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - } - break; - } - - default: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd default"); - break; - } - } - } -} - - -// ---------------------------------------------------------------------------- -// Executes a command on the selected song -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::CommandL(TMPXPlaybackCommand aCmd, TInt /*aData*/) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::CommandL(TMPXPlaybackCommand aCmd, TInt /*aData*/)"); - - MPX_DEBUG2("CTestVideoPlaybackPlugin::CommandL aCmd = %d", aCmd); - - switch (aCmd) - { - case EPbCmdPlay: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbCmdPlay"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPlaying; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - - case EPbCmdClose: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbCmdClose"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPClosed; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - - case EPbCmdStop: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbCmdStop"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPStopped; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - - case EPbCmdPause: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbCmdPause"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPaused; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - - case EPbCmdStartSeekForward: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd is EPbCmdStartSeekForward"); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPPluginSeeking; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPositionChanged; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPPlaying; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - break; - } - - default: - { - MPX_DEBUG1("CTestVideoPlaybackPlugin::CommandL aCmd default"); - break; - } - } -} - - -// ---------------------------------------------------------------------------- -// Sets a property of the plugin -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::SetL( TMPXPlaybackProperty aProperty, TInt aValue ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::SetL( TMPXPlaybackProperty /*aProperty*/, TInt /*aValue*/ )"); - MPX_DEBUG3("CTestVideoPlaybackPlugin::SetL aProperty = %d, aValue = %d", aProperty, aValue); - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPSetComplete; - event->iData = aProperty; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -// ---------------------------------------------------------------------------- -// Gets a property of the plugin (async) -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::PropertyL( TMPXPlaybackProperty /*aProperty*/ ) const -{ - -} - -// ---------------------------------------------------------------------------- -// Gets a list of sub players, UPnP only -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::SubPlayerNamesL() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::SubPlayerNamesL()"); - - iObs->HandleSubPlayerNames( KLocalPlaybackUid, NULL, ETrue, KErrNone ); -} - -// ---------------------------------------------------------------------------- -// Select a sub player -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::SelectSubPlayerL( TInt /*aIndex*/ ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::SelectSubPlayerL( TInt aIndex )"); - - User::Leave( KErrNotSupported ); -} - -// ---------------------------------------------------------------------------- -// Returns current sub player name -// ---------------------------------------------------------------------------- -// -const TDesC& CTestVideoPlaybackPlugin::SubPlayerName() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::SubPlayerName()"); - - return KNullDesC; -} - -// ---------------------------------------------------------------------------- -// Current sub player index -// ---------------------------------------------------------------------------- -// -TInt CTestVideoPlaybackPlugin::SubPlayerIndex() const -{ - - return KErrNotFound; -} - -// ---------------------------------------------------------------------------- -// Gets media properties -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::MediaL( const TArray& /*aAttrs*/ ) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::MediaL( const TArray TMPXAttribute )"); -} - -// ---------------------------------------------------------------------------- -// Cancel request -// ---------------------------------------------------------------------------- -// -void CTestVideoPlaybackPlugin::CancelRequest() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::CancelRequest()"); -} - -// ---------------------------------------------------------------------------- -// CTestVideoPlaybackPlugin::GetFileHandle() -// ---------------------------------------------------------------------------- -// -RFile CTestVideoPlaybackPlugin::GetFileHandle() -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::GetFileHandle()"); - - return iFile; -} - -/** -* Initializes a song for playback. -* -* @since S60 9.2 -* @param aSong the song path -* @param aPosition the starting position -*/ -void CTestVideoPlaybackPlugin::InitialiseWithPositionL(const TDesC& aSong, TInt aPosition) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitialiseWithPositionL(const TDesC& /*aSong*/, TInt /*aPosition*/)"); - - delete iClipName; - iClipName = NULL; - iClipName = aSong.AllocL(); - - iFile.Close(); - - TInt err = iFile.Open( iFs, aSong, EFileRead | EFileShareReadersOrWriters ); - - // - // Remap KErrNotReady to KErrNotFound, because it is referencing a drive - // that is not existent - // - if ( KErrNotReady == err ) - { - err = KErrNotFound; - } - - // if aSong is an streaming link and contains one of the streaming schemas - // eg. rtsp:// , http:// etc. then a file handle can not be opened - // ignore KErrBadName - if (err != KErrBadName) - { - User::LeaveIfError( err ); - } - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - -/** -* Initializes a song for playback. -* -* @since S60 9.2 -* @param aFile file handle of a song -* @param aPosition the starting position -*/ -void CTestVideoPlaybackPlugin::InitialiseWithPositionL(RFile& aSong, TInt aPosition) -{ - MPX_FUNC_EX("CTestVideoPlaybackPlugin::InitialiseWithPositionL(RFile& aSong, TInt aPosition)"); - - delete iClipName; - iClipName = NULL; - iClipName = HBufC::NewL( KMaxFileName ); - TPtr ptr = iClipName->Des(); - aSong.FullName( ptr ); - - iFile.Close(); - User::LeaveIfError( iFile.Duplicate( aSong )); - - - TTestVideoPlaybackCallbackEvent* event = new (ELeave) TTestVideoPlaybackCallbackEvent; - - event->iEvent = MMPXPlaybackPluginObserver::EPInitialised; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); - - event = new TTestVideoPlaybackCallbackEvent; - event->iEvent = MMPXPlaybackPluginObserver::EPBufferingStarted; - event->iData = 0; - event->iError = KErrNone; - - AddCallbackEvent( event ); -} - - -void CTestVideoPlaybackPlugin::RunL() -{ - MPX_FUNC_EX("CTestVideoPaybackPlugin::RunL"); -} - -void CTestVideoPlaybackPlugin::DoCancel() -{ - MPX_FUNC_EX("CTestVideoPaybackPlugin::DoCancel"); -} - -void CTestVideoPlaybackPlugin::AddCallbackEvent( TTestVideoPlaybackCallbackEvent* event ) -{ - MPX_DEBUG1("CTestVideoPlaybackPlugin::AddCallbackEvent"); - - iEventArray->AppendL( event ); - - if ( ! iCallback->IsActive() ) - { - iCallback->Start( TCallBack( CTestVideoPlaybackPlugin::SendEvent, this ) ); - } -} - -TInt CTestVideoPlaybackPlugin::SendEvent (TAny* aPtr ) -{ - MPX_DEBUG1("CTestVideoPlaybackPlugin::SendEvent"); - - static_cast(aPtr)->DoSendEvent(); - - return KErrNone; -} - -void CTestVideoPlaybackPlugin::DoSendEvent() -{ - MPX_DEBUG1("-->CTestVideoPlaybackPlugin::DoSendEvent"); - - TInt count = iEventArray->Count(); - - if ( count > 0 ) - { - TTestVideoPlaybackCallbackEvent* event = (*iEventArray)[0]; - - MMPXPlaybackPluginObserver::TEvent myevent = static_cast(event->iEvent); - - iObs->HandlePluginEvent( myevent, event->iData, event->iError); - - if ( count > 1 ) - { - // - // More events exist, start another callback - // - MPX_DEBUG1("CTestVideoPlaybackPlugin::DoSendEvent - there are more events, start another callback"); - iCallback->Start( TCallBack( CTestVideoPlaybackPlugin::SendEvent, this ) ); - } - - iEventArray->Delete( 0 ); - } - MPX_DEBUG1("<--CTestVideoPlaybackPlugin::DoSendEvent"); -} - -// End of file diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/src/testvideoplaybackpluginproxy.cpp --- a/mmappfw_plat/mpx_playback_utility_api/tsrc/testvideoplaybackplugin/src/testvideoplaybackpluginproxy.cpp Wed Sep 15 12:45:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Standard proxy of the ECOM plugin -* -*/ - -#include -#include "testcommonpluginuids.h" -#include "testvideoplaybackplugin.h" - -#if ( ! defined IMPLEMENTATION_PROXY_ENTRY ) -typedef TAny* TProxyNewLPtr; -#define IMPLEMENTATION_PROXY_ENTRY(aUid,aFuncPtr) \ - { {aUid}, (TProxyNewLPtr)(aFuncPtr) } -#endif - -// ---------------------------------------------------------------------------- -// The list of implementations -// ---------------------------------------------------------------------------- -// -const TImplementationProxy ImplementationTable[] = - { IMPLEMENTATION_PROXY_ENTRY( KPlaybackTestVideoPluginImpId, - CTestVideoPlaybackPlugin::NewL ) }; - -// ---------------------------------------------------------------------------- -// The proxy of implementations -// ---------------------------------------------------------------------------- -// -EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) -{ - aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); - return ImplementationTable; -} - -// End of File diff -r 91d5ad76f5c6 -r 16db3449d7ba mpx/collectionframework/collectionserver/group/mpxcollectionserver.mmp --- a/mpx/collectionframework/collectionserver/group/mpxcollectionserver.mmp Wed Sep 15 12:45:22 2010 +0300 +++ b/mpx/collectionframework/collectionserver/group/mpxcollectionserver.mmp Wed Oct 13 15:06:09 2010 +0300 @@ -25,7 +25,7 @@ UID 0 0x101FFC31 VENDORID VID_DEFAULT CAPABILITY ALL -TCB -#ifdef WINS +#ifdef __WINS__ EPOCHEAPSIZE 0x1000 0x2800000 // 40MB #else EPOCHEAPSIZE 0x1000 0x3E00000 // 62 MB diff -r 91d5ad76f5c6 -r 16db3449d7ba mpx/commonframework/group/bld.inf --- a/mpx/commonframework/group/bld.inf Wed Sep 15 12:45:22 2010 +0300 +++ b/mpx/commonframework/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 @@ -23,9 +23,9 @@ PRJ_EXPORTS // Secure backup & restore -backup_registration.xml z:/private/101ffc02/backup_registration.xml - - +backup_registration.xml /epoc32/release/winscw/urel/z/private/101ffc02/backup_registration.xml +backup_registration.xml /epoc32/release/winscw/udeb/z/private/101ffc02/backup_registration.xml +backup_registration.xml /epoc32/data/z/private/101ffc02/backup_registration.xml ../rom/mpxcommonframework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mpxcommonframework.iby)