aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure38
-rw-r--r--configure.ac6
-rw-r--r--debian/changelog9
-rwxr-xr-x[-rw-r--r--]src/indicator-sound.c219
-rw-r--r--src/pulse-manager.c140
5 files changed, 260 insertions, 152 deletions
diff --git a/configure b/configure
index ef012dd..ea104c5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for indicator-sound 0.2.2.
+# Generated by GNU Autoconf 2.65 for indicator-sound 0.2.3.
#
# Report bugs to <conor.curran@canonical.com>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-sound'
PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.2.2'
-PACKAGE_STRING='indicator-sound 0.2.2'
+PACKAGE_VERSION='0.2.3'
+PACKAGE_STRING='indicator-sound 0.2.3'
PACKAGE_BUGREPORT='conor.curran@canonical.com'
PACKAGE_URL=''
@@ -1494,7 +1494,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures indicator-sound 0.2.2 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1564,7 +1564,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-sound 0.2.2:";;
+ short | recursive ) echo "Configuration of indicator-sound 0.2.3:";;
esac
cat <<\_ACEOF
@@ -1691,7 +1691,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-sound configure 0.2.2
+indicator-sound configure 0.2.3
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2062,7 +2062,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by indicator-sound $as_me 0.2.2, which was
+It was created by indicator-sound $as_me 0.2.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2875,7 +2875,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-sound
- VERSION=0.2.2
+ VERSION=0.2.3
cat >>confdefs.h <<_ACEOF
@@ -12112,18 +12112,18 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
indicator >= \$INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
else
pkg_failed=yes
@@ -12139,18 +12139,18 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
indicator >= \$INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
else
pkg_failed=yes
@@ -12172,12 +12172,12 @@ fi
if test $_pkg_short_errors_supported = yes; then
APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS"`
else
APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS"`
fi
# Put the nasty error message in config.log where it belongs
@@ -12185,7 +12185,7 @@ fi
as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS) were not met:
$APPLET_PKG_ERRORS
@@ -13930,7 +13930,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by indicator-sound $as_me 0.2.2, which was
+This file was extended by indicator-sound $as_me 0.2.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13996,7 +13996,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-indicator-sound config.status 0.2.2
+indicator-sound config.status 0.2.3
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c20771b..23e8d9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(indicator-sound, 0.2.2, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.2.3, conor.curran@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.2.2)
+AM_INIT_AUTOMAKE(indicator-sound, 0.2.3)
AM_MAINTAINER_MODE
@@ -34,7 +34,7 @@ INDICATOR_DISPLAY_OBJECTS=0.1.4
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+ dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
AC_SUBST(APPLET_CFLAGS)
diff --git a/debian/changelog b/debian/changelog
index c9c34c3..4e15180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-sound (0.2.3-0ubuntu1) lucid-proposed; urgency=low
+
+ * New upstream version:
+ - "Changing left/right balance in sound-preferences changes the output
+ volume slider when indicator-applet is running" (lp: #532095)
+ - update the mute animation on theme changes (lp: #568586)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 29 Apr 2010 11:53:37 +0200
+
indicator-sound (0.2.2-0ubuntu1) lucid; urgency=low
* New upstream version
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 6c8f4e1..18f48d8 100644..100755
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -89,6 +89,7 @@ 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_grabbed(GtkWidget *widget, gpointer user_data);
static void slider_released(GtkWidget *widget, gpointer user_data);
+static void style_changed_cb(GtkWidget *widget, gpointer user_data);
// DBUS communication
static DBusGProxy *sound_dbus_proxy = NULL;
@@ -111,16 +112,18 @@ static const gint STATE_MEDIUM = 3;
static const gint STATE_HIGH = 4;
static const gint STATE_MUTED_WHILE_INPUT = 5;
static const gint STATE_SINKS_NONE = 6;
+static const gint OUT_OF_RANGE = -10;
static GHashTable *volume_states = NULL;
static GtkImage *speaker_image = NULL;
static gint current_state = 0;
static gint previous_state = 0;
-static gdouble initial_volume_percent = 0;
+static gdouble initial_volume_percent;
static gboolean initial_mute ;
static gboolean device_available;
-static gboolean slider_in_direct_use = FALSE;
+static gboolean slider_in_direct_use;
+static gdouble exterior_vol_update;
static GtkIconSize design_team_size;
static gint blocked_id;
@@ -131,8 +134,10 @@ static GList * blocked_iter = NULL;
static void prepare_blocked_animation();
static gboolean fade_back_to_mute_image();
static gboolean start_animation();
+static void reset_mute_blocking_animation();
+static void free_the_animation_list();
+
-// Construction
static void
indicator_sound_class_init (IndicatorSoundClass *klass)
{
@@ -152,7 +157,8 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
return;
}
-static void indicator_sound_init (IndicatorSound *self)
+static void
+indicator_sound_init (IndicatorSound *self)
{
self->service = NULL;
self->service = indicator_service_manager_new_version(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_VERSION);
@@ -163,6 +169,7 @@ static void indicator_sound_init (IndicatorSound *self)
initial_mute = FALSE;
device_available = TRUE;
slider_in_direct_use = FALSE;
+ exterior_vol_update = OUT_OF_RANGE;
g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
return;
@@ -179,13 +186,20 @@ indicator_sound_dispose (GObject *object)
}
g_hash_table_destroy(volume_states);
+ free_the_animation_list();
+
+ G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
+ return;
+}
+
+static void
+free_the_animation_list()
+{
if(blocked_animation_list != NULL){
g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
g_list_free(blocked_animation_list);
+ blocked_animation_list = NULL;
}
-
- G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
- return;
}
static void
@@ -235,14 +249,14 @@ slider_parent_changed (GtkWidget *widget,
{
gtk_widget_set_size_request (widget, 200, -1);
g_debug("slider parent changed");
- //fetch_volume_percent_from_dbus();
}
/**
new_slider_item:
Create a new dBusMenu Slider item.
**/
-static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+static gboolean
+new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
{
IndicatorObject *io = NULL;
@@ -270,6 +284,7 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p
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, "style-set", G_CALLBACK(style_changed_cb), NULL);
// Set images on the ido
GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)volume_slider);
@@ -295,7 +310,6 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p
static void
connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata)
{
- // TODO: This could be safer.
if (connected) {
if (sound_dbus_proxy == NULL) {
GError * error = NULL;
@@ -332,6 +346,7 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u
} else {
//TODO : will need to handle this scenario
+ // Not much can we do here really, if there is no dbus connection tis goosed.
}
return;
@@ -340,7 +355,8 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u
/*
Prepare states Array.
*/
-void prepare_state_machine()
+void
+prepare_state_machine()
{
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"));
@@ -357,7 +373,8 @@ prepare_blocked_animation:
Prepares the array of images to be used in the blocked animation.
Only called at startup.
*/
-static void prepare_blocked_animation()
+static void
+prepare_blocked_animation()
{
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));
@@ -368,13 +385,13 @@ static void prepare_blocked_animation()
temp_image = indicator_image_helper(blocked_name);
GdkPixbuf* blocked_buf = gtk_image_get_pixbuf(temp_image);
- int i;
-
if(mute_buf == NULL || blocked_buf == NULL){
- g_debug("Don bother with the animation, the theme aint got the goods");
+ g_debug("Don bother with the animation, the theme aint got the goods !");
return;
}
+ int i;
+
// sample 51 snapshots - range : 0-256
for(i = 0; i < 51; i++)
{
@@ -384,31 +401,40 @@ static void prepare_blocked_animation()
0, 0, 1, 1, GDK_INTERP_BILINEAR, MIN(255, i * 5));
blocked_animation_list = g_list_append(blocked_animation_list, gdk_pixbuf_copy(blocked_buf));
}
+ g_object_ref_sink(mute_buf);
+ g_object_unref(mute_buf);
+ g_object_ref_sink(blocked_buf);
+ g_object_unref(blocked_buf);
}
-gint get_state()
+gint
+get_state()
{
return current_state;
}
-gchar* get_state_image_name(gint state)
+gchar*
+get_state_image_name(gint state)
{
return g_hash_table_lookup(volume_states, GINT_TO_POINTER(state));
}
-void prepare_for_tests(IndicatorObject *io)
+void
+prepare_for_tests(IndicatorObject *io)
{
prepare_state_machine();
get_icon(io);
}
-void tidy_up_hash()
+void
+tidy_up_hash()
{
g_hash_table_destroy(volume_states);
}
-static void update_state(const gint state)
+static void
+update_state(const gint state)
{
/* g_debug("update state beginning - previous_state = %i", previous_state);*/
@@ -422,7 +448,8 @@ static void update_state(const gint state)
}
-void determine_state_from_volume(gdouble volume_percent)
+void
+determine_state_from_volume(gdouble volume_percent)
{
/* g_debug("determine_state_from_volume - previous_state = %i", previous_state);*/
if (device_available == FALSE)
@@ -444,7 +471,38 @@ void determine_state_from_volume(gdouble volume_percent)
}
-static void fetch_sink_availability_from_dbus()
+static gboolean
+start_animation()
+{
+ blocked_iter = blocked_animation_list;
+ blocked_id = 0;
+ g_debug("exit from blocked hold start the animation\n");
+ animation_id = g_timeout_add(50, fade_back_to_mute_image, NULL);
+ return FALSE;
+}
+
+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 now\n");
+ return FALSE;
+ }
+}
+
+/*******************************************************************/
+//DBus method handlers
+/*******************************************************************/
+static void
+fetch_sink_availability_from_dbus()
{
GError * error = NULL;
gboolean * available_input;
@@ -457,17 +515,21 @@ static void fetch_sink_availability_from_dbus()
return;
}
device_available = *available_input;
- if (device_available == FALSE)
+ if (device_available == FALSE){
update_state(STATE_SINKS_NONE);
g_debug("NO DEVICE AVAILABLE");
+ }
- gtk_widget_set_sensitive(volume_slider, device_available);
+ if (GTK_IS_WIDGET (volume_slider))
+ gtk_widget_set_sensitive(volume_slider, device_available);
+
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()
+static void
+fetch_volume_percent_from_dbus()
{
GError * error = NULL;
gdouble *volume_percent_input;
@@ -485,7 +547,8 @@ static void fetch_volume_percent_from_dbus()
g_debug("at the indicator start up and the volume percent returned from dbus method is %f", initial_volume_percent);
}
-static void fetch_mute_value_from_dbus()
+static void
+fetch_mute_value_from_dbus()
{
GError * error = NULL;
gboolean *mute_input;
@@ -504,7 +567,11 @@ static void fetch_mute_value_from_dbus()
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)
+/*******************************************************************/
+//DBus signal catchers
+/*******************************************************************/
+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 && blocked_id == 0 && animation_id == 0 && blocked_animation_list != NULL) {
@@ -514,32 +581,9 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo
}
}
-static gboolean start_animation()
-{
- blocked_iter = blocked_animation_list;
- blocked_id = 0;
- g_debug("exit from blocked hold start the animation\n");
- animation_id = g_timeout_add(50, fade_back_to_mute_image, NULL);
- return FALSE;
-}
-
-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)
+static void
+catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
{
if (slider_in_direct_use == FALSE){
GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
@@ -548,12 +592,14 @@ static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_pe
// 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);
+ exterior_vol_update = 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)
+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.
@@ -562,22 +608,29 @@ static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value
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;
- }
- if(blocked_id != 0){
- g_debug("about to remove the blocked_id callback from the mainloop!!**");
- g_source_remove(blocked_id);
- blocked_id = 0;
- }
+ reset_mute_blocking_animation();
}
g_debug("signal caught - sink mute update with mute value: %i", mute_value);
gtk_widget_set_sensitive(volume_slider, !mute_value);
}
-static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
+static void
+reset_mute_blocking_animation()
+{
+ if(animation_id != 0){
+ g_debug("about to remove the animation_id callback from the mainloop!!**");
+ g_source_remove(animation_id);
+ animation_id = 0;
+ }
+ if(blocked_id != 0){
+ g_debug("about to remove the blocked_id callback from the mainloop!!**");
+ g_source_remove(blocked_id);
+ blocked_id = 0;
+ }
+}
+
+static void
+catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
{
device_available = available_value;
if (device_available == FALSE){
@@ -587,13 +640,24 @@ static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean av
}
+
+
+/*******************************************************************/
+//UI callbacks
+/******************************************************************/
+
/**
value_changed_event_cb:
This callback will get triggered irregardless of whether its a user change or a programmatic change.
**/
-static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data)
+static gboolean
+value_changed_event_cb(GtkRange *range, gpointer user_data)
{
gdouble current_value = CLAMP(gtk_range_get_value(range), 0, 100);
+ if(current_value == exterior_vol_update){
+ g_debug("ignore the value changed event - its come from the outside");
+ return FALSE;
+ }
DbusmenuMenuitem *item = (DbusmenuMenuitem*)user_data;
GValue value = {0};
g_value_init(&value, G_TYPE_DOUBLE);
@@ -607,24 +671,26 @@ static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data)
}
-static void slider_grabbed (GtkWidget *widget, gpointer user_data)
+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)
+static void
+slider_released (GtkWidget *widget, gpointer user_data)
{
slider_in_direct_use = FALSE;
g_debug ("!!!!!! released\n");
}
-
/**
key_press_cb:
**/
-static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
+static gboolean
+key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
{
gboolean digested = FALSE;
@@ -678,12 +744,25 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat
if(new_value != current_value && current_state != STATE_MUTED)
{
g_debug("Attempting to set the range from the key listener to %f", new_value);
+ // In order to ensure that the exterior filtering does not catch this, reset the exterior_vol_update
+ // to ensure these updates.
+ exterior_vol_update = OUT_OF_RANGE;
gtk_range_set_value(range, new_value);
}
}
return digested;
}
+static void
+style_changed_cb(GtkWidget *widget, gpointer user_data)
+{
+ g_debug("Just caught a style change event");
+ update_state(current_state);
+ reset_mute_blocking_animation();
+ update_state(current_state);
+ free_the_animation_list();
+ prepare_blocked_animation();
+}
static void
scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction)
@@ -695,8 +774,6 @@ scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction)
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider));
gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider));
- //g_debug("the scroll step size = %f", adj->step_increment);
-
if (direction == INDICATOR_OBJECT_SCROLL_UP){
value += adj->step_increment;
}
diff --git a/src/pulse-manager.c b/src/pulse-manager.c
index 1ce94d0..c84cfcc 100644
--- a/src/pulse-manager.c
+++ b/src/pulse-manager.c
@@ -41,20 +41,22 @@ static void context_success_callback(pa_context *c, int success, void *userdata)
static void pulse_sink_input_info_callback(pa_context *c, const pa_sink_input_info *info, int eol, void *userdata);
static void pulse_server_info_callback(pa_context *c, const pa_server_info *info, void *userdata);
static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, void *userdata);
-static void pulse_source_info_callback(pa_context *c, const pa_source_info *i, int eol, void *userdata);
static void destroy_sink_info(void *value);
static gboolean determine_sink_availability();
static void reconnect_to_pulse();
+static gboolean has_volume_changed(const pa_sink_info* new_sink, sink_info* cached_sink);
+static pa_cvolume construct_mono_volume(const pa_cvolume* vol);
/**
-Refactoring notes
-Push all UI updates out through update PA state in the service.
+Future Refactoring notes
+ - Push all UI updates out through update PA state in the service.
+ - Collapse 3 update_sink_info into one. The essentially do the same thing from different contexts.
**/
-/*
+/**
Entry point
-*/
+**/
void establish_pulse_activities(SoundServiceDbus *service)
{
dbus_service = service;
@@ -71,11 +73,19 @@ void establish_pulse_activities(SoundServiceDbus *service)
pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL);
}
+/**
+get_context()
+Needed for testing - bah!
+**/
pa_context* get_context()
{
return pulse_context;
}
+/**
+close_pulse_activites()
+Gracefully close our connection with the Pulse async library.
+**/
void close_pulse_activites()
{
if (pulse_context != NULL){
@@ -118,6 +128,10 @@ static void reconnect_to_pulse()
pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL);
}
+/**
+destroy_sink_info()
+item destructor method for the sink_info hash
+**/
static void destroy_sink_info(void *value)
{
sink_info *sink = (sink_info*)value;
@@ -172,12 +186,10 @@ static void check_sink_input_while_muted_event(gint sink_index)
{
g_debug("SINKINPUTWHILEMUTED SIGNAL EVENT TO BE SENT FROM PA MANAGER - check trace for value");
- if (default_sink_is_muted(sink_index) == TRUE)
- {
+ if (default_sink_is_muted(sink_index) == TRUE){
sound_service_dbus_sink_input_while_muted (dbus_service, TRUE);
}
- else
- {
+ else{
sound_service_dbus_sink_input_while_muted(dbus_service, FALSE);
}
}
@@ -223,25 +235,35 @@ void set_sink_volume(gdouble percent)
if(pa_server_available == FALSE)
return;
g_debug("in the pulse manager:set_sink_volume with percent %f", percent);
+
if(DEFAULT_SINK_INDEX < 0)
{
g_warning("We have no default sink !!! - returning after not attempting to set any volume of any sink");
return;
}
- sink_info *s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(DEFAULT_SINK_INDEX));
+ sink_info *cached_sink = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(DEFAULT_SINK_INDEX));
- pa_volume_t new_volume = (pa_volume_t) ((percent * PA_VOLUME_NORM) / 100);
- g_debug("new_volume double check :%f", pa_sw_volume_to_linear(new_volume));
- g_debug("new volume calculated :%f", (gdouble)new_volume);
- pa_cvolume dev_vol;
- pa_cvolume_set(&dev_vol, s->volume.channels, new_volume);
- s->volume = dev_vol;
- pa_operation_unref(pa_context_set_sink_volume_by_index(pulse_context, DEFAULT_SINK_INDEX, &dev_vol, NULL, NULL));
-
+ pa_cvolume new_volume;
+ pa_cvolume_init(&new_volume);
+ 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);
+ pa_cvolume_set(&cached_sink->volume, cached_sink->channel_map.channels, new_volume_value);
+ pa_operation_unref(pa_context_set_sink_volume_by_index(pulse_context, DEFAULT_SINK_INDEX, &new_volume, NULL, NULL));
}
+static pa_cvolume construct_mono_volume(const pa_cvolume* vol)
+{
+ pa_cvolume new_volume;
+ pa_cvolume_init(&new_volume);
+ new_volume.channels = 1;
+ pa_volume_t max_vol = pa_cvolume_max(vol);
+ pa_cvolume_set(&new_volume, 1, max_vol);
+ return new_volume;
+}
+
/**********************************************************************************************************************/
// Pulse-Audio asychronous call-backs
/**********************************************************************************************************************/
@@ -299,7 +321,7 @@ static void pulse_sink_info_callback(pa_context *c, const pa_sink_info *sink, in
value->index = sink->index;
value->name = g_strdup(sink->name);
value->mute = !!sink->mute;
- value->volume = sink->volume;
+ value->volume = construct_mono_volume(&sink->volume);
value->base_volume = sink->base_volume;
value->channel_map = sink->channel_map;
g_hash_table_insert(sink_hash, GINT_TO_POINTER(sink->index), value);
@@ -373,15 +395,24 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
s->name = g_strdup(info->name);
gboolean mute_changed = s->mute != !!info->mute;
s->mute = !!info->mute;
- gboolean volume_changed = (pa_cvolume_equal(&info->volume, &s->volume) == 0);
- s->volume = info->volume;
- s->base_volume = info->base_volume;
+ gboolean volume_changed = has_volume_changed(info, s);
+
+/* g_debug("new balance : %i", (int)(pa_cvolume_get_balance(&info->volume, &info->channel_map) * 100));*/
+/* g_debug("cached balance : %i", (int)(pa_cvolume_get_balance(&s->volume, &s->channel_map) * 100));*/
+/* g_debug("update_sink_info: new_volume input : %f", (gdouble)(pa_cvolume_max(&info->volume)));*/
+/* g_debug("update sink info: cached volume is at: %f", (gdouble)(pa_cvolume_max(&s->volume)));*/
+/* g_debug("update sink info : volume changed = %i", volume_changed);*/
+/* g_debug("update sink info : compatibility = %i", pa_cvolume_compatible_with_channel_map(&info->volume, &s->channel_map));*/
+
+ s->volume = construct_mono_volume(&info->volume);
+ s->channel_map = info->channel_map;
+
if(DEFAULT_SINK_INDEX == s->index)
{
//update the UI
if (volume_changed == TRUE && s->mute == FALSE)
{
- pa_volume_t vol = pa_cvolume_avg(&s->volume);
+ pa_volume_t vol = pa_cvolume_max(&s->volume);
gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM;
g_debug("Updating volume from PA manager with volume = %f", volume_percent);
sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
@@ -393,7 +424,7 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
sound_service_dbus_update_sink_mute(dbus_service, s->mute);
dbus_menu_manager_update_mute_ui(s->mute);
if(s->mute == FALSE){
- pa_volume_t vol = pa_cvolume_avg(&s->volume);
+ pa_volume_t vol = pa_cvolume_max(&s->volume);
gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM;
g_debug("Updating volume from PA manager with volume = %f", volume_percent);
sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
@@ -408,7 +439,8 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
value->index = info->index;
value->name = g_strdup(info->name);
value->mute = !!info->mute;
- value->volume = info->volume;
+ value->volume = construct_mono_volume(&info->volume);
+ value->channel_map = info->channel_map;
value->base_volume = info->base_volume;
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");
@@ -417,6 +449,22 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
}
+static gboolean has_volume_changed(const pa_sink_info* new_sink, sink_info* cached_sink)
+{
+ if(pa_cvolume_compatible_with_channel_map(&new_sink->volume, &cached_sink->channel_map) == FALSE)
+ return FALSE;
+
+ pa_cvolume new_vol = construct_mono_volume(&new_sink->volume);
+
+ if(pa_cvolume_equal(&new_vol, &(cached_sink->volume)) == TRUE){
+ g_debug("has_volume_changed: volumes appear to be equal? no change triggered!");
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
static void pulse_server_info_callback(pa_context *c, const pa_server_info *info, void *userdata)
{
g_debug("server info callback");
@@ -448,11 +496,6 @@ static void pulse_server_info_callback(pa_context *c, const pa_server_info *info
pa_operation_unref(operation);
}
-static void pulse_source_info_callback(pa_context *c, const pa_source_info *i, int eol, void *userdata)
-{
- g_debug("pulse source info callback");
-}
-
static void subscribed_events_callback(pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata)
{
@@ -464,24 +507,24 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event
if(index == DEFAULT_SINK_INDEX)
sound_service_dbus_update_sink_availability(dbus_service, FALSE);
- g_debug(" - removing sink of index %i from our sink hash - keep the cache tidy !", index);
+ g_debug("Subscribed_events_callback - removing sink of index %i from our sink hash - keep the cache tidy !", index);
g_hash_table_remove(sink_hash, GINT_TO_POINTER(index));
if(index == DEFAULT_SINK_INDEX){
- g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL: default sink %i has been removed.", DEFAULT_SINK_INDEX);
+ g_debug("subscribed_events_callback - PA_SUBSCRIPTION_EVENT_SINK REMOVAL: default sink %i has been removed.", DEFAULT_SINK_INDEX);
DEFAULT_SINK_INDEX = -1;
determine_sink_availability();
}
- g_debug(" - Now what is our default sink : %i", DEFAULT_SINK_INDEX);
+ g_debug("subscribed_events_callback - Now what is our default sink : %i", DEFAULT_SINK_INDEX);
}
else
{
- g_debug("PA_SUBSCRIPTION_EVENT_SINK: a generic sink event - will trigger an update");
+ g_debug("subscribed_events_callback - PA_SUBSCRIPTION_EVENT_SINK: a generic sink event - will trigger an update");
pa_operation_unref(pa_context_get_sink_info_by_index(c, index, update_sink_info, userdata));
}
break;
case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
- g_debug("PA_SUBSCRIPTION_EVENT_SINK_INPUT event triggered!!");
+ g_debug("subscribed_events_callback - PA_SUBSCRIPTION_EVENT_SINK_INPUT event triggered!!");
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
{
//handle the sink input remove event - not relevant for current design
@@ -491,29 +534,12 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event
pa_operation_unref(pa_context_get_sink_input_info(c, index, pulse_sink_input_info_callback, userdata));
}
break;
- case PA_SUBSCRIPTION_EVENT_SOURCE:
- g_debug("PA_SUBSCRIPTION_EVENT_SOURCE of some description ???");
-
- if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
- {
- //TODO handle the remove event
- }
- else
- {
- pa_operation *o;
- if (!(o = pa_context_get_source_info_by_index(c, index, pulse_source_info_callback, userdata))) {
- g_warning("pa_context_get_source_info_by_index() failed");
- return;
- }
- pa_operation_unref(o);
- }
- break;
case PA_SUBSCRIPTION_EVENT_SERVER:
- g_debug("PA_SUBSCRIPTION_EVENT_SERVER change of some description ???");
+ g_debug("subscribed_events_callback - PA_SUBSCRIPTION_EVENT_SERVER change of some description ???");
pa_operation *o;
if(!(o = pa_context_get_server_info(c, pulse_server_info_callback, userdata)))
{
- g_warning("pa_context_get_server_info() failed");
+ g_warning("subscribed_events_callback - pa_context_get_server_info() failed");
return;
}
pa_operation_unref(o);
@@ -552,12 +578,8 @@ static void context_state_callback(pa_context *c, void *userdata) {
if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t)
(PA_SUBSCRIPTION_MASK_SINK|
- PA_SUBSCRIPTION_MASK_SOURCE|
PA_SUBSCRIPTION_MASK_SINK_INPUT|
- PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
- PA_SUBSCRIPTION_MASK_CLIENT|
- PA_SUBSCRIPTION_MASK_SERVER|
- PA_SUBSCRIPTION_MASK_CARD), NULL, NULL))) {
+ PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))) {
g_warning("pa_context_subscribe() failed");
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 12:08:58 +0000