From 34f6a516b2e5fd0ca4143eed9831759fcbc89cb0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:14:25 +0200 Subject: use pa_sink_set_volume() for changing the volume --- src/modules/module-flat-volume.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/modules/module-flat-volume.c') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index 02e3ed13..25b5707e 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -95,16 +95,8 @@ static void process_input_volume_change( /* Set the master volume, and normalize inputs */ if (!pa_cvolume_equal(&max_volume, &sink->volume)) { - /* copied from pa_sink_set_volume(): need to call from here to avoid sink hooks */ - /* alternatively, could create an extra function pa_sink_set_volume_full()? */ - sink->volume = max_volume; - if (sink->set_volume && sink->set_volume(sink) < 0) - sink->set_volume = NULL; - if (!sink->set_volume) - pa_sink_set_soft_volume(sink, &max_volume); - - pa_subscription_post(sink->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, sink->index); + pa_sink_set_volume(sink, &max_volume); pa_log_debug("sink = %.2f (changed)", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM); -- cgit