fix: fav status disappear

Change-Id: Ie97d05441f808902ea7fe32bf7538c1c0274aba0
linuxdeepin · Mar 20, 2018 · 2feb298 · 2feb298
1 parent 1e522c1
commit 2feb298
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/music-player/core/playlist.cpp b/music-player/core/playlist.cpp
@@ -92,6 +92,7 @@ bool Playlist::isLast(const MetaPtr meta) const
 
 bool Playlist::contains(const MetaPtr meta) const
 {
+//    qDebug() << meta->hash << playlistMeta.metas;
     return !meta.isNull() && playlistMeta.metas.contains(meta->hash);
 }
 
@@ -390,7 +391,7 @@ bool lessThanTitile(const MetaPtr v1, const MetaPtr v2)
         return true;
     }
 //    qDebug() << v1->title << v2->title << collator.compare(v1->title , v2->title);
-    return lessCompareByString(v1->title , v2->title);
+    return lessCompareByString(v1->title, v2->title);
 }
 
 bool moreThanTitile(const MetaPtr v1, const MetaPtr v2)
@@ -408,7 +409,7 @@ bool lessThanArtist(const MetaPtr v1, const MetaPtr v2)
     if (v2->artist.isEmpty()) {
         return true;
     }
-    return lessCompareByString(v1->artist , v2->artist);
+    return lessCompareByString(v1->artist, v2->artist);
 }
 bool moreThanArtist(const MetaPtr v1, const MetaPtr v2)
 {
@@ -426,7 +427,7 @@ bool lessThanAblum(const MetaPtr v1, const MetaPtr v2)
     if (v2->album.isEmpty()) {
         return true;
     }
-    return lessCompareByString(v1->album , v2->album);
+    return lessCompareByString(v1->album, v2->album);
 }
 bool moreThanAblum(const MetaPtr v1, const MetaPtr v2)
 {

diff --git a/music-player/presenter/presenter.cpp b/music-player/presenter/presenter.cpp
@@ -134,6 +134,16 @@ void PresenterPrivate::initBackend()
     });
 }
 
+void PresenterPrivate::notifyMusicPlayed(PlaylistPtr playlist, const MetaPtr meta)
+{
+    Q_Q(Presenter);
+
+    MetaPtr favInfo(meta);
+    favInfo->favourite = playlistMgr->playlist(FavMusicListID)->contains(meta);
+//    qDebug() << FavMusicListID << meta->title << favInfo->favourite;
+    Q_EMIT q->musicPlayed(playlist, favInfo);
+}
+
 Presenter::Presenter(QObject *parent)
     : QObject(parent), d_ptr(new PresenterPrivate(this))
 {
@@ -245,10 +255,7 @@ void Presenter::prepareData()
     this, [ = ](PlaylistPtr playlist, const MetaPtr meta) {
         d->settings->setOption("base.play.last_meta", meta->hash);
         d->settings->setOption("base.play.last_playlist", playlist->id());
-
-        MetaPtr favInfo(meta);
-        favInfo->favourite = d->playlistMgr->playlist(FavMusicListID)->contains(meta);
-        Q_EMIT this->musicPlayed(playlist, favInfo);
+        d->notifyMusicPlayed(playlist, meta);
         d->requestMetaSearch(meta);
     });
 
@@ -360,7 +367,7 @@ void Presenter::postAction()
             d->lastPlayPosition = position;
             onCurrentPlaylistChanged(lastPlaylist);
             Q_EMIT locateMusic(lastPlaylist, lastMeta);
-            Q_EMIT musicPlayed(lastPlaylist, lastMeta);
+            d->notifyMusicPlayed(lastPlaylist, lastMeta);
 
             d->player->setPlayOnLoaded(false);
             d->player->setFadeInOut(false);
@@ -816,7 +823,7 @@ void Presenter::onMusicResume(PlaylistPtr playlist, const MetaPtr info)
 {
     Q_D(Presenter);
     Q_EMIT d->resume(playlist, info);
-    Q_EMIT this->musicPlayed(playlist, info);
+    d->notifyMusicPlayed(playlist, info);
 }
 
 void Presenter::onMusicStop(PlaylistPtr playlist, const MetaPtr meta)

diff --git a/music-player/presenter/presenter_p.h b/music-player/presenter/presenter_p.h
@@ -37,6 +37,7 @@ class PresenterPrivate: public QObject
     PresenterPrivate(Presenter *parent = nullptr);
 
     void initBackend();
+    void notifyMusicPlayed(PlaylistPtr playlist, const MetaPtr meta);
 
     PlaylistPtr         playlistBeforeSearch;
     PlaylistPtr         currentPlaylist;