[Xfce4-commits] <parole:master> Merge branch 'master' of https://github.com/aquaherd/parole-mpris2

[matiasdelellis]

Updating branch refs/heads/master
         to 4c9ae196e51553fcbe835f2c7c953548f0ba474e (commit)
       from c0567fce118afb41f37526d6cf32a92d7ade8a00 (commit)

commit 4c9ae196e51553fcbe835f2c7c953548f0ba474e
Merge: c0567fc 5bbb38b
Author: matiasdelellis <mati86dl at hotmail.com>
Date:   Mon Dec 9 11:07:44 2013 -0300

    Merge branch 'master' of https://github.com/aquaherd/parole-mpris2

commit 5bbb38b777f6ab613880e8ad786c8535912a8e1a
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Dec 8 17:40:12 2013 -0500

    Ignore artwork if video

 src/plugins/mpris2/mpris2-provider.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index 1519c4a..9904591 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -506,6 +506,7 @@ static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder *b)
     gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre, *image_uri;
     gint track_id, bitrate;
     gint64 duration;
+    gboolean has_video;
 
     g_object_get (G_OBJECT (stream),
                   "title", &title,
@@ -519,7 +520,14 @@ static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder *b)
                   "image_uri", &image_uri,
                   "track", &track_id,
                   "bitrate", &bitrate,
+                  "has-video", &has_video,
                   NULL);
+                  
+    if (has_video)
+    {
+        g_free(image_uri);
+        image_uri = NULL;
+    }
 
     g_variant_builder_add (b, "{sv}", "mpris:trackid",
         handle_get_trackid(stream));