diff -r c54d95799c80 -r a1247965635c mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbmusic.h --- a/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbmusic.h Wed Apr 14 15:54:18 2010 +0300 +++ b/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbmusic.h Tue Apr 27 16:34:37 2010 +0300 @@ -421,14 +421,13 @@ #ifdef ABSTRACTAUDIOALBUM_INCLUDED - /** + /** * Returns all songs for a given abstractalbum. - * @param aDrive drive ID AbstractAlbum stored * @param aAbstractAlbumId abstractalbum to get the songs for * @param aAttrs attributes to be retrieved * @param aMediaArray returns the song attributes. */ - void GetAllSongsForAbstractAlbumL(TInt aDrive, TInt aAbstractAlbumId, + void GetAllSongsForAbstractAlbumL(TUint aAbstractAlbumId, const TArray& aAttrs, CMPXMediaArray& aMediaArray); #endif // ABSTRACTAUDIOALBUM_INCLUDED /** @@ -679,8 +678,8 @@ CMPXMessageArray* aItemChangedMessages, TUint32& aItemId); TBool UpdateCategoryFieldL(TMPXGeneralCategory aCategory, const CMPXMedia& aMedia, - const TMPXAttribute& aAttribute, TUint32 aOldId, TInt aDriveId, - CMPXMessageArray* aItemChangedMessages, TUint32& aItemId, TUint32 aArtistId); + const TMPXAttribute& aAttribute, TUint32 aOldId, TInt aDriveId, + CMPXMessageArray* aItemChangedMessages, TUint32& aItemId, TUint32 aArtistId); /** * Checks if extra attributes are required. The "standard attribute set includes: * EMPXMediaGeneralId, EMPXMediaGeneralType, EMPXMediaGeneralCategory, @@ -696,7 +695,7 @@ * @return ETrue if the media contains one or more supported attribute; * otherwise EFalse. */ - TBool IsSupported(const CMPXMedia& aMedia); + TBool IsSupported(const CMPXMedia& aMedia); private: // from MMPXTable @@ -734,8 +733,8 @@ * Column indexes in the music table */ enum TMusicColumns - { - EMusicUniqueId = KMPXTableDefaultIndex, + { + EMusicUniqueId = KMPXTableDefaultIndex, EMusicDbFlag, EMusicVolumeId, EMusicTitle,