Merge lp:~cjcurran/indicator-sound/mute-behaviour-part2 into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

Final part in this mute behaviour bug. Both the voip slider and volume slider now have identical behaviour.

[Ted Gould (ted)]

The only thing that is odd to me is that the mute is being passed as an
int32 instead of a boolean. It seems that's how it's stored on both
sides, might as well match that on DBus.

Shouldn't break anything though.

  review approve

review: Approve

=== modified file 'src/common-defs.h'
--- src/common-defs.h	2011-03-09 14:17:12 +0000
+++ src/common-defs.h	2011-03-15 15:53:22 +0000
@@ -45,12 +45,13 @@
   TRANSPORT_STATE_PAUSED
 }TransportState;
 
-#define NOT_ACTIVE                       -1
+#define NOT_ACTIVE                              -1
 #define DBUSMENU_PROPERTY_EMPTY                 -1
 
 /* DBUS Custom Items */
 #define DBUSMENU_VOLUME_MENUITEM_TYPE           "x-canonical-ido-volume-type"
 #define DBUSMENU_VOLUME_MENUITEM_LEVEL          "x-canonical-ido-volume-level"
+#define DBUSMENU_VOLUME_MENUITEM_MUTE           "x-canonical-ido-volume-mute"
 
 #define DBUSMENU_VOIP_INPUT_MENUITEM_TYPE       "x-canonical-ido-voip-input-type"
 #define DBUSMENU_VOIP_INPUT_MENUITEM_LEVEL      "x-canonical-ido-voip-input-level"

=== modified file 'src/device.c'
--- src/device.c	2011-03-14 19:47:59 +0000
+++ src/device.c	2011-03-15 15:53:22 +0000
@@ -90,11 +90,10 @@
 }
 
 void
-device_populate (Device* self,
+device_sink_populate (Device* self,
                       const pa_sink_info* update)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE(self);
-  device_mute_update (self, update->mute);
   mute_menu_item_enable (priv->mute_menuitem, TRUE);
   slider_menu_item_populate (priv->volume_slider_menuitem, update);
   SoundState state = device_get_state_from_volume (self);
@@ -103,37 +102,11 @@
     sound_service_dbus_update_sound_state (priv->service,
                                            priv->current_sound_state);
   }
-
-}
-
-void
-device_activate_voip_item (Device* self, gint sink_input_index, gint client_index)
-{
-  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
-  if (voip_input_menu_item_is_interested (priv->voip_input_menu_item,
-                                          sink_input_index,
-                                          client_index)){
-    voip_input_menu_item_enable (priv->voip_input_menu_item, TRUE);
-  }
-}
-
-void
-device_deactivate_voip_source (Device* self, gboolean visible)
-{
-  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
-  visible &= voip_input_menu_item_is_active (priv->voip_input_menu_item);
-  voip_input_menu_item_deactivate_source (priv->voip_input_menu_item, visible);
-}
-
-void
-device_deactivate_voip_client (Device* self)
-{
-  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
-  voip_input_menu_item_deactivate_voip_client (priv->voip_input_menu_item);
-}
-
-void
-device_update (Device* self,
+  device_mute_update (self, update->mute);
+}
+
+void
+device_sink_update (Device* self,
                     const pa_sink_info* update)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
@@ -223,22 +196,48 @@
 }
 
 gint
-device_get_index (Device* self)
+device_get_sink_index (Device* self)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
   return slider_menu_item_get_sink_index (priv->volume_slider_menuitem);
 }
 
 gboolean
-device_is_populated (Device* self)
+device_is_sink_populated (Device* self)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
   return dbusmenu_menuitem_property_get_bool (DBUSMENU_MENUITEM (priv->volume_slider_menuitem),
                                                                  DBUSMENU_MENUITEM_PROP_ENABLED);
 }
 
+void
+device_activate_voip_item (Device* self, gint sink_input_index, gint client_index)
+{
+  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
+  if (voip_input_menu_item_is_interested (priv->voip_input_menu_item,
+                                          sink_input_index,
+                                          client_index)){
+    voip_input_menu_item_enable (priv->voip_input_menu_item, TRUE);
+  }
+}
+
+void
+device_deactivate_voip_source (Device* self, gboolean visible)
+{
+  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
+  visible &= voip_input_menu_item_is_active (priv->voip_input_menu_item);
+  voip_input_menu_item_deactivate_source (priv->voip_input_menu_item, visible);
+}
+
+void
+device_deactivate_voip_client (Device* self)
+{
+  DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
+  voip_input_menu_item_deactivate_voip_client (priv->voip_input_menu_item);
+}
+
 void 
-device_deactivate (Device* self)
+device_sink_deactivated (Device* self)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
   priv->current_sound_state = UNAVAILABLE;

=== modified file 'src/device.h'
--- src/device.h	2011-03-14 19:47:59 +0000
+++ src/device.h	2011-03-15 15:53:22 +0000
@@ -58,11 +58,11 @@
  */
 
 // Sink related
-void device_populate (Device* sink, const pa_sink_info* update);
-void device_update (Device* sink, const pa_sink_info* update);
-gboolean device_is_populated (Device* sink);
-gint device_get_index (Device* self);
-void device_deactivate (Device* self);
+void device_sink_populate (Device* sink, const pa_sink_info* update);
+void device_sink_update (Device* sink, const pa_sink_info* update);
+gboolean device_is_sink_populated (Device* sink);
+gint device_get_sink_index (Device* self);
+void device_sink_deactivated (Device* self);
 void device_update_mute (Device* self, gboolean mute_update);
 void device_ensure_sink_is_unmuted (Device* self);
 

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2011-03-14 19:47:59 +0000
+++ src/pulseaudio-mgr.c	2011-03-15 15:53:22 +0000
@@ -226,11 +226,11 @@
   case PA_SUBSCRIPTION_EVENT_SINK:
     
     // We don't care about any other sink other than the active one.
-    if (index != device_get_index (sink))
+    if (index != device_get_sink_index (sink))
       return;
       
     if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-      device_deactivate (sink);
+      device_sink_deactivated (sink);
       
     }
     else{
@@ -308,7 +308,7 @@
     break;
   case PA_CONTEXT_FAILED:
     g_warning("PA_CONTEXT_FAILED - Is PulseAudio Daemon running ?");
-    device_deactivate (DEVICE (userdata));
+    device_sink_deactivated (DEVICE (userdata));
     if (reconnect_idle_id == 0){
       reconnect_idle_id = g_timeout_add_seconds (RECONNECT_DELAY,
                                                  reconnect_to_pulse,
@@ -362,7 +362,7 @@
 
   if (info == NULL) {
     g_warning("No PA server - get the hell out of here");
-    device_deactivate (DEVICE (userdata));
+    device_sink_deactivated (DEVICE (userdata));
     return;
   }
   // Go for the default sink
@@ -373,7 +373,7 @@
                                                        pm_default_sink_info_callback,
                                                        userdata) )) {
       g_warning("pa_context_get_sink_info_by_namet() failed");
-      device_deactivate (DEVICE (userdata));
+      device_sink_deactivated (DEVICE (userdata));
       pa_operation_unref(operation);
       return;
     }
@@ -382,7 +382,7 @@
                                                        pm_sink_info_callback,
                                                        userdata))) {
     g_warning("pa_context_get_sink_info_list() failed");
-    device_deactivate (DEVICE (userdata));
+    device_sink_deactivated (DEVICE (userdata));
     pa_operation_unref(operation);
     return;
   }
@@ -426,9 +426,9 @@
       return;
     }
     Device* a_sink = DEVICE (userdata);
-    if (device_is_populated (a_sink) == FALSE &&
+    if (device_is_sink_populated (a_sink) == FALSE &&
         g_ascii_strncasecmp("auto_null", sink->name, 9) != 0){
-      device_populate (a_sink, sink);
+      device_sink_populate (a_sink, sink);
     }
   }
 }
@@ -448,11 +448,11 @@
       return;
     }
     // Only repopulate if there is a change with regards the index
-    if (device_get_index (DEVICE (userdata)) == info->index)
+    if (device_get_sink_index (DEVICE (userdata)) == info->index)
       return;
     
     g_debug ("Pulse Server has handed us a new default sink");
-    device_populate (DEVICE (userdata), info);
+    device_sink_populate (DEVICE (userdata), info);
   }
 }
 
@@ -494,7 +494,7 @@
     }
 
     // And finally check for the mute blocking state
-    if (device_get_index (a_sink) == info->sink){
+    if (device_get_sink_index (a_sink) == info->sink){
       device_determine_blocking_state (a_sink);
     }
   }
@@ -514,7 +514,7 @@
       g_warning ("update_device - our user data is not what we think it should be or the info parameter is null");
       return;
     }
-    device_update (DEVICE(userdata), info);
+    device_sink_update (DEVICE(userdata), info);
   }
 }
 

=== modified file 'src/slider-menu-item.c'
--- src/slider-menu-item.c	2011-03-14 19:47:59 +0000
+++ src/slider-menu-item.c	2011-03-15 15:53:22 +0000
@@ -28,9 +28,10 @@
 typedef struct _SliderMenuItemPrivate SliderMenuItemPrivate;
 
 struct _SliderMenuItemPrivate {
-  Device*         a_sink;
+  Device*             a_sink;
   gint                index;
   gchar*              name;
+  gboolean            mute;
   pa_cvolume          volume;
   pa_channel_map      channel_map;
   pa_volume_t         base_volume;
@@ -75,7 +76,7 @@
 
   SliderMenuItemPrivate* priv = SLIDER_MENU_ITEM_GET_PRIVATE (self);
 
-  priv->index = -1;
+  priv->index = NOT_ACTIVE;
   priv->name = NULL;
 
   return;
@@ -127,6 +128,7 @@
   priv->volume = slider_menu_item_construct_mono_volume (&update->volume);
   priv->base_volume = update->base_volume;
   priv->channel_map = update->channel_map;
+  priv->mute = update->mute;
 
   pa_volume_t vol = pa_cvolume_max (&update->volume);
   gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM;
@@ -134,6 +136,11 @@
   dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
                                           DBUSMENU_VOLUME_MENUITEM_LEVEL,
                                           new_volume);
+  GVariant* new_mute_update = g_variant_new_int32 (update->mute);
+  dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
+                                          DBUSMENU_VOLUME_MENUITEM_MUTE,
+                                          new_mute_update);
+
   slider_menu_item_enable (self, TRUE);
 }
 
@@ -170,6 +177,14 @@
   dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
                                           DBUSMENU_VOLUME_MENUITEM_LEVEL,
                                           new_volume);
+  if (priv->mute != update->mute){
+    priv->mute = update->mute;
+    g_debug ("volume menu item - update - mute = %i", update->mute);
+    GVariant* new_mute_update = g_variant_new_int32 (update->mute);
+    dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
+                                            DBUSMENU_VOLUME_MENUITEM_MUTE,
+                                            new_mute_update);
+  }
 }
 
 /*
@@ -185,7 +200,7 @@
                                        DBUSMENU_MENUITEM_PROP_ENABLED,
                                        active);
   if(active == FALSE){
-    priv->index = -1;
+    priv->index = NOT_ACTIVE;
     if(priv->name != NULL){
       g_free(priv->name);
       priv->name = NULL;

=== modified file 'src/voip-input-widget.c'
--- src/voip-input-widget.c	2011-03-09 16:38:11 +0000
+++ src/voip-input-widget.c	2011-03-15 15:53:22 +0000
@@ -95,7 +95,7 @@
   g_signal_connect(priv->ido_voip_input_slider, "slider-released", G_CALLBACK(voip_input_widget_slider_released), self);
 
   GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)priv->ido_voip_input_slider);
-  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-none-panel");
+  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-zero-panel");
   gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU);
   g_object_unref(primary_gicon);
 

=== modified file 'src/volume-widget.c'
--- src/volume-widget.c	2011-03-10 19:48:26 +0000
+++ src/volume-widget.c	2011-03-15 15:53:22 +0000
@@ -128,11 +128,11 @@
                                GVariant* value, gpointer userdata)
 { 
   g_return_if_fail (IS_VOLUME_WIDGET (userdata)); 
-  g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_DOUBLE) );
   VolumeWidget* mitem = VOLUME_WIDGET(userdata);
   VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
-  //g_debug("scrub-widget::property_update for prop %s", property); 
+
   if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_LEVEL, property) == 0){
+    g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_DOUBLE) );
     if(priv->grabbed == FALSE){
       GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
       GtkRange *range = (GtkRange*)slider;
@@ -141,6 +141,27 @@
       update_accessible_desc(priv->indicator);
     }
   }
+  if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){
+    g_debug ("volume widget - mute update ");
+    if(priv->grabbed == FALSE){
+      GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
+      GtkRange *range = (GtkRange*)slider;
+      gint update = g_variant_get_int32 (value);
+      gdouble level;
+
+      g_debug ("volume widget - mute update %i", update);
+
+      if (update == 1){
+        level = 0;
+      }
+      else{
+        level = g_variant_get_double (dbusmenu_menuitem_property_get_variant (priv->twin_item,
+                                                                              DBUSMENU_VOLUME_MENUITEM_LEVEL));
+      }
+      gtk_range_set_value(range, level);
+      g_debug ("volume-widget - update mute with value %i", update);
+    }
+  }
 }
 
 static void
@@ -154,9 +175,15 @@
                    G_CALLBACK(volume_widget_property_update), self);
   gdouble initial_level = g_variant_get_double (dbusmenu_menuitem_property_get_variant(twin_item,
                                                 DBUSMENU_VOLUME_MENUITEM_LEVEL));
+  gint initial_mute = g_variant_get_int32 (dbusmenu_menuitem_property_get_variant(twin_item,
+                                           DBUSMENU_VOLUME_MENUITEM_MUTE));
+
   //g_debug("volume_widget_set_twin_item initial level = %f", initial_level);
   GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
   GtkRange *range = (GtkRange*)slider;
+  if(initial_mute == 1){
+    initial_level = 0;
+  }
   gtk_range_set_value(range, initial_level);
   update_accessible_desc(priv->indicator);
 }
@@ -188,7 +215,10 @@
   GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
   gdouble current_value =  CLAMP(gtk_range_get_value(GTK_RANGE(slider)), 0, 100);
   //g_debug ("value changed %f", gtk_range_get_value(GTK_RANGE(slider)));
-  if(current_value == 0 || current_value == 100){
+  gint mute = g_variant_get_int32 (dbusmenu_menuitem_property_get_variant (priv->twin_item,
+                                                                           DBUSMENU_VOLUME_MENUITEM_MUTE));
+
+  if((current_value == 0 && mute != 1) || current_value == 100){
     volume_widget_update(mitem, current_value);
   }