diff -r b95ddb5a0d10 -r eff9df3d9c98 mpengine/inc/mpmpxcollectionframeworkwrapper.h --- a/mpengine/inc/mpmpxcollectionframeworkwrapper.h Fri Jun 11 16:24:02 2010 +0100 +++ b/mpengine/inc/mpmpxcollectionframeworkwrapper.h Thu Jul 22 16:32:33 2010 +0100 @@ -36,39 +36,54 @@ public: - explicit MpMpxCollectionFrameworkWrapper( - MpCommon::MpViewMode viewMode=MpCommon::DefaultView, TUid hostUid = TUid::Uid( MpCommon::KMusicPlayerUid ), QObject *parent=0 ); + explicit MpMpxCollectionFrameworkWrapper( TUid hostUid = TUid::Uid( MpCommon::KMusicPlayerUid ), QObject *parent=0 ); virtual ~MpMpxCollectionFrameworkWrapper(); void openCollection( TCollectionContext context ); void openCollectionItem( int index ); void back(); void findPlaylists( QStringList &playlists ); - void createPlaylist( QString &playlistName, QList &selection, MpMpxCollectionData* collectionData = 0 ); + void createPlaylist( QString &playlistName, QList &selection, MpMpxCollectionData* collectionData ); void saveToPlaylist( int playlistIndex, QList &selection ); void saveToCurrentPlaylist( QList &selection, MpMpxCollectionData *collectionData ); void renamePlaylist( QString &newName, int index ); void renamePlaylist( QString &newName ); void deleteSongs( QList &selection ); void setShuffle( bool active ); + void cancelRequest(); void previewItem( int index ); void openIsolatedCollection( TCollectionContext context ); void releaseIsolatedCollection(); - + + void findAlbumSongs( int index ); + void playAlbumSongs( int albumIndex, int songIndex, MpMpxCollectionData* collectionData ); + MpMpxCollectionData *collectionData(); void reopenCollection(); void reorderPlaylist( int playlistId, int songId, int originalOrdinal, int newOrdinal ); + void setRepeatFeatureEnabled( bool enable ); + void setShuffleFeatureEnabled( bool enable ); + + void openShuffleAllSongsPath(); + + void savePath( QByteArray &data ); + void restorePath( const QByteArray &data ); signals: void collectionPlaylistOpened(); void playlistSaved( bool success ); + void deleteStarted(TCollectionContext context, int Count); void songsDeleted( bool success ); void playlistsRenamed( bool success ); + void aboutToAddSongs( int count ); void isolatedCollectionOpened( MpMpxCollectionData* collectionData ); + + void containerContentsChanged(); + void restorePathFailed(); private: