[Xfce4-commits] <parole:master> Fix debug builds, enable no-cover albumart

[Sean Davis]

Updating branch refs/heads/master
         to 5bddac966a1fcd33dc3e4e26465e921142096a02 (commit)
       from ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686 (commit)

commit 5bddac966a1fcd33dc3e4e26465e921142096a02
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Dec 8 07:02:37 2013 -0500

    Fix debug builds, enable no-cover albumart

 data/pixmaps/Makefile.am             |    3 ++-
 data/pixmaps/no-cover.png            |  Bin 0 -> 11327 bytes
 src/misc/parole-stream.c             |    2 +-
 src/plugins/mpris2/mpris2-provider.c |   28 ++++++++++++++--------------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 44c3121..ec31ae3 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -1,5 +1,6 @@
 pixmaps =					\
-	parole.png
+	parole.png              \
+	no-cover.png
 
 pixmaps_DATA =					\
 	$(pixmaps)
diff --git a/data/pixmaps/no-cover.png b/data/pixmaps/no-cover.png
new file mode 100644
index 0000000..2ff85ba
Binary files /dev/null and b/data/pixmaps/no-cover.png differ
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 82d8e32..3db0b61 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -370,7 +370,7 @@ parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
     {
         PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
         PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = NULL;
-        PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = NULL;
+        PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_strdup_printf ("file://%s/no-cover.png", PIXMAPS_DIR);
     }
 }
 
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index 5b5f12a..c543aaa 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -64,7 +64,6 @@ PAROLE_DEFINE_TYPE_WITH_CODE   (Mpris2Provider,
                                 PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
                                 mpris2_provider_iface_init));
 
-
 static const gchar mpris2xml[] =
 "<node>"
 "        <interface name='org.mpris.MediaPlayer2'>"
@@ -332,22 +331,23 @@ static void mpris_Player_Stop (GDBusMethodInvocation *invocation, GVariant* para
 static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
 {
     ParoleProviderPlayer *player = provider->player;
+    const ParoleStream *stream = parole_provider_player_get_stream(player);
+    gint64 param;
+    gint64 curr_pos;
+    gint64 seek;
+    gint64 duration;
 
     if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
         g_dbus_method_invocation_return_error_literal (invocation,
             G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
         return;
     }
-    
-    const ParoleStream *stream = parole_provider_player_get_stream(player);
 
-    gint64 param;
     g_variant_get(parameters, "(x)", &param);
 
-    gint64 curr_pos = parole_provider_player_get_stream_position (player);
-    gint64 seek = (curr_pos + param) / GST_MSECOND;
+    curr_pos = parole_provider_player_get_stream_position (player);
+    seek = (curr_pos + param) / GST_MSECOND;
     
-    gint64 duration;
     g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
     
     seek = CLAMP (seek, 0, duration);
@@ -360,24 +360,24 @@ static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant* para
 static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
 {
     ParoleProviderPlayer *player = provider->player;
+    const ParoleStream *stream = parole_provider_player_get_stream(player);
+    gchar *track_id = NULL;
+    gint64 param;
+    gint64 seek;
+    gint64 duration;
 
     if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
         g_dbus_method_invocation_return_error_literal (invocation,
             G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
         return;
     }
-    
-    const ParoleStream *stream = parole_provider_player_get_stream(player);
-    gchar *track_id = NULL;
 
     /* Do we need to do anything with track_id? */
-    gint64 param;
     g_variant_get(parameters, "(ox)", &track_id, &param);
     g_free(track_id);
 
-    gint64 seek = param / GST_MSECOND;
-    
-    gint64 duration;
+    seek = param / GST_MSECOND;
+
     g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
     
     seek = CLAMP (seek, 0, duration);