diff -r a12246c97fcc -r cb96c29156b2 mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbalbum.h --- a/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbalbum.h Wed Jun 09 09:38:28 2010 +0300 +++ b/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/inc/mpxdbalbum.h Mon Jun 21 15:37:19 2010 +0300 @@ -30,7 +30,7 @@ { public: virtual TInt HandleIsUnknownArtistL(TUint32 aId) = 0; - virtual TUint32 HandleArtistForAlbumL( const TUint32 aId ) = 0; + virtual HBufC* HandleArtistForAlbumL( const TUint32 aId ) = 0; /** * HandleAlbumartForAlbumL. * @param aId, The album ID. @@ -86,7 +86,7 @@ * into consideration when generating the unique row id * @return The unique id of the row added. */ - TUint32 AddItemL(const TDesC& aName, TUint32 aArtist, const TDesC& aArt, TInt aDriveId, TBool& aNewRecord, + TUint32 AddItemL(const TDesC& aName, const TDesC& aArtistName, const TDesC& aArt, TInt aDriveId, TBool& aNewRecord, TBool aCaseSensitive = ETrue); /** @@ -163,7 +163,12 @@ TBool IsUnknownArtistL(TUint32 aId); - TUint32 ArtistForAlbumL(const TUint32 aId); + /** + * Get the ArtistName of song which belongs to the specified Album. + * @param aId The ID of the album + * @returns alternative artistname retrieved in the specified Album. + */ + HBufC* ArtistForAlbumL(const TUint32 aId); /** * Get the Albumart of song which belongs to the specified Album. * @param aId The ID of the album @@ -206,11 +211,10 @@ enum TAlbumColumns { EAlbumUniqueId = KMPXTableDefaultIndex, + EAlbumArtistName, EAlbumName, - EAlbumSongCount, - EAlbumArtist, + EAlbumSongCount, EAlbumArt, - EAlbumArtistName, EAlbumFieldCount };