aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/slider-menu-item.c4
-rw-r--r--src/sound-service.c4
-rw-r--r--src/volume-widget.c48
3 files changed, 22 insertions, 34 deletions
diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c
index d7d08fb..1a57032 100644
--- a/src/slider-menu-item.c
+++ b/src/slider-menu-item.c
@@ -135,7 +135,7 @@ slider_menu_item_populate (SliderMenuItem* self, const pa_sink_info* update)
dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
DBUSMENU_VOLUME_MENUITEM_LEVEL,
new_volume);
- GVariant* new_mute_update = g_variant_new_int32 (update->mute);
+ GVariant* new_mute_update = g_variant_new_boolean (update->mute == 1);
dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
DBUSMENU_VOLUME_MENUITEM_MUTE,
new_mute_update);
@@ -188,7 +188,7 @@ slider_menu_item_update (SliderMenuItem* self, const pa_sink_info* update)
/*
g_debug ("volume menu item - update - mute on ui = %i", update->mute);
*/
- GVariant* new_mute_update = g_variant_new_int32 (update->mute);
+ GVariant* new_mute_update = g_variant_new_boolean (update->mute == 1);
dbusmenu_menuitem_property_set_variant (DBUSMENU_MENUITEM(self),
DBUSMENU_VOLUME_MENUITEM_MUTE,
new_mute_update);
diff --git a/src/sound-service.c b/src/sound-service.c
index 7e6426c..c15e94b 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -22,6 +22,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "sound-service-dbus.h"
#include "music-player-bridge.h"
+#include <locale.h>
+
static GMainLoop *mainloop = NULL;
/**********************************************************************************************************************/
@@ -39,8 +41,10 @@ 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/volume-widget.c b/src/volume-widget.c
index a54441c..1a6895e 100644
--- a/src/volume-widget.c
+++ b/src/volume-widget.c
@@ -137,29 +137,20 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
GtkRange *range = (GtkRange*)slider;
gdouble update = g_variant_get_double (value);
-/*
- g_debug ("volume widget volume prop update with %f", update);
-*/
gtk_range_set_value(range, update);
update_accessible_desc(priv->indicator);
+ g_debug ("volume-widget::volume_widget_property_update - mute - value %f", update);
}
}
- if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){
-/*
- g_debug ("volume widget - mute update ");
-*/
- g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_INT32) );
+ else if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){
+ g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN));
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);
+ gboolean update = g_variant_get_boolean (value);
gdouble level;
-/*
- g_debug ("volume widget - mute update %i", update);
-*/
-
- if (update == 1){
+ if (update == TRUE){
level = 0;
}
else{
@@ -167,9 +158,7 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
DBUSMENU_VOLUME_MENUITEM_LEVEL));
}
gtk_range_set_value(range, level);
-/*
- g_debug ("volume-widget - update mute with value %i", update);
-*/
+ g_debug ("volume-widget::volume_widget_property_update - mute - value %i", update);
}
}
}
@@ -185,13 +174,13 @@ volume_widget_set_twin_item(VolumeWidget* self,
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));
+ gboolean initial_mute = g_variant_get_boolean (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){
+ if(initial_mute == TRUE){
initial_level = 0;
}
gtk_range_set_value(range, initial_level);
@@ -206,9 +195,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;
}
@@ -222,22 +211,17 @@ volume_widget_value_changed_cb (GtkRange *range, gpointer user_data)
{
g_return_val_if_fail (IS_VOLUME_WIDGET (user_data), FALSE);
- VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+ VolumeWidget* mitem = VOLUME_WIDGET (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)));
-*/
-
- 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){
-/*
+ 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");
+ volume_widget_update (mitem, current_value, "value-changed");
}
return FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 21:08:40 +0000