ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #01113
[Merge] lp:~cjcurran/indicator-sound/slider_length_fixing into lp:indicator-sound
Conor Curran has proposed merging lp:~cjcurran/indicator-sound/slider_length_fixing into lp:indicator-sound.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
Related bugs:
#533208 sound sliderbar's width of indicator-sound is related to the length of "Sound Preferences..."
https://bugs.launchpad.net/bugs/533208
- Icon sizes and names should now be inline with themes
- Should handle the situation of no sinks to one sink back to no sinks properly with the correct icon for each state.
- Slider movement should be smoother due to the new signals emitted from the ido lib
- Sink input while muted state now handled with animation with place.
--
https://code.launchpad.net/~cjcurran/indicator-sound/slider_length_fixing/+merge/21132
Your team ayatana-commits is subscribed to branch lp:indicator-sound.
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2010-03-02 19:36:53 +0000
+++ src/Makefile.am 2010-03-11 11:57:15 +0000
@@ -11,9 +11,7 @@
indicator-sound.h \
indicator-sound.c \
dbus-shared-names.h \
- sound-service-client.h \
- sound-service-marshal.c \
- sound-service-marshal.h
+ sound-service-client.h
libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
libsoundmenu_la_LIBADD = $(APPLET_LIBS)
@@ -30,16 +28,6 @@
--output=sound-service-client.h \
$(srcdir)/sound-service.xml
-sound-service-marshal.h: $(srcdir)/sound-service.list
- glib-genmarshal --header \
- --prefix=_sound_service_marshal $(srcdir)/sound-service.list \
- > sound-service-marshal.h
-
-sound-service-marshal.c: $(srcdir)/sound-service.list
- glib-genmarshal --body \
- --prefix=_sound_service_marshal $(srcdir)/sound-service.list \
- > sound-service-marshal.c
-
#################
# Session Stuff
@@ -74,9 +62,7 @@
###############
BUILT_SOURCES = \
sound-service-client.h \
- sound-service-server.h \
- sound-service-marshal.h \
- sound-service-marshal.c
+ sound-service-server.h
EXTRA_DIST = \
sound-service.xml \
=== modified file 'src/common-defs.h'
--- src/common-defs.h 2010-02-11 15:19:22 +0000
+++ src/common-defs.h 2010-03-11 11:57:15 +0000
@@ -22,6 +22,7 @@
#define SIGNAL_SINK_INPUT_WHILE_MUTED "SinkInputWhileMuted"
#define SIGNAL_SINK_VOLUME_UPDATE "SinkVolumeUpdate"
#define SIGNAL_SINK_MUTE_UPDATE "SinkMuteUpdate"
+#define SIGNAL_SINK_AVAILABLE_UPDATE "SinkAvailableUpdate"
// DBUS items
#define DBUSMENU_SLIDER_MENUITEM_TYPE "x-canonical-ido-slider-item"
=== modified file 'src/dbus-menu-manager.c'
--- src/dbus-menu-manager.c 2010-03-04 16:19:54 +0000
+++ src/dbus-menu-manager.c 2010-03-11 11:57:15 +0000
@@ -18,7 +18,6 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#include <unistd.h>
#include <glib/gi18n.h>
@@ -102,6 +101,8 @@
refresh_menu();
}
// Emit the signals after the menus are setup/torn down
+ // preserve ordering !
+ sound_service_dbus_update_sink_availability(dbus_interface, sink_available);
sound_service_dbus_update_sink_volume(dbus_interface, percent);
sound_service_dbus_update_sink_mute(dbus_interface, sink_muted);
dbus_menu_manager_update_mute_ui(b_all_muted);
@@ -153,12 +154,18 @@
DBUSMENU_MENUITEM_PROP_ENABLED,
TRUE);
}
+/* if(b_all_muted == TRUE){*/
+/* dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(volume_slider_menuitem), */
+/* DBUSMENU_MENUITEM_PROP_ENABLED,*/
+/* FALSE); */
+/* }*/
}
/**
-
+idle_routine:
+Something for glip mainloop to do when idle
**/
static gboolean idle_routine (gpointer data)
{
@@ -199,7 +206,8 @@
dbusmenu_menuitem_child_append(root, DBUSMENU_MENUITEM(volume_slider_menuitem));
dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(volume_slider_menuitem),
DBUSMENU_MENUITEM_PROP_ENABLED,
- b_sink_available);
+ b_sink_available && !b_all_muted);
+ g_debug("!!!!!!**in the rebuild sound menu - slider active = %i", b_sink_available && !b_all_muted);
dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(volume_slider_menuitem),
DBUSMENU_MENUITEM_PROP_VISIBLE,
b_sink_available);
@@ -210,8 +218,8 @@
// Sound preferences dialog
DbusmenuMenuitem *settings_mi = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set(settings_mi, DBUSMENU_MENUITEM_PROP_LABEL,
- _("Sound Preferences..."));
+ dbusmenu_menuitem_property_set(settings_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sound Preferences..."));
+//_("Sound Preferences..."));
dbusmenu_menuitem_child_append(root, settings_mi);
g_signal_connect(G_OBJECT(settings_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(show_sound_settings_dialog), NULL);
=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c 2010-03-04 15:52:59 +0000
+++ src/indicator-sound.c 2010-03-11 11:57:15 +0000
@@ -5,7 +5,7 @@
Copyright 2010 Canonical Ltd.
Authors:
- Conor Curran <conor.curra@xxxxxxxxxxxxx>
+ Conor Curran <conor.curran@xxxxxxxxxxxxx>
Ted Gould <ted@xxxxxxxxxxxxx>
This program is free software: you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
#include <libindicator/indicator.h>
#include <libindicator/indicator-object.h>
#include <libindicator/indicator-service-manager.h>
+#include <libindicator/indicator-image-helper.h>
#include "indicator-sound.h"
#include "dbus-shared-names.h"
@@ -78,23 +79,27 @@
static GtkLabel * get_label (IndicatorObject * io);
static GtkImage * get_icon (IndicatorObject * io);
static GtkMenu * get_menu (IndicatorObject * io);
+
//Slider related
static GtkWidget *volume_slider = NULL;
static gboolean new_slider_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
-static void slider_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, GtkWidget *widget);
-// Alternative callback mechanism, may use this again once ido is updated.
-/*static gboolean user_change_value_event_cb(GtkRange *range, GtkScrollType scroll_type, gdouble input_value, gpointer user_data);*/
+/*static void slider_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, GtkWidget *widget);*/
static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data);
static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data);
+/*static void slider_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);*/
+static void slider_grabbed(GtkWidget *widget, gpointer user_data);
+static void slider_released(GtkWidget *widget, gpointer user_data);
// DBUS communication
static DBusGProxy *sound_dbus_proxy = NULL;
static void connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata);
-/*static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean value, gpointer userdata);*/
+static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean value, gpointer userdata);
static void catch_signal_sink_volume_update(DBusGProxy * proxy, gdouble volume_percent, gpointer userdata);
static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata);
+static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata);
static void fetch_volume_percent_from_dbus();
static void fetch_mute_value_from_dbus();
+static void fetch_sink_availability_from_dbus();
/****Volume States 'members' ***/
static void update_state(const gint state);
@@ -109,11 +114,21 @@
static GHashTable *volume_states = NULL;
static GtkImage *speaker_image = NULL;
-static GtkWidget* primary_image = NULL;
static gint current_state = 0;
static gint previous_state = 0;
+
static gdouble initial_volume_percent = 0;
static gboolean initial_mute = FALSE;
+static gboolean device_available = TRUE;
+static gboolean slider_in_direct_use = FALSE;
+
+#define DESIGN_TEAM_SIZE design_team_size
+static GtkIconSize design_team_size;
+static gint animation_id;
+static GList * blocked_animation_list = NULL;
+static GList * blocked_iter = NULL;
+static void prepare_blocked_animation();
+static gboolean fade_back_to_mute_image();
// Construction
static void
@@ -128,23 +143,20 @@
io_class->get_label = get_label;
io_class->get_image = get_icon;
io_class->get_menu = get_menu;
+
+ design_team_size = gtk_icon_size_register("design-team-size", 22, 22);
-/* dbus_g_object_register_marshaller (_sound_service_marshal_VOID__INT_BOOLEAN,*/
-/* G_TYPE_NONE,*/
-/* G_TYPE_INT,*/
-/* G_TYPE_BOOLEAN,*/
-/* G_TYPE_INVALID);*/
return;
}
static void indicator_sound_init (IndicatorSound *self)
{
- /* Set good defaults */
self->service = NULL;
- /* Now let's fire these guys up. */
self->service = indicator_service_manager_new_version(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_VERSION);
g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
prepare_state_machine();
+ prepare_blocked_animation();
+ animation_id = 0;
return;
}
@@ -158,6 +170,8 @@
self->service = NULL;
}
g_hash_table_destroy(volume_states);
+ g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
+ g_list_free(blocked_animation_list);
G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
return;
}
@@ -180,7 +194,7 @@
{
gchar* current_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state));
//g_debug("At start-up attempting to set the image to %s", current_name);
- speaker_image = GTK_IMAGE(gtk_image_new_from_icon_name(current_name, GTK_ICON_SIZE_MENU));
+ speaker_image = indicator_image_helper(current_name);
gtk_widget_show(GTK_WIDGET(speaker_image));
return speaker_image;
}
@@ -197,10 +211,10 @@
// register Key-press listening on the menu widget as the slider does not allow this.
g_signal_connect(menu, "key-press-event", G_CALLBACK(key_press_cb), NULL);
-
return GTK_MENU(menu);
}
+
/**
new_slider_item:
Create a new dBusMenu Slider item.
@@ -216,20 +230,27 @@
GtkMenuItem *menu_volume_slider = GTK_MENU_ITEM(volume_slider);
dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, menu_volume_slider, parent);
- g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(slider_prop_change_cb), volume_slider);
// register slider changes listening on the range
GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
- g_signal_connect(slider, "value-changed", G_CALLBACK(value_changed_event_cb), newitem);
- // alternative callback mechanism which i could use again at some point.
-/* g_signal_connect(slider, "change-value", G_CALLBACK(user_change_value_event_cb), newitem); */
-
+
+ g_signal_connect(slider, "value-changed", G_CALLBACK(value_changed_event_cb), newitem);
+ g_signal_connect(volume_slider, "slider-grabbed", G_CALLBACK(slider_grabbed), NULL);
+ g_signal_connect(volume_slider, "slider-released", G_CALLBACK(slider_released), NULL);
+/* g_signal_connect(slider, "size-allocate", G_CALLBACK(slider_size_allocate), NULL);*/
+
// Set images on the ido
- primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)volume_slider);
- gtk_image_set_from_icon_name(GTK_IMAGE(primary_image), g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_ZERO)), GTK_ICON_SIZE_MENU);
- GtkWidget* secondary_image = ido_scale_menu_item_get_secondary_image((IdoScaleMenuItem*)volume_slider);
- gtk_image_set_from_icon_name(GTK_IMAGE(secondary_image), g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_HIGH)), GTK_ICON_SIZE_MENU);
-
+ GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)volume_slider);
+ GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks(g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_ZERO)));
+ gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU);
+ g_object_unref(primary_gicon);
+
+ GtkWidget* secondary_image = ido_scale_menu_item_get_secondary_image((IdoScaleMenuItem*)volume_slider);
+ GIcon * secondary_gicon = g_themed_icon_new_with_default_fallbacks(g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_HIGH)));
+ gtk_image_set_from_gicon(GTK_IMAGE(secondary_image), secondary_gicon, GTK_ICON_SIZE_MENU);
+ g_object_unref(secondary_gicon);
+
+ gtk_widget_set_sensitive(volume_slider, !initial_mute);
gtk_widget_show_all(volume_slider);
return TRUE;
@@ -258,16 +279,19 @@
g_debug("about to connect to the signals");
dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-/* dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_CALLBACK(catch_signal_sink_input_while_muted), NULL, NULL);*/
+ dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_CALLBACK(catch_signal_sink_input_while_muted), NULL, NULL);
dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_TYPE_DOUBLE, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_CALLBACK(catch_signal_sink_volume_update), NULL, NULL);
dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_CALLBACK(catch_signal_sink_mute_update), NULL, NULL);
+ dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_AVAILABLE_UPDATE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_AVAILABLE_UPDATE, G_CALLBACK(catch_signal_sink_availability_update), NULL, NULL);
// Ensure we are in a coherent state with the service at start up.
// Preserve ordering!
fetch_volume_percent_from_dbus();
fetch_mute_value_from_dbus();
+ fetch_sink_availability_from_dbus();
}
} else {
@@ -277,15 +301,11 @@
return;
}
-
-
-
/*
Prepare states Array.
*/
void prepare_state_machine()
{
- // TODO we need three more images
volume_states = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
g_hash_table_insert(volume_states, GINT_TO_POINTER(STATE_MUTED), g_strdup("audio-volume-muted-panel"));
g_hash_table_insert(volume_states, GINT_TO_POINTER(STATE_ZERO), g_strdup("audio-volume-low-zero-panel"));
@@ -296,6 +316,52 @@
g_hash_table_insert(volume_states, GINT_TO_POINTER(STATE_SINKS_NONE), g_strdup("audio-output-none-panel"));
}
+/*
+prepare_blocked_animation:
+Prepares the array of images to be used in the blocked animation.
+Only called at startup.
+*/
+static void prepare_blocked_animation()
+{
+ GError* error= NULL;
+ int i;
+
+ gchar* blocked_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
+ gchar* muted_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED));
+ GtkIconTheme* theme = gtk_icon_theme_get_default();
+ GdkPixbuf* mute_buf = gtk_icon_theme_load_icon(theme,
+ muted_name,
+ 22,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ &error);
+ if(error != NULL){
+ g_error("indicator-sound : prepare_blocked_animation - %s", error->message);
+ g_error_free(error);
+ return;
+ }
+
+ GdkPixbuf* blocked_buf = gtk_icon_theme_load_icon(theme, blocked_name,
+ 22,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ &error);
+ if(error != NULL){
+ g_error("indicator-sound : prepare_blocked_animation - %s", error->message);
+ g_error_free(error);
+ return;
+ }
+ // sample 22 snapshots - range : 0-256
+ for(i = 0; i < 23; i++)
+ {
+ gdk_pixbuf_composite(mute_buf, blocked_buf, 0, 0,
+ gdk_pixbuf_get_width(mute_buf),
+ gdk_pixbuf_get_height(mute_buf),
+ 0, 0, 1, 1, GDK_INTERP_BILINEAR, MIN(255, i * 11));
+ g_debug("creating blocking animation - alpha value = %i", MIN(255, i * 11));
+ blocked_animation_list = g_list_append(blocked_animation_list, gdk_pixbuf_copy(blocked_buf));
+ }
+}
+
+
gint get_state()
{
return current_state;
@@ -327,14 +393,17 @@
current_state = state;
gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state));
- gtk_image_set_from_icon_name(speaker_image, image_name, GTK_ICON_SIZE_MENU);
+ GtkImage * tempimage = indicator_image_helper(image_name);
+ gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
+ g_object_ref_sink(tempimage);
}
void determine_state_from_volume(gdouble volume_percent)
{
/* g_debug("determine_state_from_volume - previous_state = %i", previous_state);*/
-
+ if (device_available == FALSE)
+ return;
gint state = previous_state;
if (volume_percent < 30.0 && volume_percent > 0){
state = STATE_LOW;
@@ -352,6 +421,25 @@
}
+static void fetch_sink_availability_from_dbus()
+{
+ GError * error = NULL;
+ gboolean * available_input;
+ available_input = g_new0(gboolean, 1);
+ org_ayatana_indicator_sound_get_sink_availability(sound_dbus_proxy, available_input, &error);
+ if (error != NULL) {
+ g_warning("Unable to fetch AVAILABILITY at indicator start up: %s", error->message);
+ g_error_free(error);
+ g_free(available_input);
+ return;
+ }
+ device_available = *available_input;
+ if (device_available == FALSE)
+ update_state(STATE_SINKS_NONE);
+ g_free(available_input);
+ g_debug("IndicatorSound::fetch_sink_availability_from_dbus -> AVAILABILTY returned from dbus method is %i", device_available);
+
+}
static void fetch_volume_percent_from_dbus()
{
@@ -390,48 +478,80 @@
g_debug("at the indicator start up and the MUTE returned from dbus method is %i", initial_mute);
}
-/*static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)*/
-/*{*/
-/* g_debug("signal caught - sink input while muted with value %i", block_value);*/
-/*}*/
+static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)
+{
+ g_debug("signal caught - sink input while muted with value %i", block_value);
+ if (block_value == 1 && animation_id == 0 ) {
+ // We can assume we are in the muted state !
+ gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
+ GtkImage * tempimage = indicator_image_helper(image_name);
+ gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
+ g_object_ref_sink(tempimage);
+
+ blocked_iter = blocked_animation_list;
+ animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL);
+ }
+}
+
+static gboolean fade_back_to_mute_image()
+{
+ if(blocked_iter != NULL)
+ {
+ g_debug("in animation 'loop'\n");
+ gtk_image_set_from_pixbuf(speaker_image, blocked_iter->data);
+ blocked_iter = blocked_iter->next;
+ return TRUE;
+ }
+ else{
+ animation_id = 0;
+ g_debug("exit from animation\n");
+ return FALSE;
+ }
+}
static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
{
- GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
- GtkRange *range = (GtkRange*)slider;
-
- // DEBUG
- gdouble current_value = gtk_range_get_value(range);
- g_debug("SIGNAL- update sink volume - current_value : %f and new value : %f", current_value, volume_percent);
- gtk_range_set_value(range, volume_percent);
- determine_state_from_volume(volume_percent);
+ if (slider_in_direct_use != TRUE){
+ GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
+ GtkRange *range = (GtkRange*)slider;
+
+ // DEBUG
+ gdouble current_value = gtk_range_get_value(range);
+ g_debug("SIGNAL- update sink volume - current_value : %f and new value : %f", current_value, volume_percent);
+ gtk_range_set_value(range, volume_percent);
+ determine_state_from_volume(volume_percent);
+ }
}
static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata)
{
//We can be sure the service won't send a mute signal unless it has changed !
//UNMUTE's force a volume update therefore icon is updated appropriately => no need for unmute handling here.
- if(mute_value == TRUE)
+ if(mute_value == TRUE && device_available != FALSE)
{
update_state(STATE_MUTED);
}
+ else{
+ if(animation_id != 0){
+ g_debug("about to remove the animation_id callback from the mainloop!!**");
+ g_source_remove(animation_id);
+ animation_id = 0;
+ }
+ }
g_debug("signal caught - sink mute update with mute value: %i", mute_value);
gtk_widget_set_sensitive(volume_slider, !mute_value);
}
-/**
-slider_prop_change_cb:
-Whenever we have a property change on a DbusmenuMenuitem this will be called.
-**/
-static void slider_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, GtkWidget *widget)
+
+static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
{
- g_debug("slider_prop_change_cb - dodgy updater ");
- g_debug("about to set the slider to %f", g_value_get_double(value));
- GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
- GtkRange* range = (GtkRange*)slider;
- gtk_range_set_value(range, g_value_get_double(value));
- return;
+ device_available = available_value;
+ if (device_available == FALSE){
+ update_state(STATE_SINKS_NONE);
+ }
+ g_debug("signal caught - sink availability update with value: %i", available_value);
}
+
/**
value_changed_event_cb:
This callback will get triggered irregardless of whether its a user change or a programmatic change.
@@ -451,6 +571,35 @@
return FALSE;
}
+
+static void slider_grabbed (GtkWidget *widget, gpointer user_data)
+{
+ slider_in_direct_use = TRUE;
+ g_debug ("!!!!!! grabbed\n");
+}
+
+static void slider_released (GtkWidget *widget, gpointer user_data)
+{
+ slider_in_direct_use = FALSE;
+ g_debug ("!!!!!! released\n");
+}
+
+
+/**
+slider_size_allocate:
+Callback on the size-allocate event on the slider item.
+**/
+/*static void slider_size_allocate(GtkWidget *widget,*/
+/* GtkAllocation *allocation, */
+/* gpointer user_data)*/
+/*{*/
+/* g_print("Size allocate on slider (%dx%d)\n", allocation->width, allocation->height);*/
+/* if(allocation->width < 200){*/
+/* g_print("Attempting to resize the slider");*/
+/* gtk_widget_set_size_request(widget, 200, -1); */
+/* }*/
+/*}*/
+
/**
key_press_cb:
**/
@@ -514,22 +663,4 @@
return digested;
}
-/**
-This callback should only be called when the user actually drags the slider.
-Turned off for now in favour of the non descriminating value-changed call back.
-Once the grabbing listener is implemented on the slider may revert to using this.
-Its another tool for filtering unwanted volume change updates.
-**/
-/*static gboolean user_change_value_event_cb(GtkRange *range, GtkScrollType scroll_type, gdouble input_value, gpointer user_data)*/
-/*{*/
-/* DbusmenuMenuitem *item = (DbusmenuMenuitem*)user_data;*/
-/* gdouble clamped_input = CLAMP(input_value, 0, 100);*/
-/* GValue value = {0};*/
-/* g_debug("User input on SLIDER - = %f", clamped_input);*/
-/* g_value_init(&value, G_TYPE_DOUBLE);*/
-/* g_value_set_double(&value, clamped_input);*/
-/* dbusmenu_menuitem_handle_event (item, "slider_change", &value, 0);*/
-/* return FALSE; */
-/*} */
-
=== modified file 'src/pulse-manager.c'
--- src/pulse-manager.c 2010-03-04 15:52:59 +0000
+++ src/pulse-manager.c 2010-03-11 11:57:15 +0000
@@ -282,7 +282,7 @@
else{
//Update the indicator to show PA either is not ready or has no available sink
g_warning("Cannot find a suitable default sink ...");
- dbus_menu_manager_update_pa_state(FALSE, device_available, TRUE, 0);
+ dbus_menu_manager_update_pa_state(FALSE, device_available, default_sink_is_muted(), get_default_sink_volume());
}
}
else{
@@ -398,6 +398,7 @@
}
else
{
+
sink_info *value;
value = g_new0(sink_info, 1);
value->index = value->device_index = info->index;
@@ -411,7 +412,8 @@
value->channel_map = info->channel_map;
g_hash_table_insert(sink_hash, GINT_TO_POINTER(value->index), value);
g_debug("pulse-manager:update_sink_info -> After adding a new sink to our hash");
- }
+ sound_service_dbus_update_sink_availability(dbus_service, TRUE);
+ }
}
@@ -460,8 +462,11 @@
g_debug("PA_SUBSCRIPTION_EVENT_SINK event triggered");
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
{
- //TODO handle the remove event => if its our default sink - update date pa state
- } else
+ if(index == DEFAULT_SINK_INDEX)
+ g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL event triggered");
+ sound_service_dbus_update_sink_availability(dbus_service, FALSE);
+ }
+ else
{
pa_operation_unref(pa_context_get_sink_info_by_index(c, index, update_sink_info, userdata));
}
@@ -470,7 +475,7 @@
g_debug("PA_SUBSCRIPTION_EVENT_SINK_INPUT event triggered!!");
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
{
- //TODO handle the remove event
+ //handle the remove event - not relevant for current design
}
else
{
=== modified file 'src/slider-menu-item.c'
--- src/slider-menu-item.c 2010-02-11 15:19:22 +0000
+++ src/slider-menu-item.c 2010-03-11 11:57:15 +0000
@@ -92,6 +92,7 @@
SliderMenuItem *self = g_object_new(SLIDER_MENU_ITEM_TYPE, NULL);
dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_SLIDER_MENUITEM_TYPE);
dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ENABLED, sinks_available);
+ dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, sinks_available);
return self;
}
=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c 2010-03-03 21:57:43 +0000
+++ src/sound-service-dbus.c 2010-03-11 11:57:15 +0000
@@ -32,6 +32,7 @@
// DBUS methods
static gboolean sound_service_dbus_get_sink_volume(SoundServiceDbus* service, gdouble* volume_percent_input, GError** gerror);
static gboolean sound_service_dbus_get_sink_mute(SoundServiceDbus* service, gboolean* mute_input, GError** gerror);
+static gboolean sound_service_dbus_get_sink_availability(SoundServiceDbus* service, gboolean* availability_input, GError** gerror);
static void sound_service_dbus_set_sink_volume(SoundServiceDbus* service, const guint volume_percent, GError** gerror);
#include "sound-service-server.h"
@@ -43,6 +44,7 @@
DBusGConnection *connection;
gdouble volume_percent;
gboolean mute;
+ gboolean sink_availability;
};
@@ -51,6 +53,7 @@
SINK_INPUT_WHILE_MUTED,
SINK_VOLUME_UPDATE,
SINK_MUTE_UPDATE,
+ SINK_AVAILABLE_UPDATE,
LAST_SIGNAL
};
@@ -105,6 +108,15 @@
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ signals[SINK_AVAILABLE_UPDATE] = g_signal_new("sink-available-update",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+
}
@@ -116,6 +128,8 @@
priv->connection = NULL;
priv->volume_percent = 0;
+ priv->mute = FALSE;
+ priv->sink_availability = FALSE;
/* Fetch the session bus */
priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -129,8 +143,6 @@
dbus_g_connection_register_g_object(priv->connection,
"/org/ayatana/indicator/sound/service",
G_OBJECT(self));
-
- return;
}
@@ -174,6 +186,14 @@
return TRUE;
}
+static gboolean sound_service_dbus_get_sink_availability (SoundServiceDbus *self, gboolean *availability_input, GError** gerror)
+{
+ SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (self);
+ g_debug("Get sink availability - sound service dbus!, about to send over availability_value of %i", priv->sink_availability);
+ *availability_input = priv->sink_availability;
+ return TRUE;
+}
+
/**
SIGNALS
Utility methods to emit signals from the service into the ether.
@@ -212,5 +232,18 @@
priv->mute);
}
+void sound_service_dbus_update_sink_availability(SoundServiceDbus* obj, gboolean sink_availability)
+{
+ g_debug("Emitting signal: SINK_AVAILABILITY_UPDATE, with value %i", sink_availability);
+
+ SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (obj);
+ priv->sink_availability = sink_availability;
+
+ g_signal_emit(obj,
+ signals[SINK_AVAILABLE_UPDATE],
+ 0,
+ priv->sink_availability);
+}
+
=== modified file 'src/sound-service-dbus.h'
--- src/sound-service-dbus.h 2010-02-10 12:45:23 +0000
+++ src/sound-service-dbus.h 2010-03-11 11:57:15 +0000
@@ -49,10 +49,6 @@
struct _SoundServiceDbusClass {
GObjectClass parent_class;
- /* Signals -> outward messages to the DBUS and beyond*/
- // TODO - ARE THESE NECESSARY ?
- //void (* sink_input_while_muted) (SoundServiceDbus *self, gboolean block_value, gpointer sound_data);
- //void (* sink_volume_update) (SoundServiceDbus *self, gdouble sink_volume, gpointer sound_data);
};
GType sound_service_dbus_get_type (void) G_GNUC_CONST;
@@ -60,6 +56,7 @@
void sound_service_dbus_sink_input_while_muted (SoundServiceDbus* obj, gboolean block_value);
void sound_service_dbus_update_sink_volume(SoundServiceDbus* obj, gdouble sink_volume);
void sound_service_dbus_update_sink_mute(SoundServiceDbus* obj, gboolean sink_mute);
+void sound_service_dbus_update_sink_availability(SoundServiceDbus* obj, gboolean sink_availibity);
G_END_DECLS
=== modified file 'src/sound-service.xml'
--- src/sound-service.xml 2010-02-10 11:33:36 +0000
+++ src/sound-service.xml 2010-03-11 11:57:15 +0000
@@ -5,6 +5,7 @@
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_set_sink_volume"/>
<arg type='u' name='volume_percent' direction="in"/>
</method>
+
<method name = "GetSinkVolume">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_get_sink_volume"/>
<arg type='d' name='volume_percent_input' direction="out"/>
@@ -15,6 +16,11 @@
<arg type='b' name='mute_input' direction="out"/>
</method>
+ <method name = "GetSinkAvailability">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_get_sink_availability"/>
+ <arg type='b' name='availability_input' direction="out"/>
+ </method>
+
<!-- Will need to hook up another signal which monitors for volume change
Our respective UI element should listen to this and therefore will be updated with accurate setting-->
<!-- Triggered when a sink is muted but the input has been sent to that sink -->
@@ -30,6 +36,10 @@
<arg name="mute_value" type="b" direction="out"/>
</signal>
+ <signal name="SinkAvailableUpdate">
+ <arg name="available_value" type="b" direction="out"/>
+ </signal>
+
</interface>
</node>
Follow ups
