From 72b6252ab5c6ea16d538bd32e00c3ac2a11388f4 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 2 Feb 2012 16:05:51 -0500 Subject: [PATCH] Add id() to playlistinterface for comparison --- src/libtomahawk/playlistinterface.cpp | 1 + src/libtomahawk/playlistinterface.h | 3 +++ src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/playlistinterface.cpp b/src/libtomahawk/playlistinterface.cpp index 11d60ea3e..44249ea95 100644 --- a/src/libtomahawk/playlistinterface.cpp +++ b/src/libtomahawk/playlistinterface.cpp @@ -26,6 +26,7 @@ PlaylistInterface::PlaylistInterface () : QObject() , m_latchMode( StayOnSong ) { + m_id = uuid(); qRegisterMetaType( "Tomahawk::PlaylistInterface::RepeatMode" ); } diff --git a/src/libtomahawk/playlistinterface.h b/src/libtomahawk/playlistinterface.h index 8f172a809..17a28bf47 100644 --- a/src/libtomahawk/playlistinterface.h +++ b/src/libtomahawk/playlistinterface.h @@ -44,6 +44,8 @@ public: explicit PlaylistInterface(); virtual ~PlaylistInterface(); + const QString id() { return m_id; } + virtual QList< Tomahawk::query_ptr > tracks() = 0; virtual int unfilteredTrackCount() const = 0; @@ -98,6 +100,7 @@ protected: private: Q_DISABLE_COPY( PlaylistInterface ) + QString m_id; QString m_filter; }; diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 178af0175..65c9c3d1c 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -158,10 +158,13 @@ AlbumInfoWidget::onLoadingFinished() bool AlbumInfoWidget::isBeingPlayed() const { - if ( ui->albumsView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + //tDebug() << Q_FUNC_INFO << "audioengine playlistInterface = " << AudioEngine::instance()->currentTrackPlaylist()->id(); + //tDebug() << Q_FUNC_INFO << "albumsView playlistInterface = " << ui->albumsView->playlistInterface()->id(); + //tDebug() << Q_FUNC_INFO << "tracksView playlistInterface = " << ui->tracksView->playlistInterface()->id(); + if ( ui->albumsView->playlistInterface()->id() == AudioEngine::instance()->currentTrackPlaylist()->id() ) return true; - if ( ui->tracksView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->tracksView->playlistInterface()->id() == AudioEngine::instance()->currentTrackPlaylist()->id() ) return true; return false;