diff -r fdb31ab341af -r a0afa279b8fe inc/mpcollectiontbonelistdatamodel.h --- a/inc/mpcollectiontbonelistdatamodel.h Fri May 14 18:54:37 2010 -0500 +++ b/inc/mpcollectiontbonelistdatamodel.h Fri May 28 19:46:01 2010 -0500 @@ -23,6 +23,7 @@ #include class MpMpxCollectionData; +class MpPlaybackData; #if defined(BUILD_MPDATA_LIB) #define MPDATA_EXPORT Q_DECL_EXPORT @@ -36,7 +37,8 @@ public: - explicit MpCollectionTBoneListDataModel( MpMpxCollectionData *data, QObject *parent=0 ); + explicit MpCollectionTBoneListDataModel( MpMpxCollectionData *collectionData, + MpPlaybackData *playbackData = 0, QObject *parent = 0 ); virtual ~MpCollectionTBoneListDataModel(); int rowCount(const QModelIndex &parent=QModelIndex()) const; @@ -45,15 +47,21 @@ signals: void albumDataChanged(); + void albumDataAvailable(); public slots: void refreshModel(); + void updateSong(); + void updatePlaybackState(); private: - MpMpxCollectionData *mCollectionData; // Not own + MpMpxCollectionData *mCollectionData; // Not own + MpPlaybackData *mPlaybackData; // Not own int mRowCount; + int mCurrentSongId; + bool mPlaybackActive; };