aboutsummaryrefslogtreecommitdiff
path: root/src/pulse-manager.c
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2010-08-26 11:27:27 +0200
committerSebastien Bacher <seb128@ubuntu.com>2010-08-26 11:27:27 +0200
commit4bad61faf27bf1e5b5c967d641d1d36b1260d8e1 (patch)
tree9cb69ca30ed4469e543b92c01eac2b6fa4af3838 /src/pulse-manager.c
parent022c9bd2558d5881523d68d217c398e475a9da6e (diff)
parentb4d305f16bae6804dcf2acf8b9ecc4629807c150 (diff)
downloadayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.gz
ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.bz2
ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.zip
releasing version 0.4.0-0ubuntu1
Diffstat (limited to 'src/pulse-manager.c')
-rw-r--r--src/pulse-manager.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/pulse-manager.c b/src/pulse-manager.c
index a9a47e4..4ff9e1d 100644
--- a/src/pulse-manager.c
+++ b/src/pulse-manager.c
@@ -211,7 +211,8 @@ static void mute_each_sink(gpointer key, gpointer value, gpointer user_data)
if (GPOINTER_TO_INT(user_data) == 1) {
sound_service_dbus_update_sink_mute(dbus_service, TRUE);
} else {
- sound_service_dbus_update_sink_volume(dbus_service, get_default_sink_volume());
+ //sound_service_dbus_update_sink_volume(dbus_service, get_default_sink_volume());
+ dbus_menu_manager_update_volume(get_default_sink_volume());
}
/* g_debug("in the pulse manager: mute each sink %i", GPOINTER_TO_INT(user_data));*/
@@ -288,7 +289,7 @@ static void context_success_callback(pa_context *c, int success, void *userdata)
/**
On Service startup this callback will be called multiple times resulting our sinks_hash container to be filled with the
available sinks.
-For now this callback it assumes it only used at startup. It may be necessary to use if sinks become available after startup.
+For now this callback assumes it only used at startup. It may be necessary to use if sinks become available after startup.
Major candidate for refactoring.
**/
static void pulse_sink_info_callback(pa_context *c, const pa_sink_info *sink, int eol, void *userdata)
@@ -399,7 +400,7 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
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);
+ dbus_menu_manager_update_volume(volume_percent);
}
if (mute_changed == TRUE) {
@@ -410,7 +411,8 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
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);
+ //sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
+ dbus_menu_manager_update_volume(volume_percent);
}
}
}