From 9d0d8eaa8b9c021fbb45368f96489f520aab86e7 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 4 Mar 2010 21:23:40 +1100 Subject: Put mocking core in place for Connor. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 40a8fdd..8ddcff5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,8 +59,8 @@ indicator_sound_service_SOURCES = \ sound-service-marshal.h \ slider-menu-item.h \ slider-menu-item.c -indicator_sound_service_CFLAGS = $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror -indicator_sound_service_LDADD = $(SOUNDSERVICE_LIBS) $(GCONF_LIBS) +indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror +indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS) sound-service-server.h: $(srcdir)/sound-service.xml dbus-binding-tool \ -- cgit v1.2.3 From 364d9362165f9f0d468eadc269c6421f4bf929e3 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 8 Mar 2010 20:40:32 +0000 Subject: new pulse manager test beginnings --- src/pulse-manager.c | 3 ++- tests/mockpulse.c | 1 + tests/test-pulse-manager.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/test-pulse-manager.c (limited to 'src') diff --git a/src/pulse-manager.c b/src/pulse-manager.c index 4594d2f..04f842a 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -462,7 +462,8 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event 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 + } + else { pa_operation_unref(pa_context_get_sink_info_by_index(c, index, update_sink_info, userdata)); } diff --git a/tests/mockpulse.c b/tests/mockpulse.c index 297780b..a931e1d 100644 --- a/tests/mockpulse.c +++ b/tests/mockpulse.c @@ -26,3 +26,4 @@ pa_glib_mainloop_new(GMainContext *c) return NULL; } + diff --git a/tests/test-pulse-manager.c b/tests/test-pulse-manager.c new file mode 100644 index 0000000..6a9c55b --- /dev/null +++ b/tests/test-pulse-manager.c @@ -0,0 +1,29 @@ +#include "defintions.h" +// I know this is not nice but I would rather not make everything public ? +#include "pulse-manager.c" + +pa_context* context; + +static void pa_context_exit() +{ + pa_context_set_state_callback(context, context_state_callback, NULL); + // => call context_state_callback(context, NULL); + // pa_context_get_state needs to be mocked to return the right FAIL flag. + // 1. test to make sure relevant variables are tidied up + // 2. then using the same pa_context_get_state we could ensure the manager is attempting to reconnect tp PA. +} + +static void test_sink_insert() +{ + sink_info *value; + value = g_new0(sink_info, 1); + value->index = 8; + value->name = "mock_sink";" + value->description = "mock description" + value->mute = FALSE + value->volume = 30000; // almost full + // update_sink_info is a static method in pulse-manager.c ? + pa_context_get_sink_info_by_index(context, value->index, update_sink_info); + // the mockinkg lib should then return this mocked up sink_info to the method update_sink_info which tests could be wrote against to make sure everthing is populated correctly. +} + -- cgit v1.2.3 From c20b69cf13582bf738c0dc3a76b8065fbd32665b Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 16 Mar 2010 16:31:32 -0500 Subject: Implement scroll method. --- src/indicator-sound.c | 56 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 3b2b426..6dcc56b 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -7,6 +7,7 @@ Copyright 2010 Canonical Ltd. Authors: Conor Curran Ted Gould + Cody Russell 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 @@ -60,6 +61,7 @@ struct _IndicatorSoundClass { //GObject instance struct struct _IndicatorSound { IndicatorObject parent; + GtkWidget *slider; IndicatorServiceManager *service; }; // GObject Boiler plate @@ -77,7 +79,8 @@ G_DEFINE_TYPE (IndicatorSound, indicator_sound, INDICATOR_OBJECT_TYPE); //GTK+ items static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); -static GtkMenu * get_menu (IndicatorObject * io); +static GtkMenu * get_menu (IndicatorObject * io); +static void scroll (IndicatorObject*io, gint delta, IndicatorScrollDirection direction); //Slider related static GtkWidget *volume_slider = NULL; @@ -140,9 +143,10 @@ indicator_sound_class_init (IndicatorSoundClass *klass) IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; - io_class->get_menu = get_menu; + io_class->get_menu = get_menu; + io_class->scroll = scroll; - design_team_size = gtk_icon_size_register("design-team-size", 22, 22); + design_team_size = gtk_icon_size_register("design-team-size", 22, 22); return; } @@ -172,7 +176,7 @@ indicator_sound_dispose (GObject *object) self->service = NULL; } g_hash_table_destroy(volume_states); - + if(blocked_animation_list != NULL){ g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL); g_list_free(blocked_animation_list); @@ -211,8 +215,13 @@ get_icon (IndicatorObject * io) static GtkMenu * get_menu (IndicatorObject * io) { + g_print ("get_menu(): %s\n", G_OBJECT_TYPE_NAME (io)); + DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_OBJECT); - DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu); + DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu); + + g_object_set_data (G_OBJECT (client), + "indicator", io); 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. @@ -235,9 +244,15 @@ Create a new dBusMenu Slider item. **/ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { + IndicatorObject *io = NULL; + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); + io = g_object_get_data (G_OBJECT (client), "indicator"); + + g_print ("new_slider_item(): %s\n", G_OBJECT_TYPE_NAME (io)); + 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); @@ -252,6 +267,8 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p // register slider changes listening on the range GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider); + INDICATOR_SOUND (io)->slider = 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); @@ -343,18 +360,18 @@ 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)); - - GtkImage* temp_image = indicator_image_helper(muted_name); - GdkPixbuf* mute_buf = gtk_image_get_pixbuf(temp_image); - temp_image = indicator_image_helper(blocked_name); + 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; + return; } // sample 22 snapshots - range : 0-256 @@ -495,7 +512,7 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo 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() @@ -655,3 +672,20 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat } +static void +scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction) +{ + IndicatorSound *sound = INDICATOR_SOUND (io); + GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider)); + gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider)); + + if (direction == INDICATOR_OBJECT_SCROLL_UP) + value += adj->step_increment; + else + value -= adj->step_increment; + + gtk_range_set_value (GTK_RANGE (sound->slider), + value); + + g_print ("scroll %d!!\n", (gint)direction); +} -- cgit v1.2.3 From 6e407358a9f48bcf24c6224b35cd2845fdf56004 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 17 Mar 2010 01:23:33 -0500 Subject: Remove some debugging output. --- src/indicator-sound.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src') diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 6dcc56b..e9a8e73 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -215,8 +215,6 @@ get_icon (IndicatorObject * io) static GtkMenu * get_menu (IndicatorObject * io) { - g_print ("get_menu(): %s\n", G_OBJECT_TYPE_NAME (io)); - DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_OBJECT); DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu); @@ -251,8 +249,6 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p io = g_object_get_data (G_OBJECT (client), "indicator"); - g_print ("new_slider_item(): %s\n", G_OBJECT_TYPE_NAME (io)); - 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); @@ -686,6 +682,4 @@ scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction) gtk_range_set_value (GTK_RANGE (sound->slider), value); - - g_print ("scroll %d!!\n", (gint)direction); } -- cgit v1.2.3 From c2be40c8f9ce0d6c678c04faa747ba50a22c6159 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 18 Mar 2010 18:06:12 +0000 Subject: scrolling now should move at 1% as opposed to 0.5% increments, cannot now scroll on panel icon when muted or no device available --- src/Makefile.am | 2 +- src/indicator-sound.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index b7de930..062d993 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ libsoundmenu_la_SOURCES = \ dbus-shared-names.h \ sound-service-client.h -libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror +libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\" libsoundmenu_la_LIBADD = $(APPLET_LIBS) libsoundmenu_la_LDFLAGS = -module -avoid-version diff --git a/src/indicator-sound.c b/src/indicator-sound.c index e9a8e73..a1a531a 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -249,7 +249,7 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p io = g_object_get_data (G_OBJECT (client), "indicator"); - volume_slider = ido_scale_menu_item_new_with_range ("Volume", initial_volume_percent, 0, 100, 0.5); + volume_slider = ido_scale_menu_item_new_with_range ("Volume", initial_volume_percent, 0, 100, 1); g_object_set(volume_slider, "reverse-scroll-events", TRUE, NULL); g_signal_connect (volume_slider, @@ -671,15 +671,18 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat static void scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction) { - IndicatorSound *sound = INDICATOR_SOUND (io); - GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider)); - gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider)); + if (device_available == FALSE || current_state == STATE_MUTED) + return; + + IndicatorSound *sound = INDICATOR_SOUND (io); + GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider)); + gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider)); - if (direction == INDICATOR_OBJECT_SCROLL_UP) + if (direction == INDICATOR_OBJECT_SCROLL_UP) value += adj->step_increment; - else + else value -= adj->step_increment; - gtk_range_set_value (GTK_RANGE (sound->slider), + gtk_range_set_value (GTK_RANGE (sound->slider), value); } -- cgit v1.2.3 From f02377f77f88106ba1c26cb184a14f33cd1a89fe Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 22 Mar 2010 17:32:57 +0000 Subject: first pulse manager test wrote ... finally --- src/pulse-manager.c | 23 ++++----- src/pulse-manager.h | 3 -- tests/mockpulse.c | 6 +++ tests/test-pulse-manager.c | 118 +++++++++++++++++++++++++++++++-------------- 4 files changed, 101 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/pulse-manager.c b/src/pulse-manager.c index 2f86a90..a95c887 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -72,6 +72,11 @@ void establish_pulse_activities(SoundServiceDbus *service) pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL); } +pa_context* get_context() +{ + return pulse_context; +} + void close_pulse_activites() { if (pulse_context != NULL){ @@ -98,7 +103,11 @@ static void reconnect_to_pulse() pa_context_unref(pulse_context); pulse_context = NULL; } - g_hash_table_destroy(sink_hash); + + if(sink_hash != NULL){ + g_hash_table_destroy(sink_hash); + sink_hash = NULL; + } // reconnect pulse_context = pa_context_new(pa_glib_mainloop_get_api(pa_main_loop), "ayatana.indicator.sound"); @@ -115,7 +124,6 @@ static void destroy_sink_info(void *value) sink_info *sink = (sink_info*)value; g_free(sink->name); g_free(sink->description); - g_free(sink->icon_name); g_free(sink); } @@ -289,11 +297,9 @@ static void pulse_sink_info_callback(pa_context *c, const pa_sink_info *sink, in g_debug("About to add an item to our hash"); sink_info *value; value = g_new0(sink_info, 1); - value->index = value->device_index = sink->index; + value->index = sink->index; value->name = g_strdup(sink->name); value->description = g_strdup(sink->description); - value->icon_name = g_strdup(pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_ICON_NAME)); - value->active_port = (sink->active_port != NULL); value->mute = !!sink->mute; value->volume = sink->volume; value->base_volume = sink->base_volume; @@ -363,8 +369,6 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v sink_info *s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(info->index)); s->name = g_strdup(info->name); s->description = g_strdup(info->description); - s->icon_name = g_strdup(pa_proplist_gets(info->proplist, PA_PROP_DEVICE_ICON_NAME)); - s->active_port = (info->active_port != NULL); gboolean mute_changed = s->mute != !!info->mute; s->mute = !!info->mute; gboolean volume_changed = (pa_cvolume_equal(&info->volume, &s->volume) == 0); @@ -398,14 +402,11 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v } else { - sink_info *value; value = g_new0(sink_info, 1); - value->index = value->device_index = info->index; + value->index = info->index; value->name = g_strdup(info->name); value->description = g_strdup(info->description); - value->icon_name = g_strdup(pa_proplist_gets(info->proplist, PA_PROP_DEVICE_ICON_NAME)); - value->active_port = (info->active_port != NULL); value->mute = !!info->mute; value->volume = info->volume; value->base_volume = info->base_volume; diff --git a/src/pulse-manager.h b/src/pulse-manager.h index e1777fb..60a7ad3 100644 --- a/src/pulse-manager.h +++ b/src/pulse-manager.h @@ -31,13 +31,10 @@ with this program. If not, see . typedef struct { gchar* name; gchar* description; - gchar* icon_name; gint index; - gint device_index; pa_cvolume volume; pa_channel_map channel_map; gboolean mute; - gboolean active_port; pa_volume_t base_volume; } sink_info; diff --git a/tests/mockpulse.c b/tests/mockpulse.c index a41de30..b868e07 100644 --- a/tests/mockpulse.c +++ b/tests/mockpulse.c @@ -73,6 +73,12 @@ struct pa_operation { int refcount; }; + +/*void pa_context_connect(pa_context* c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api)*/ +/*{*/ +/* set_pa_context_get_state_result(c, PA_CONTEXT_CONNECTING);*/ +/*}*/ + /* Can be made into a list if we need multiple callbacks */ static pa_sink_info *next_sink_info; diff --git a/tests/test-pulse-manager.c b/tests/test-pulse-manager.c index 169acbd..5fff7b9 100644 --- a/tests/test-pulse-manager.c +++ b/tests/test-pulse-manager.c @@ -18,53 +18,101 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* we test static functions */ +#include + +/* we intend to test static functions which are not to be exported */ #include "../src/pulse-manager.c" #include "mockpulse.h" +static pa_sink_info* mock_sink_info(); -static void test_pa_context_exit() -{ - pa_context* context = pa_context_new(NULL, "foo"); - pa_context_set_state_callback(context, context_state_callback, NULL); - // => call context_state_callback(context, NULL); - // pa_context_get_state is mocked to return the right FAIL flag. - set_pa_context_get_state_result(context, PA_CONTEXT_FAILED); - context_state_callback(context, NULL); - // 1. test to make sure relevant variables are tidied up - // XXX: Conor to do. - // 2. then using the same pa_context_get_state we could ensure the manager - // is attempting to reconnect to PA. - pa_context_unref(context); -} -static void test_sink_insert() + +/*static void test_pa_context_exit()*/ +/*{*/ +/* pa_context* context = pa_context_new(NULL, "foo");*/ + +/* pa_context_set_state_callback(context, context_state_callback, NULL);*/ +/* // => call context_state_callback(context, NULL);*/ +/* // pa_context_get_state is mocked to return the right FAIL flag.*/ +/* set_pa_context_get_state_result(context, PA_CONTEXT_FAILED);*/ +/* context_state_callback(context, NULL);*/ +/* // Test to ensure context is tidied after failure.*/ +/* g_assert(context == NULL);*/ +/* // 2. then using the same pa_context_get_state we could ensure the manager*/ +/* // is attempting to reconnect to PA. */ +/* //g_assert(PA_CONTEXT_CONNECTING == pa_context_get_state(get_context()));*/ +/* //pa_context_unref(context);*/ +/*}*/ + +static void test_sink_update { - sink_info *sink_details; - pa_context* context = pa_context_new(NULL, "foo"); - sink_details = g_new0(sink_info, 1); - sink_details->index = 8; - sink_details->name = "mock_sink"; - sink_details->description = "mock description"; - sink_details->mute = FALSE; - pa_cvolume volume; // nearly full volume: - pa_cvolume_set(&volume, 1, 30000); - sink_details->volume = volume; - pa_sink_info *expected = g_new0(pa_sink_info, 1); - expected->name = g_strdup("foo"); - expected->index = 8; - expected->description = g_strdup("more details"); +/* pa_sink_info *expected = g_new0(pa_sink_info, 1);*/ +/* expected->name = g_strdup("foo");*/ +/* expected->index = 8;*/ +/* expected->description = g_strdup("more details");*/ // fill it out here more. // hook into our pa_context_get_sink_info_by_index to pass exppected to // update_sink_info - set_pa_context_get_sink_info(expected); + // set_pa_context_get_sink_info(expected); // update_sink_info is a static method in pulse-manager.c ? - pa_context_get_sink_info_by_index(context, sink_details->index, update_sink_info, NULL); +/* pa_context_get_sink_info_by_index(context, sink_details->index, update_sink_info, NULL);*/ // the mockinkg lib should then return this mocked up sink_info to the // method update_sink_info which tests could be wrote against to make sure // everthing is populated correctly. +/* pa_context_unref(context);*/ +/* g_free(expected);*/ + + +} + +static void test_sink_cache_population() +{ + pa_context* context = pa_context_new(NULL, "foo"); + + pa_sink_info* mock_sink = mock_sink_info(); + + set_pa_context_get_sink_info(mock_sink); + + sink_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_sink_info); + + pa_context_get_sink_info_by_index(context, mock_sink->index, pulse_sink_info_callback, NULL); + + GList *keys = g_hash_table_get_keys(sink_hash); + gint position = g_list_index(keys, GINT_TO_POINTER(mock_sink->index)); + + g_assert(position >= 0); + + sink_info* stored_sink_info = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(mock_sink->index)); + + g_assert(g_ascii_strncasecmp(mock_sink->name, stored_sink_info->name, strlen(mock_sink->name)) == 0); + g_assert(g_ascii_strncasecmp(mock_sink->description, stored_sink_info->description, strlen(mock_sink->description)) == 0); + g_assert(!!mock_sink->mute == stored_sink_info->mute); + g_assert(mock_sink->index == stored_sink_info->index); + g_assert(pa_cvolume_equal(&mock_sink->volume, &stored_sink_info->volume)); + + g_free(mock_sink); + g_hash_table_destroy(sink_hash); pa_context_unref(context); - g_free(expected); +} + +/** +Helper Methods +**/ + +static pa_sink_info* +mock_sink_info() +{ + pa_sink_info* mock_sink; + mock_sink = g_new0(pa_sink_info, 1); + mock_sink->index = 8; + mock_sink->name = g_strdup("mock_sink"); + mock_sink->description = g_strdup("mock description"); + mock_sink->mute = 0; + pa_cvolume volume; // nearly full volume: + pa_cvolume_set(&volume, 1, 30000); + mock_sink->volume = volume; + return mock_sink; } @@ -73,8 +121,8 @@ gint main (gint argc, gchar * argv[]) g_type_init(); g_test_init(&argc, &argv, NULL); - g_test_add_func("/indicator-sound/pulse-manager/sink-insert", test_sink_insert); - g_test_add_func("/indicator-sound/pulse-manager/pa-context-exit", test_pa_context_exit); + g_test_add_func("/indicator-sound/pulse-manager/sink-cache-population", test_sink_cache_population); + //g_test_add_func("/indicator-sound/pulse-manager/pa-context-exit", test_pa_context_exit); return g_test_run (); } -- cgit v1.2.3 From 017109c083b207d4a2bfb1d7d17e09aafc123b55 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 23 Mar 2010 16:05:35 +0000 Subject: dbus methods are now tested --- src/sound-service-dbus.c | 2 +- tests/Makefile.am | 75 +++++++++++++----------- tests/test-defines.h | 5 +- tests/test-indicator-sound-dbus-client.c | 99 ++++++++++++++++++++------------ tests/test-indicator-sound-dbus-server.c | 10 +++- 5 files changed, 114 insertions(+), 77 deletions(-) (limited to 'src') diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index 260e064..5c6c487 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -140,7 +140,7 @@ sound_service_dbus_init (SoundServiceDbus *self) } /* register the service on it */ dbus_g_connection_register_g_object(priv->connection, - "/org/ayatana/indicator/sound/service", + INDICATOR_SOUND_SERVICE_DBUS_OBJECT, G_OBJECT(self)); } diff --git a/tests/Makefile.am b/tests/Makefile.am index a0562a4..bc67c30 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,8 @@ check_PROGRAMS = \ - test-indicator-sound -# test-indicator-sound-dbus-client \ -# test-indicator-sound-dbus-server + test-indicator-sound \ + test-pulse-manager \ + test-indicator-sound-dbus-client \ + test-indicator-sound-dbus-server TESTS = \ test-indicator-sound \ @@ -10,8 +11,8 @@ TESTS = \ DISTCLEANFILES = $(TESTS) noinst_LTLIBRARIES = libmockpulse.la -libmockpulse_la_SOURCES = mockpulse.c mockpulse.h -libmockpulse_la_CFLAGS = $(PULSEAUDIO_CFLAGS) +libmockpulse_la_SOURCES = mockpulse.c mockpulse.h +libmockpulse_la_CFLAGS = $(PULSEAUDIO_CFLAGS) ######################################### @@ -34,6 +35,33 @@ test_indicator_sound_LDADD = \ $(APPLET_LIBS) +######################################### +## test-pulse-manager +######################################### + +check_PROGRAMS += test-pulse-manager + +test_pulse_manager_SOURCES = \ + test-pulse-manager.c \ + $(top_builddir)/src/dbus-menu-manager.c \ + $(top_builddir)/src/sound-service-dbus.c \ + $(top_builddir)/src/slider-menu-item.c + +test_pulse_manager_CFLAGS = \ + $(PULSEAUDIO_CFLAGS) \ + $(SOUNDSERVICE_CFLAGS) \ + $(GCONF_CFLAGS) \ + -Wall -Werror \ + -I$(srcdir) \ + -I$(SOUNDSERVICE_CFLAGS) + +test_pulse_manager_LDADD = \ + libmockpulse.la \ + $(PULSEAUDIO_LIBS) \ + $(SOUNDSERVICE_LIBS) \ + $(GCONF_LIBS) \ + $(APPLET_LIBS) + ######################################### ## test-indicator-sound-dbus-client ######################################### @@ -72,32 +100,6 @@ test_indicator_sound_dbus_server_LDADD = \ $(SOUNDSERVICE_LIBS) \ $(PULSEAUDIO_LIBS) -######################################### -## test-pulse-manager -######################################### - -check_PROGRAMS += test-pulse-manager - -test_pulse_manager_SOURCES = \ - test-pulse-manager.c \ - $(top_builddir)/src/dbus-menu-manager.c \ - $(top_builddir)/src/sound-service-dbus.c \ - $(top_builddir)/src/slider-menu-item.c - -test_pulse_manager_CFLAGS = \ - $(PULSEAUDIO_CFLAGS) \ - $(SOUNDSERVICE_CFLAGS) \ - $(GCONF_CFLAGS) \ - -Wall -Werror \ - -I$(srcdir) \ - -I$(SOUNDSERVICE_CFLAGS) - -test_pulse_manager_LDADD = \ - libmockpulse.la \ - $(PULSEAUDIO_LIBS) \ - $(SOUNDSERVICE_LIBS) \ - $(GCONF_LIBS) \ - $(APPLET_LIBS) ######################################### ## Actual tests @@ -116,7 +118,14 @@ indicator-sound-tests-gtester: test-indicator-sound Makefile.am @echo gtester -k --verbose -o=indicator-sound-check-results.xml ./test-indicator-sound >> $@ @chmod +x $@ - TESTS += indicator-sound-tests-gtester +TESTS += indicator-sound-tests-gtester + +pulse-manager-tests-gtester: test-pulse-manager Makefile.am + @echo "#!/bin/sh" > $@ + @echo gtester -k --verbose -o=pulse-manager-check-results.xml ./test-pulse-manager >> $@ + @chmod +x $@ + +TESTS += pulse-manager-tests-gtester DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester @@ -124,7 +133,7 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.c test-indicator-sound-dbus: test-indicator-sound-dbus-client test-indicator-sound-dbus-server Makefile.am @echo "#!/bin/sh" > test-indicator-sound-dbus - @echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-client --task-name Client --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus + @echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus --task ./test-indicator-sound-dbus-client --task-name Client @chmod +x test-indicator-sound-dbus TESTS += test-indicator-sound-dbus diff --git a/tests/test-defines.h b/tests/test-defines.h index 68064fc..214274e 100644 --- a/tests/test-defines.h +++ b/tests/test-defines.h @@ -20,5 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define TEST_MUTE FALSE - +#define TEST_MUTE_VALUE TRUE +#define TEST_VOLUME_VALUE 77.77777 +#define TEST_AVAILABLE_VALUE TRUE diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c index 08ce93e..1c23dc5 100644 --- a/tests/test-indicator-sound-dbus-client.c +++ b/tests/test-indicator-sound-dbus-client.c @@ -26,39 +26,68 @@ with this program. If not, see . #include #include "../src/dbus-shared-names.h" #include "test-defines.h" +#include "../src/sound-service-client.h" static GMainLoop * mainloop = NULL; -static gboolean passed = TRUE; +static DBusGProxy * proxy= NULL; static void -fetch_mute_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +test_fetch_mute(DBusGProxy * proxy) { - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting mute failed: %s", error->message); + GError * error = NULL; + gboolean *fetched_mute_value; + fetched_mute_value = g_new0(gboolean, 1); + org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error); + if (error != NULL) { + g_warning("test-indicator-sound-dbus-client::test_fetch_mute - Unable to fetch mute: %s", error->message); g_error_free(error); - passed = FALSE; - return; + g_free(fetched_mute_value); + return; } + g_assert(TEST_MUTE_VALUE == *fetched_mute_value); + g_free(fetched_mute_value); +} - if (TEST_MUTE != g_value_get_boolean(&value)) { - g_debug("Mute vale Returned: FAILED"); - passed = FALSE; - } else { - g_debug("Property ID Returned: PASSED"); +static void +test_fetch_volume(DBusGProxy * proxy) +{ + GError * error = NULL; + gdouble *volume_percent_input; + volume_percent_input = g_new0(gdouble, 1); + org_ayatana_indicator_sound_get_sink_volume(proxy, volume_percent_input, &error); + if (error != NULL) { + g_warning("test-indicator-sound-dbus-client::test_fetch_volume - Unable to fetch VOLUME: %s", error->message); + g_error_free(error); + g_free(volume_percent_input); + return; } - return; + g_assert(TEST_VOLUME_VALUE == *volume_percent_input); + g_free(volume_percent_input); +} + +static void +test_fetch_availability(DBusGProxy * proxy) +{ + GError * error = NULL; + gboolean * available_input; + available_input = g_new0(gboolean, 1); + org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error); + if (error != NULL) { + g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message); + g_error_free(error); + g_free(available_input); + return; + } + g_assert(TEST_AVAILABLE_VALUE == *available_input); + g_free(available_input); } gboolean kill_func (gpointer userdata) { + g_free(proxy); g_main_loop_quit(mainloop); - g_warning("Forced to Kill"); - passed = FALSE; return FALSE; } @@ -66,6 +95,7 @@ gint main (gint argc, gchar * argv[]) { g_type_init(); + g_test_init(&argc, &argv, NULL); g_usleep(500000); @@ -76,37 +106,30 @@ main (gint argc, gchar * argv[]) return 1; } - DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, - INDICATOR_SOUND_DBUS_NAME, - INDICATOR_SOUND_SERVICE_DBUS_OBJECT, - INDICATOR_SOUND_SERVICE_DBUS_INTERFACE, - &error); -/* ":1.0",*/ -/* "/need/a/path",*/ -/* DBUS_INTERFACE_PROPERTIES,*/ -/* &error);*/ + DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus, + ":1.0", + INDICATOR_SOUND_SERVICE_DBUS_OBJECT, + INDICATOR_SOUND_SERVICE_DBUS_INTERFACE, + &error); if (error != NULL) { g_error("Unable to get property proxy: %s", error->message); return 1; } - dbus_g_proxy_begin_call (props, - "GetSinkMute", - fetch_mute_cb, - NULL, NULL, - G_TYPE_INVALID); +/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-mute", test_fetch_mute);*/ +/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-volume", test_fetch_volume);*/ +/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-availability", test_fetch_availability);*/ +/* g_test_queue_free(proxy);*/ +/* return g_test_run();*/ + + test_fetch_mute(proxy); + test_fetch_volume(proxy); + test_fetch_availability(proxy); g_timeout_add_seconds(2, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); - if (passed) { - g_debug("Quiting"); - return 0; - } else { - g_debug("Quiting as we're a failure"); - return 1; - } return 0; } diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c index 21d7dfe..6912dc4 100644 --- a/tests/test-indicator-sound-dbus-server.c +++ b/tests/test-indicator-sound-dbus-server.c @@ -43,13 +43,17 @@ gint main (gint argc, gchar * argv[]) { g_type_init(); - g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); + + //g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL); // Set the mute value - sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE); - g_timeout_add_seconds(2, kill_func, NULL); + sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE); + sound_service_dbus_update_sink_volume(dbus_interface, TEST_VOLUME_VALUE); + sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE); + + g_timeout_add_seconds(4, kill_func, NULL); // Run the loop mainloop = g_main_loop_new(NULL, FALSE); -- cgit v1.2.3 From 90ccbff1e4bc50d20fbba937cc6d3d8d32e27c0c Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 25 Mar 2010 10:35:30 +0000 Subject: at start up assume there is no availability before PA starts up --- src/pulse-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/pulse-manager.c b/src/pulse-manager.c index c6fc6ac..d4c28da 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -68,7 +68,7 @@ void establish_pulse_activities(SoundServiceDbus *service) // Establish event callback registration pa_context_set_state_callback(pulse_context, context_state_callback, NULL); // 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); + dbus_menu_manager_update_pa_state(FALSE, FALSE, FALSE, 0); pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL); } -- cgit v1.2.3 From 1890c9ae5a5d433bed59938d5b726e40e90d9645 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 25 Mar 2010 14:52:24 +0000 Subject: whitespace tidy up --- src/dbus-menu-manager.c | 1 - src/sound-service.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c index 1628a59..e084bb1 100644 --- a/src/dbus-menu-manager.c +++ b/src/dbus-menu-manager.c @@ -157,7 +157,6 @@ static void refresh_menu() } - /** idle_routine: Something for glip mainloop to do when idle diff --git a/src/sound-service.c b/src/sound-service.c index 403b2b0..64ff69e 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -44,8 +44,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } -- cgit v1.2.3 From d4f0b5072f4464aeb6fce4c2f2bc4c70b1287ba6 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 26 Mar 2010 13:56:46 +0000 Subject: handle event should now be safer --- src/slider-menu-item.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c index a14f4f9..cb72524 100644 --- a/src/slider-menu-item.c +++ b/src/slider-menu-item.c @@ -77,12 +77,14 @@ slider_menu_item_finalize (GObject *object) } - static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp) { g_debug("in the handle event method of slider_menu_item"); - set_sink_volume((gdouble)g_value_get_double(value)); + gdouble volume_input = 0; + volume_input = g_value_get_double(value); + if(value != NULL) + set_sink_volume(volume_input); } -- cgit v1.2.3 From a528e1eaebbde1de5a5af67c169c7d8d3df0bd83 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 26 Mar 2010 17:16:37 +0000 Subject: white space tidy --- src/sound-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/sound-service.c b/src/sound-service.c index 0b5320a..d70971e 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -44,8 +44,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } -- cgit v1.2.3 From af1d4de548185ceb1bdc8c3f1734c315cbed601c Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 29 Mar 2010 18:18:43 +0100 Subject: adding and removing sink code safer to avoid reproted random segfault --- src/pulse-manager.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/pulse-manager.c b/src/pulse-manager.c index d4c28da..2ba6856 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -67,7 +67,6 @@ void establish_pulse_activities(SoundServiceDbus *service) // Establish event callback registration pa_context_set_state_callback(pulse_context, context_state_callback, NULL); - // Broadcast init state (assume we have a device - if not the signals will handle it) dbus_menu_manager_update_pa_state(FALSE, FALSE, FALSE, 0); pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL); } @@ -359,9 +358,14 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v g_warning("Sink INPUT info callback failure"); return; } - + gint position = -1; GList *keys = g_hash_table_get_keys(sink_hash); - gint position = g_list_index(keys, GINT_TO_POINTER(info->index)); + + if(info == NULL) + return; + + position = g_list_index(keys, GINT_TO_POINTER(info->index)); + if(position >= 0) // => index is within the keys of the hash. { sink_info *s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(info->index)); @@ -459,11 +463,14 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event { if(index == DEFAULT_SINK_INDEX){ g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL event triggered - default sink has been removed !! \n updating UI to reflect the change"); - sound_service_dbus_update_sink_availability(dbus_service, FALSE); + gboolean availability = determine_sink_availability(); + sound_service_dbus_update_sink_availability(dbus_service, availability); } else{ g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL - some device other than the default - no panic"); } + g_debug("removing sink of index %i from our sink hash - keep the cache tidy !", index); + g_hash_table_remove(sink_hash, GINT_TO_POINTER(index)); } else { @@ -474,7 +481,7 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event g_debug("PA_SUBSCRIPTION_EVENT_SINK_INPUT event triggered!!"); if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { - //handle the remove event - not relevant for current design + //handle the sink input remove event - not relevant for current design } else { -- cgit v1.2.3 From 0cd41569d5b70e29547a7faa72456f8d1b3d2042 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 30 Mar 2010 15:55:58 +0100 Subject: modified the animation so it should now be aligned with the spec --- src/indicator-sound.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/indicator-sound.c b/src/indicator-sound.c index a67a0b0..9843bd3 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -125,11 +125,13 @@ static gboolean device_available; static gboolean slider_in_direct_use; static GtkIconSize design_team_size; +static gint blocked_id; 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(); +static gboolean start_animation(); // Construction static void @@ -371,12 +373,12 @@ static void prepare_blocked_animation() } // sample 22 snapshots - range : 0-256 - for(i = 0; i < 23; i++) + for(i = 0; i < 51; 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)); + 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)); } } @@ -505,12 +507,19 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo 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)); indicator_image_helper_update(speaker_image, image_name); - - blocked_iter = blocked_animation_list; - animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL); + blocked_id = g_timeout_add_seconds(5, start_animation, NULL); } } +static gboolean start_animation() +{ + blocked_iter = blocked_animation_list; + blocked_id = 0; + animation_id = g_timeout_add(50, fade_back_to_mute_image, NULL); + g_debug("exit from blocked hold\n"); + return FALSE; +} + static gboolean fade_back_to_mute_image() { if(blocked_iter != NULL) -- cgit v1.2.3 From 0120abf822211adae0d055de1098db6145aaee51 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 30 Mar 2010 17:18:25 +0100 Subject: scrolling speed has now been quickened for when scrolling over the icon on the panel --- src/indicator-sound.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/indicator-sound.c b/src/indicator-sound.c index a67a0b0..82a6142 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -85,10 +85,8 @@ static void scroll (IndicatorObject*io, gint delta, IndicatorScrollDirec //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);*/ 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); @@ -122,10 +120,10 @@ static gint previous_state = 0; static gdouble initial_volume_percent = 0; static gboolean initial_mute ; static gboolean device_available; -static gboolean slider_in_direct_use; +static gboolean slider_in_direct_use = FALSE; static GtkIconSize design_team_size; -static gint animation_id; +static gint animation_id = 0; static GList * blocked_animation_list = NULL; static GList * blocked_iter = NULL; static void prepare_blocked_animation(); @@ -268,7 +266,6 @@ 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, "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); @@ -282,6 +279,10 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p g_object_unref(secondary_gicon); gtk_widget_set_sensitive(volume_slider, !initial_mute); + + GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (slider)); + gtk_adjustment_set_step_increment(adj, 3); + gtk_widget_show_all(volume_slider); return TRUE; @@ -677,12 +678,15 @@ scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction) IndicatorSound *sound = INDICATOR_SOUND (io); 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; - else - value -= adj->step_increment; - + if (direction == INDICATOR_OBJECT_SCROLL_UP){ + value += adj->step_increment; + } + else{ + value -= adj->step_increment; + } gtk_range_set_value (GTK_RANGE (sound->slider), - value); + value); } -- cgit v1.2.3 From d28d741a8a622f34fd4078e762f781924d61ebf8 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 31 Mar 2010 12:40:08 +0100 Subject: sink removal should now be water(bloody) tight --- src/pulse-manager.c | 39 +++++++++++++++++++++------------------ tests/Makefile.am | 4 ++-- 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/pulse-manager.c b/src/pulse-manager.c index 2ba6856..1ce94d0 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -128,10 +128,8 @@ static void destroy_sink_info(void *value) /* Controllers & Utilities */ - static gboolean determine_sink_availability() { - // Firstly check to see if we have any sinks // if not get the hell out of here ! if (g_hash_table_size(sink_hash) < 1){ @@ -139,21 +137,24 @@ static gboolean determine_sink_availability() DEFAULT_SINK_INDEX = -1; return FALSE; } - // Secondly, make sure the default sink index is set - // If the default sink index has not been set (via the server) it will attempt to set it to the value of the first + // If the default sink index has not been set + // (via the server or has been reset because default sink has been removed), + // it will attempt to set it to the value of the first // index in the array of keys from the sink_hash. - GList *keys = g_hash_table_get_keys(sink_hash); - DEFAULT_SINK_INDEX = (DEFAULT_SINK_INDEX < 0) ? GPOINTER_TO_INT(g_list_first(keys)) : DEFAULT_SINK_INDEX; + GList* keys = g_hash_table_get_keys(sink_hash); + GList* key = g_list_first(keys); + + DEFAULT_SINK_INDEX = (DEFAULT_SINK_INDEX < 0) ? GPOINTER_TO_INT(key->data) : DEFAULT_SINK_INDEX; // Thirdly ensure the default sink index does not have the name "auto_null" - sink_info *s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(DEFAULT_SINK_INDEX)); - // Up until now the most rebost method to test this is to manually remove the available sink device + sink_info* s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(DEFAULT_SINK_INDEX)); + // Up until now the most rebust method to test this is to manually remove the available sink device // kernel module and then reload (rmmod & modprobe). // TODO: Edge case of dynamic loading and unloading of sinks should be handled also. g_debug("About to test for to see if the available sink is null - s->name = %s", s->name); gboolean available = g_ascii_strncasecmp("auto_null", s->name, 9) != 0; - g_debug("sink_available: %i", available); + g_debug("PA_Manager -> determine_sink_availability: %i", available); return available; } @@ -458,22 +459,24 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { case PA_SUBSCRIPTION_EVENT_SINK: - g_debug("PA_SUBSCRIPTION_EVENT_SINK event triggered"); if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) { + 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_hash_table_remove(sink_hash, GINT_TO_POINTER(index)); + if(index == DEFAULT_SINK_INDEX){ - g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL event triggered - default sink has been removed !! \n updating UI to reflect the change"); - gboolean availability = determine_sink_availability(); - sound_service_dbus_update_sink_availability(dbus_service, availability); + g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL: default sink %i has been removed.", DEFAULT_SINK_INDEX); + DEFAULT_SINK_INDEX = -1; + determine_sink_availability(); } - else{ - g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL - some device other than the default - no panic"); - } - g_debug("removing sink of index %i from our sink hash - keep the cache tidy !", index); - g_hash_table_remove(sink_hash, GINT_TO_POINTER(index)); + g_debug(" - 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"); pa_operation_unref(pa_context_get_sink_info_by_index(c, index, update_sink_info, userdata)); } break; diff --git a/tests/Makefile.am b/tests/Makefile.am index e99ec54..8d24b2b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ check_PROGRAMS = \ - test-indicator-sound \ + test-indicator-sound \ test-pulse-manager \ test-indicator-sound-dbus-client \ test-indicator-sound-dbus-server @@ -44,7 +44,7 @@ check_PROGRAMS += test-pulse-manager test_pulse_manager_SOURCES = \ test-pulse-manager.c \ $(top_builddir)/src/dbus-menu-manager.c \ - $(top_builddir)/src/sound-service-dbus.c \ + $(top_builddir)/src/sound-service-dbus.c \ $(top_builddir)/src/slider-menu-item.c test_pulse_manager_CFLAGS = \ -- cgit v1.2.3