aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/slider-menu-item.c11
-rw-r--r--src/sound-service.c2
-rw-r--r--src/voip-input-menu-item.c6
-rw-r--r--src/voip-input-widget.c7
-rw-r--r--src/volume-widget.c30
5 files changed, 36 insertions, 20 deletions
diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c
index b194395..8186fa3 100644
--- a/src/slider-menu-item.c
+++ b/src/slider-menu-item.c
@@ -69,9 +69,6 @@ slider_menu_item_class_init (SliderMenuItemClass *klass)
static void
slider_menu_item_init (SliderMenuItem *self)
{
-/*
- g_debug("Building new Slider Menu Item");
-*/
dbusmenu_menuitem_property_set( DBUSMENU_MENUITEM(self),
DBUSMENU_MENUITEM_PROP_TYPE,
DBUSMENU_VOLUME_MENUITEM_TYPE );
@@ -109,9 +106,11 @@ handle_event (DbusmenuMenuitem * mi,
SliderMenuItemPrivate* priv = SLIDER_MENU_ITEM_GET_PRIVATE (SLIDER_MENU_ITEM (mi));
gdouble volume_input = g_variant_get_double (value);
+/*
g_debug ("slider menu item handle event with value %f on name %s",
volume_input,
name);
+*/
slider_menu_item_update_volume (SLIDER_MENU_ITEM (mi), volume_input);
device_ensure_sink_is_unmuted (priv->a_sink);
@@ -148,8 +147,9 @@ 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);
@@ -178,8 +178,9 @@ slider_menu_item_update (SliderMenuItem* self, const pa_sink_info* update)
GVariant* new_volume = g_variant_new_double (volume_percent);
+/*
g_debug ("slider menu item update - volume update to ui to %f", volume_percent);
-
+*/
dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
DBUSMENU_VOLUME_MENUITEM_LEVEL,
diff --git a/src/sound-service.c b/src/sound-service.c
index c15e94b..1324537 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -41,10 +41,8 @@ service_shutdown (IndicatorService *service, gpointer user_data)
{
if (mainloop != NULL) {
g_debug("Service shutdown !");
-/*
close_pulse_activites();
g_main_loop_quit(mainloop);
-*/
}
return;
}
diff --git a/src/voip-input-menu-item.c b/src/voip-input-menu-item.c
index a92f91c..5507caf 100644
--- a/src/voip-input-menu-item.c
+++ b/src/voip-input-menu-item.c
@@ -73,7 +73,9 @@ voip_input_menu_item_class_init (VoipInputMenuItemClass *klass)
static void
voip_input_menu_item_init (VoipInputMenuItem *self)
{
+/*
g_debug("Building new Slider Menu Item");
+*/
dbusmenu_menuitem_property_set( DBUSMENU_MENUITEM(self),
DBUSMENU_MENUITEM_PROP_TYPE,
DBUSMENU_VOIP_INPUT_MENUITEM_TYPE );
@@ -117,7 +119,9 @@ handle_event (DbusmenuMenuitem * mi,
if (value != NULL){
if (IS_VOIP_INPUT_MENU_ITEM (mi)) {
VoipInputMenuItemPrivate* priv = VOIP_INPUT_MENU_ITEM_GET_PRIVATE (VOIP_INPUT_MENU_ITEM (mi));
+/*
g_debug ("Handle event in the voip input level backend instance - %f", percent);
+*/
pa_cvolume new_volume;
pa_cvolume_init(&new_volume);
new_volume.channels = 1;
@@ -167,7 +171,9 @@ voip_input_menu_item_update (VoipInputMenuItem* item,
// Only send over the mute updates if the state has changed.
// in this order - volume first mute last!!
if (priv->mute != source->mute){
+/*
g_debug ("voip menu item - update - mute = %i", priv->mute);
+*/
GVariant* new_mute_update = g_variant_new_int32 (source->mute);
dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(item),
DBUSMENU_VOIP_INPUT_MENUITEM_MUTE,
diff --git a/src/voip-input-widget.c b/src/voip-input-widget.c
index dcf858e..1b36496 100644
--- a/src/voip-input-widget.c
+++ b/src/voip-input-widget.c
@@ -141,6 +141,7 @@ voip_input_widget_property_update (DbusmenuMenuitem* item, gchar* property,
}
if(g_ascii_strcasecmp(DBUSMENU_VOIP_INPUT_MENUITEM_MUTE, property) == 0){
if(priv->grabbed == FALSE){
+ g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_INT32));
GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_voip_input_slider);
GtkRange *range = (GtkRange*)slider;
gint update = g_variant_get_int32 (value);
@@ -149,8 +150,10 @@ voip_input_widget_property_update (DbusmenuMenuitem* item, gchar* property,
level = 0;
}
else{
- level = g_variant_get_double (dbusmenu_menuitem_property_get_variant (priv->twin_item,
- DBUSMENU_VOIP_INPUT_MENUITEM_LEVEL));
+ GVariant* variant = dbusmenu_menuitem_property_get_variant (priv->twin_item,
+ DBUSMENU_VOIP_INPUT_MENUITEM_LEVEL);
+ g_return_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_DOUBLE));
+ level = g_variant_get_double (variant);
}
gtk_range_set_value(range, level);
diff --git a/src/volume-widget.c b/src/volume-widget.c
index 77392c8..e8e7bae 100644
--- a/src/volume-widget.c
+++ b/src/volume-widget.c
@@ -128,15 +128,10 @@ static void
volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
GVariant* value, gpointer userdata)
{
- g_return_if_fail (IS_VOLUME_WIDGET (userdata));
+ g_return_if_fail (IS_VOLUME_WIDGET(userdata));
VolumeWidget* mitem = VOLUME_WIDGET(userdata);
VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
- g_debug ("volume-widget::volume_widget_property_update for prop %s, is it a double %i",
- property, g_variant_is_of_type (value, G_VARIANT_TYPE_DOUBLE) );
- g_debug ("volume-widget::volume_widget_property_update for prop %s, is it a boolean %i",
- property, g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN) );
-
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){
@@ -144,8 +139,10 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
GtkRange *range = (GtkRange*)slider;
gdouble update = g_variant_get_double (value);
gtk_range_set_value(range, update);
- update_accessible_desc(priv->indicator);
+/*
g_debug ("volume-widget::volume_widget_property_update - volume - value %f", update);
+*/
+ update_accessible_desc(priv->indicator);
}
}
else if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){
@@ -160,11 +157,19 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
level = 0;
}
else{
- level = g_variant_get_double (dbusmenu_menuitem_property_get_variant (priv->twin_item,
- DBUSMENU_VOLUME_MENUITEM_LEVEL));
+ GVariant* variant = dbusmenu_menuitem_property_get_variant (priv->twin_item,
+ DBUSMENU_VOLUME_MENUITEM_LEVEL);
+/*
+ g_debug ("variant for the volume - is it null = %i", variant == NULL);
+*/
+ g_return_if_fail (g_variant_is_of_type (variant, G_VARIANT_TYPE_DOUBLE) );
+
+ level = g_variant_get_double (variant);
}
+/*
+ g_debug ("volume-widget::volume_widget_property_update - mute - value %i and level = %f", update, level);
+*/
gtk_range_set_value(range, level);
- g_debug ("volume-widget::volume_widget_property_update - mute - value %i", update);
}
}
}
@@ -202,7 +207,9 @@ volume_widget_change_value_cb (GtkRange *range,
g_return_val_if_fail (IS_VOLUME_WIDGET (user_data), FALSE);
VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+/*
g_debug ("changed value %f", new_value);
+*/
volume_widget_update(mitem, new_value, "change-value");
return FALSE;
@@ -221,12 +228,13 @@ volume_widget_value_changed_cb (GtkRange *range, gpointer user_data)
VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
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)));
gboolean mute = g_variant_get_boolean (dbusmenu_menuitem_property_get_variant (priv->twin_item,
DBUSMENU_VOLUME_MENUITEM_MUTE));
if((current_value == 0 && mute == FALSE) || current_value == 100){
+/*
g_debug ("value changed - actual set %f", current_value);
+*/
volume_widget_update (mitem, current_value, "value-changed");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 07:14:37 +0000