aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure24
-rw-r--r--configure.ac8
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in20
-rw-r--r--src/dbus-menu-manager.c5
-rw-r--r--src/indicator-sound.c203
-rw-r--r--src/pulse-manager.c4
-rw-r--r--src/sound-service-dbus.c1
-rw-r--r--src/sound-service-marshal.c86
-rw-r--r--src/sound-service-marshal.h20
10 files changed, 117 insertions, 256 deletions
diff --git a/configure b/configure
index d46e3a3..0068fa0 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.1.3.
+# Generated by GNU Autoconf 2.65 for indicator-sound 0.1.3.1.
#
# 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.1.3'
-PACKAGE_STRING='indicator-sound 0.1.3'
+PACKAGE_VERSION='0.1.3.1'
+PACKAGE_STRING='indicator-sound 0.1.3.1'
PACKAGE_BUGREPORT='conor.curran@canonical.com'
PACKAGE_URL=''
@@ -1490,7 +1490,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.1.3 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.1.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1560,7 +1560,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-sound 0.1.3:";;
+ short | recursive ) echo "Configuration of indicator-sound 0.1.3.1:";;
esac
cat <<\_ACEOF
@@ -1683,7 +1683,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-sound configure 0.1.3
+indicator-sound configure 0.1.3.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2054,7 +2054,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.1.3, which was
+It was created by indicator-sound $as_me 0.1.3.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2867,7 +2867,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-sound
- VERSION=0.1.3
+ VERSION=0.1.3.1
cat >>confdefs.h <<_ACEOF
@@ -11970,11 +11970,11 @@ AM_BACKSLASH='\'
###########################
GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.5
DBUSMENUGTK_REQUIRED_VERSION=0.2.2
POLKIT_REQUIRED_VERSION=0.92
PULSE_AUDIO_REQUIRED_VERSION=0.9.19
-INDICATOR_DISPLAY_OBJECTS=0.1.2
+INDICATOR_DISPLAY_OBJECTS=0.1.4
@@ -13838,7 +13838,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.1.3, which was
+This file was extended by indicator-sound $as_me 0.1.3.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13904,7 +13904,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.1.3
+indicator-sound config.status 0.1.3.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 080303c..770245a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(indicator-sound, 0.1.3, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.1.3.1, conor.curran@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.1.3)
+AM_INIT_AUTOMAKE(indicator-sound, 0.1.3.1)
AM_MAINTAINER_MODE
@@ -26,11 +26,11 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
###########################
GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.5
DBUSMENUGTK_REQUIRED_VERSION=0.2.2
POLKIT_REQUIRED_VERSION=0.92
PULSE_AUDIO_REQUIRED_VERSION=0.9.19
-INDICATOR_DISPLAY_OBJECTS=0.1.2
+INDICATOR_DISPLAY_OBJECTS=0.1.4
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 73bb259..b7de930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,8 +43,6 @@ indicator_sound_service_SOURCES = \
sound-service-dbus.h \
sound-service-dbus.c \
sound-service-server.h \
- sound-service-marshal.c \
- sound-service-marshal.h \
slider-menu-item.h \
slider-menu-item.c
indicator_sound_service_CFLAGS = $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
diff --git a/src/Makefile.in b/src/Makefile.in
index 37b1e9c..7f2b8dc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -90,7 +90,6 @@ am_indicator_sound_service_OBJECTS = \
indicator_sound_service-dbus-menu-manager.$(OBJEXT) \
indicator_sound_service-pulse-manager.$(OBJEXT) \
indicator_sound_service-sound-service-dbus.$(OBJEXT) \
- indicator_sound_service-sound-service-marshal.$(OBJEXT) \
indicator_sound_service-slider-menu-item.$(OBJEXT)
indicator_sound_service_OBJECTS = \
$(am_indicator_sound_service_OBJECTS)
@@ -315,8 +314,6 @@ indicator_sound_service_SOURCES = \
sound-service-dbus.h \
sound-service-dbus.c \
sound-service-server.h \
- sound-service-marshal.c \
- sound-service-marshal.h \
slider-menu-item.h \
slider-menu-item.c
@@ -462,7 +459,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-pulse-manager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-slider-menu-item.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-sound-service-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-sound-service-marshal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-sound-service.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoundmenu_la-indicator-sound.Plo@am__quote@
@@ -562,22 +558,6 @@ indicator_sound_service-sound-service-dbus.obj: sound-service-dbus.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-sound-service-dbus.obj `if test -f 'sound-service-dbus.c'; then $(CYGPATH_W) 'sound-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/sound-service-dbus.c'; fi`
-indicator_sound_service-sound-service-marshal.o: sound-service-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-sound-service-marshal.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-sound-service-marshal.Tpo -c -o indicator_sound_service-sound-service-marshal.o `test -f 'sound-service-marshal.c' || echo '$(srcdir)/'`sound-service-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-sound-service-marshal.Tpo $(DEPDIR)/indicator_sound_service-sound-service-marshal.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sound-service-marshal.c' object='indicator_sound_service-sound-service-marshal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-sound-service-marshal.o `test -f 'sound-service-marshal.c' || echo '$(srcdir)/'`sound-service-marshal.c
-
-indicator_sound_service-sound-service-marshal.obj: sound-service-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-sound-service-marshal.obj -MD -MP -MF $(DEPDIR)/indicator_sound_service-sound-service-marshal.Tpo -c -o indicator_sound_service-sound-service-marshal.obj `if test -f 'sound-service-marshal.c'; then $(CYGPATH_W) 'sound-service-marshal.c'; else $(CYGPATH_W) '$(srcdir)/sound-service-marshal.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-sound-service-marshal.Tpo $(DEPDIR)/indicator_sound_service-sound-service-marshal.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sound-service-marshal.c' object='indicator_sound_service-sound-service-marshal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-sound-service-marshal.obj `if test -f 'sound-service-marshal.c'; then $(CYGPATH_W) 'sound-service-marshal.c'; else $(CYGPATH_W) '$(srcdir)/sound-service-marshal.c'; fi`
-
indicator_sound_service-slider-menu-item.o: slider-menu-item.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-slider-menu-item.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-slider-menu-item.Tpo -c -o indicator_sound_service-slider-menu-item.o `test -f 'slider-menu-item.c' || echo '$(srcdir)/'`slider-menu-item.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-slider-menu-item.Tpo $(DEPDIR)/indicator_sound_service-slider-menu-item.Po
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 64f7108..38ed727 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -154,11 +154,6 @@ static void refresh_menu()
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); */
-/* }*/
}
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index aecbe7a..aa87410 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -8,16 +8,16 @@ Authors:
Conor Curran <conor.curran@canonical.com>
Ted Gould <ted@canonical.com>
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
by the Free Software Foundation.
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <math.h>
@@ -40,7 +40,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "dbus-shared-names.h"
#include "sound-service-client.h"
#include "common-defs.h"
-#include "sound-service-marshal.h"
// GObject Boiler plate
#define INDICATOR_SOUND_TYPE (indicator_sound_get_type ())
@@ -94,7 +93,7 @@ static void slider_released(GtkWidget *widget, gpointer user_data);
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_volume_update(DBusGProxy * proxy, gdouble volume_percent, 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();
@@ -118,11 +117,10 @@ 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;
+static gboolean initial_mute ;
+static gboolean device_available;
+static gboolean slider_in_direct_use;
-#define DESIGN_TEAM_SIZE design_team_size
static GtkIconSize design_team_size;
static gint animation_id;
static GList * blocked_animation_list = NULL;
@@ -143,7 +141,7 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
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);
return;
@@ -153,10 +151,14 @@ 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);
- 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;
+ initial_mute = FALSE;
+ device_available = TRUE;
+ slider_in_direct_use = FALSE;
+
+ g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
return;
}
@@ -170,8 +172,12 @@ indicator_sound_dispose (GObject *object)
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);
+
+ if(blocked_animation_list != NULL){
+ 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;
}
@@ -193,7 +199,7 @@ static GtkImage *
get_icon (IndicatorObject * io)
{
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);
+ g_debug("At start-up attempting to set the image to %s", current_name);
speaker_image = indicator_image_helper(current_name);
gtk_widget_show(GTK_WIDGET(speaker_image));
return speaker_image;
@@ -205,15 +211,23 @@ get_icon (IndicatorObject * io)
static GtkMenu *
get_menu (IndicatorObject * io)
{
- DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_OBJECT);
- DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu);
+ DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_OBJECT);
+ DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu);
dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_SLIDER_MENUITEM_TYPE, new_slider_item);
// 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);
+ g_signal_connect(menu, "key-press-event", G_CALLBACK(key_press_cb), NULL);
return GTK_MENU(menu);
}
+static void
+slider_parent_changed (GtkWidget *widget,
+ gpointer user_data)
+{
+ gtk_widget_set_size_request (widget, 200, -1);
+ g_debug("slider parent changed");
+ //fetch_volume_percent_from_dbus();
+}
/**
new_slider_item:
@@ -221,39 +235,43 @@ Create a new dBusMenu Slider item.
**/
static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
{
- g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
- g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
-
+ g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
+ g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
+
volume_slider = ido_scale_menu_item_new_with_range ("Volume", initial_volume_percent, 0, 100, 0.5);
- g_object_set(volume_slider, "reverse-scroll-events", TRUE, NULL);
+ g_object_set(volume_slider, "reverse-scroll-events", TRUE, NULL);
+
+ g_signal_connect (volume_slider,
+ "notify::parent", G_CALLBACK (slider_parent_changed),
+ NULL);
GtkMenuItem *menu_volume_slider = GTK_MENU_ITEM(volume_slider);
- dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, menu_volume_slider, parent);
-
+ dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, menu_volume_slider, parent);
+
// register slider changes listening on the range
- GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
+ GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
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(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
- 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)));
+ 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);
+ 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)));
+ 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);
+ g_object_unref(secondary_gicon);
gtk_widget_set_sensitive(volume_slider, !initial_mute);
gtk_widget_show_all(volume_slider);
- return TRUE;
+ return TRUE;
}
static void
@@ -323,42 +341,31 @@ 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;
- }
+
+ GtkImage* temp_image = indicator_image_helper(muted_name);
+ GdkPixbuf* mute_buf = gtk_image_get_pixbuf(temp_image);
+
+ 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");
+ 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),
+ 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));
- }
+ }
}
@@ -416,15 +423,15 @@ void determine_state_from_volume(gdouble volume_percent)
}
else if(volume_percent == 0.0){
state = STATE_ZERO;
- }
- update_state(state);
+ }
+ update_state(state);
}
-
+
static void fetch_sink_availability_from_dbus()
{
GError * error = NULL;
- gboolean * available_input;
+ 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) {
@@ -436,6 +443,9 @@ static void fetch_sink_availability_from_dbus()
device_available = *available_input;
if (device_available == FALSE)
update_state(STATE_SINKS_NONE);
+ g_debug("NO DEVICE AVAILABLE");
+
+ 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);
@@ -444,7 +454,7 @@ static void fetch_sink_availability_from_dbus()
static void fetch_volume_percent_from_dbus()
{
GError * error = NULL;
- gdouble *volume_percent_input;
+ gdouble *volume_percent_input;
volume_percent_input = g_new0(gdouble, 1);
org_ayatana_indicator_sound_get_sink_volume(sound_dbus_proxy, volume_percent_input, &error);
if (error != NULL) {
@@ -462,7 +472,7 @@ static void fetch_volume_percent_from_dbus()
static void fetch_mute_value_from_dbus()
{
GError * error = NULL;
- gboolean *mute_input;
+ gboolean *mute_input;
mute_input = g_new0(gboolean, 1);
org_ayatana_indicator_sound_get_sink_mute(sound_dbus_proxy, mute_input, &error);
if (error != NULL) {
@@ -481,25 +491,24 @@ static void fetch_mute_value_from_dbus()
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 !
+ if (block_value == 1 && animation_id == 0 && blocked_animation_list != NULL) {
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);
+ 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;
+ blocked_iter = blocked_iter->next;
return TRUE;
}
else{
@@ -511,14 +520,14 @@ static gboolean fade_back_to_mute_image()
static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
{
- if (slider_in_direct_use != TRUE){
+ if (slider_in_direct_use == FALSE){
GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
- GtkRange *range = (GtkRange*)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);
+ gtk_range_set_value(range, volume_percent);
determine_state_from_volume(volume_percent);
}
}
@@ -527,7 +536,7 @@ static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value
{
//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 && device_available != FALSE)
+ if(mute_value == TRUE && device_available == TRUE)
{
update_state(STATE_MUTED);
}
@@ -558,13 +567,13 @@ This callback will get triggered irregardless of whether its a user change or a
**/
static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data)
{
- gdouble current_value = CLAMP(gtk_range_get_value(range), 0, 100);
+ gdouble current_value = CLAMP(gtk_range_get_value(range), 0, 100);
DbusmenuMenuitem *item = (DbusmenuMenuitem*)user_data;
GValue value = {0};
g_value_init(&value, G_TYPE_DOUBLE);
g_value_set_double(&value, current_value);
g_debug("Value changed callback - = %f", current_value);
- dbusmenu_menuitem_handle_event (item, "slider_change", &value, 0);
+ dbusmenu_menuitem_handle_event (item, "slider_change", &value, 0);
// This is not ideal in that the icon ui will update on ui actions and not on actual service feedback.
// but necessary for now as the server does not send volume update information if the source of change was this ui.
determine_state_from_volume(current_value);
@@ -585,20 +594,6 @@ static void slider_released (GtkWidget *widget, gpointer user_data)
}
-/**
-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:
@@ -608,8 +603,8 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat
gboolean digested = FALSE;
GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
- GtkRange* range = (GtkRange*)slider;
- gdouble current_value = gtk_range_get_value(range);
+ GtkRange* range = (GtkRange*)slider;
+ gdouble current_value = gtk_range_get_value(range);
gdouble new_value = current_value;
const gdouble five_percent = 5;
GtkWidget *menuitem;
@@ -638,26 +633,26 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat
}
else
{
- new_value = current_value - five_percent;
+ new_value = current_value - five_percent;
}
break;
case GDK_plus:
digested = TRUE;
- new_value = current_value + five_percent;
+ new_value = current_value + five_percent;
break;
case GDK_minus:
digested = TRUE;
- new_value = current_value - five_percent;
+ new_value = current_value - five_percent;
break;
default:
break;
- }
-
+ }
+
new_value = CLAMP(new_value, 0, 100);
if(new_value != current_value && current_state != STATE_MUTED)
{
- g_debug("Attempting to set the range from the key listener to %f", new_value);
- gtk_range_set_value(range, new_value);
+ g_debug("Attempting to set the range from the key listener to %f", new_value);
+ gtk_range_set_value(range, new_value);
}
}
return digested;
diff --git a/src/pulse-manager.c b/src/pulse-manager.c
index 40add4e..e1634a9 100644
--- a/src/pulse-manager.c
+++ b/src/pulse-manager.c
@@ -67,8 +67,8 @@ void establish_pulse_activities(SoundServiceDbus *service)
// Establish event callback registration
pa_context_set_state_callback(pulse_context, context_state_callback, NULL);
- // BUILD MENU ANYWHO - it will be updated
- dbus_menu_manager_update_pa_state(FALSE, FALSE, FALSE, 0);
+ // Broadcast init state (assume we have a device - if not the signals will handle it)
+ dbus_menu_manager_update_pa_state(FALSE, TRUE, FALSE, 0);
pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL);
}
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 1cc5f0d..260e064 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -26,7 +26,6 @@
#include "dbus-shared-names.h"
#include "sound-service-dbus.h"
#include "common-defs.h"
-#include "sound-service-marshal.h"
#include "pulse-manager.h"
// DBUS methods
diff --git a/src/sound-service-marshal.c b/src/sound-service-marshal.c
deleted file mode 100644
index d62eab9..0000000
--- a/src/sound-service-marshal.c
+++ /dev/null
@@ -1,86 +0,0 @@
-
-#include <glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* VOID:INT,BOOLEAN (./sound-service.list:1) */
-void
-_sound_service_marshal_VOID__INT_BOOLEAN (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__INT_BOOLEAN) (gpointer data1,
- gint arg_1,
- gboolean arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__INT_BOOLEAN callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_boolean (param_values + 2),
- data2);
-}
-
diff --git a/src/sound-service-marshal.h b/src/sound-service-marshal.h
deleted file mode 100644
index c9557f8..0000000
--- a/src/sound-service-marshal.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#ifndef ___sound_service_marshal_MARSHAL_H__
-#define ___sound_service_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:INT,BOOLEAN (./sound-service.list:1) */
-extern void _sound_service_marshal_VOID__INT_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-G_END_DECLS
-
-#endif /* ___sound_service_marshal_MARSHAL_H__ */
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 15:48:02 +0000