Merge lp:~cjcurran/indicator-sound/metadata-layout-fix into lp:indicator-sound/fifth

[Conor Curran]

Fixes bugs attached

[Ted Gould (ted)]

review: Approve

=== modified file 'src/metadata-widget.c'
--- src/metadata-widget.c	2012-01-25 02:52:57 +0000
+++ src/metadata-widget.c	2012-02-22 20:10:28 +0000
@@ -129,13 +129,13 @@
   priv->icon_buf = NULL;
   
   #if GTK_CHECK_VERSION(3, 0, 0)  
-  outer_v_box = gtk_box_new (FALSE, 0);
+  outer_v_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   #else
   outer_v_box = gtk_vbox_new (FALSE, 0);  
   #endif
  
   #if GTK_CHECK_VERSION(3, 0, 0)  
-  hbox = gtk_box_new(FALSE, 0);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
   #else
   hbox = gtk_hbox_new(FALSE, 0);
   #endif
@@ -174,7 +174,7 @@
   priv->theme_change_occured = FALSE;
 
   #if GTK_CHECK_VERSION(3, 0, 0)  
-  GtkWidget* vbox = gtk_box_new(FALSE, 0);
+  GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
   #else
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   #endif
@@ -227,16 +227,15 @@
 
   // player label
   GtkWidget* player_label;
-  player_label = gtk_label_new("");
-  gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0.5);
-  gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)0);  
-  gtk_widget_set_size_request (player_label, 200, 24);
+  player_label = gtk_label_new ("");
+  gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
+  gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)0);
+  gtk_widget_set_size_request (player_label, 150, 24);
   priv->player_label = player_label;
       
   gtk_box_pack_start (GTK_BOX(outer_v_box), priv->player_label, FALSE, FALSE, 0);
-  
   gtk_box_pack_start (GTK_BOX(outer_v_box), priv->meta_data_h_box, FALSE, FALSE, 0);
-    
+  
   gtk_container_add (GTK_CONTAINER (self), outer_v_box);  
   
   gtk_widget_show_all (priv->meta_data_h_box);
@@ -282,7 +281,7 @@
 }
 /**
  * We override the expose method to enable primitive drawing of the 
- * empty album art image and rounded rectangles on the album art.
+ * empty album art image.
  */
 static gboolean
 metadata_image_expose_gtk_3 (GtkWidget *metadata,
@@ -299,8 +298,6 @@
     return FALSE;
   }
   
-  draw_album_border (metadata, FALSE);
-
   if(priv->image_path->len > 0){
     if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
        priv->theme_change_occured == TRUE){
@@ -311,6 +308,7 @@
       if(GDK_IS_PIXBUF(pixbuf) == FALSE){
         gtk_image_clear ( GTK_IMAGE(priv->album_art));          
         gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
+        draw_album_border (metadata, FALSE);  
         draw_album_art_placeholder(metadata);
         return FALSE;
       }
@@ -320,6 +318,7 @@
                                   gdk_pixbuf_get_width(pixbuf),
                                   gdk_pixbuf_get_height(pixbuf));
 
+      draw_album_border (metadata, FALSE);  
       g_string_erase (priv->old_image_path, 0, -1);
       g_string_overwrite (priv->old_image_path, 0, priv->image_path->str);
       g_object_unref(pixbuf);
@@ -328,6 +327,7 @@
   }
   gtk_image_clear (GTK_IMAGE(priv->album_art));  
   gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
+  draw_album_border (metadata, FALSE);    
   draw_album_art_placeholder(metadata);
   return FALSE;
 }
@@ -500,7 +500,8 @@
 #endif
 
 static void
-draw_album_border(GtkWidget *metadata, gboolean selected)
+draw_album_border(GtkWidget *metadata,
+                  gboolean selected)
 {
   cairo_t *cr;  
   cr = gdk_cairo_create (gtk_widget_get_window (metadata));

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2012-01-10 17:04:50 +0000
+++ src/pulseaudio-mgr.c	2012-02-22 20:10:28 +0000
@@ -174,7 +174,6 @@
 void
 pm_update_volume (gint sink_index, pa_cvolume new_volume)
 {
-  // LP: #850662 
   if (sink_index < 0 || pulse_context == NULL){
     return;
   }

=== modified file 'src/slider-menu-item.c'
--- src/slider-menu-item.c	2011-09-27 15:05:02 +0000
+++ src/slider-menu-item.c	2012-02-22 20:10:28 +0000
@@ -147,21 +147,31 @@
 static void
 slider_menu_item_update_volume (SliderMenuItem* self, gdouble percent)
 {
-
-/*
-  g_debug ("slider menu item update volume - about to set the volume to %f", percent);
-*/
-
-  pa_cvolume new_volume;
-  pa_cvolume_init(&new_volume);
-  new_volume.channels = 1;
+  g_return_if_fail (IS_SLIDER_MENU_ITEM (self));
+
+  pa_cvolume mono_new_volume;
+  pa_cvolume_init(&mono_new_volume);
+  mono_new_volume.channels = 1;
   pa_volume_t new_volume_value = (pa_volume_t) ((percent * PA_VOLUME_NORM) / 100);
-  pa_cvolume_set(&new_volume, 1, new_volume_value);
+  
+  if (new_volume_value == PA_VOLUME_INVALID || new_volume_value >= PA_VOLUME_MAX){
+    g_warning ("slider_menu_item_update_volume - volume is out of range !");
+    return;
+  }
+  
+  pa_cvolume_set(&mono_new_volume, 1, new_volume_value);
 
   SliderMenuItemPrivate* priv = SLIDER_MENU_ITEM_GET_PRIVATE (self);
-
+  if (!pa_cvolume_valid (&mono_new_volume)){
+    g_warning ("Invalid volume - ignore it!");
+    return;
+  }
+  if (!pa_channel_map_valid(&priv->channel_map)){
+    g_warning ("Invalid channel map - ignore update volume!");
+    return;      
+  }
   pa_cvolume_set(&priv->volume, priv->channel_map.channels, new_volume_value);
-  pm_update_volume (priv->index, new_volume);
+  pm_update_volume (priv->index, mono_new_volume);
 }
 
 // To the UI

=== modified file 'src/transport-widget.c'
--- src/transport-widget.c	2012-01-25 02:54:05 +0000
+++ src/transport-widget.c	2012-02-22 20:10:28 +0000
@@ -309,6 +309,7 @@
 gboolean
 transport_widget_is_selected ( TransportWidget* widget )
 {
+  g_return_val_if_fail (IS_TRANSPORT_WIDGET (widget), FALSE);
   TransportWidgetPrivate* priv = TRANSPORT_WIDGET_GET_PRIVATE(widget);
   return priv->has_focus;
 }