[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=e8d2621

The following commit has been merged in the master branch:
commit e8d2621bbcfbb9288b53e66747d9dd7e399427bf
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue May 13 00:02:22 2014 +0200

    Check if the mpris metadata are actually new
    
    It may happen that players emit the "PropertiesChanged" signal several
    times during the playback (as for example player's features change)
    which normally results in re-setting the same presence. So here's a
    check preventing setting the same thing over and over again.
    
    Reviewed-by: David Edmundson
---
 telepathy-mpris.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 69e8562..44b041f 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -230,7 +230,23 @@ void TelepathyMPRIS::setPlaybackStatus(const QVariantMap& replyData)
 
     //track data change
     if (replyData.keys().contains(QLatin1String("Metadata"))) {
-        m_lastReceivedMetadata = qdbus_cast<QVariantMap>(replyData.value(QLatin1String("Metadata")));
+        QVariantMap metadata = qdbus_cast<QVariantMap>(replyData.value(QLatin1String("Metadata")));
+
+        QString artist = m_lastReceivedMetadata.value(QLatin1String("xesam:artist")).toString();
+        QString title = m_lastReceivedMetadata.value(QLatin1String("xesam:title")).toString();
+        QString album = m_lastReceivedMetadata.value(QLatin1String("xesam:album")).toString();
+        QString trackNumber = m_lastReceivedMetadata.value(QLatin1String("xesam:trackNumber")).toString();
+
+        QString newArtist = metadata.value(QLatin1String("xesam:artist")).toString();
+        QString newTitle = metadata.value(QLatin1String("xesam:title")).toString();
+        QString newAlbum = metadata.value(QLatin1String("xesam:album")).toString();
+        QString newTrackNumber = metadata.value(QLatin1String("xesam:trackNumber")).toString();
+
+        if (artist == newArtist && title == newTitle && album == newAlbum && trackNumber == newTrackNumber) {
+            return;
+        } else {
+            m_lastReceivedMetadata = metadata;
+        }
     }
 
     setTrackToPresence();

-- 
ktp-kded-integration-module packaging