diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-02-18 14:54:03 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-02-18 14:54:03 +0000 |
| commit | e918e55ad26ba289a37d89f748a6836c4800aba4 (patch) | |
| tree | 32f8eebb1333d3b0711eb099d8ee8a6a80b6121d | |
| parent | 8d52a2dd20c24ae99720fc81d81091b2212b0703 (diff) | |
| parent | 7de60c339a2e7e9a85618081e06d6eff66810377 (diff) | |
| download | ayatana-indicator-sound-e918e55ad26ba289a37d89f748a6836c4800aba4.tar.gz ayatana-indicator-sound-e918e55ad26ba289a37d89f748a6836c4800aba4.tar.bz2 ayatana-indicator-sound-e918e55ad26ba289a37d89f748a6836c4800aba4.zip | |
merge of the bugfix branch for icon update and slider behaviour while muted
| -rw-r--r-- | src/indicator-sound.c | 3 | ||||
| -rw-r--r-- | src/pulse-manager.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 9c73df4..8e79db6 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -326,6 +326,7 @@ static void update_state(const gint state) static void determine_state_from_volume(gdouble volume_percent) { /* g_debug("determine_state_from_volume - previous_state = %i", previous_state);*/ + gint state = previous_state; if (volume_percent < 30.0 && volume_percent > 0){ state = STATE_LOW; @@ -431,6 +432,8 @@ key_press_cb: **/ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data) { + if (current_state == STATE_MUTED) + return FALSE; GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider); GtkRange* range = (GtkRange*)slider; diff --git a/src/pulse-manager.c b/src/pulse-manager.c index 52f9cba..9b9d7cd 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -342,7 +342,7 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v if(DEFAULT_SINK_INDEX == s->index) { //update the UI - if (volume_changed == TRUE) + if (volume_changed == TRUE && s->mute == FALSE) { pa_volume_t vol = pa_cvolume_avg(&s->volume); gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM; |