From 80a79b15df82084430b85cd4573df9ea152b3b62 Mon Sep 17 00:00:00 2001 From: Marc-Andre Lureau Date: Tue, 7 Oct 2008 01:37:39 +0300 Subject: flat-volume thingy Signed-off-by: Lennart Poettering --- src/modules/module-flat-volume.c | 220 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 src/modules/module-flat-volume.c (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c new file mode 100644 index 00000000..1a75e97c --- /dev/null +++ b/src/modules/module-flat-volume.c @@ -0,0 +1,220 @@ +/* $Id$ */ + +/*** + This file is part of PulseAudio. + + Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). + Copyright 2004-2006, 2008 Lennart Poettering + + Contact: Marc-Andre Lureau + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + PulseAudio is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "module-flat-volume-symdef.h" + +PA_MODULE_AUTHOR("Marc-Andre Lureau"); +PA_MODULE_DESCRIPTION("Flat volume"); +PA_MODULE_VERSION(PACKAGE_VERSION); +PA_MODULE_LOAD_ONCE(TRUE); +PA_MODULE_USAGE(""); + +struct userdata { + pa_subscription *subscription; + pa_hook_slot *sink_input_set_volume_hook_slot; + pa_hook_slot *sink_input_fixate_hook_slot; +}; + +static void process_input_volume_change(pa_cvolume *dest_volume, const pa_cvolume *dest_virtual_volume, pa_channel_map *dest_channel_map, + pa_sink_input *this, pa_sink *sink) { + pa_sink_input *i; + uint32_t idx; + pa_cvolume max_volume, sink_volume; + + pa_assert(dest_volume); + pa_assert(dest_virtual_volume); + pa_assert(dest_channel_map); + pa_assert(sink); + + pa_log_debug("Sink input volume changed"); + + max_volume = *dest_virtual_volume; + pa_cvolume_remap(&max_volume, dest_channel_map, &sink->channel_map); + + for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &idx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &idx))) { + /* skip this sink-input if we are processing a volume change request */ + if (this && this == i) + continue; + + if (pa_cvolume_avg(&i->virtual_volume) > pa_cvolume_avg(&max_volume)) { + max_volume = i->virtual_volume; + pa_cvolume_remap(&max_volume, &i->channel_map, &sink->channel_map); + } + } + + /* 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_log_debug("sink = %.2f (changed)", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM); + + /* Now, normalize each of the internal volume (client sink-input volume / sink master volume) */ + for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &idx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &idx))) { + /* skip this sink-input if we are processing a volume change request */ + if (this && this == i) + continue; + + sink_volume = max_volume; + pa_cvolume_remap(&sink_volume, &sink->channel_map, &i->channel_map); + pa_sw_cvolume_divide(&i->volume, &i->virtual_volume, &sink_volume); + pa_log_debug("sink input { id = %d, flat = %.2f, true = %.2f }", + i->index, + (double)pa_cvolume_avg(&i->virtual_volume)/PA_VOLUME_NORM, + (double)pa_cvolume_avg(&i->volume)/PA_VOLUME_NORM); + pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_VOLUME, pa_xnewdup(struct pa_cvolume, &i->volume, 1), 0, NULL, pa_xfree); + } + } else + pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM); + + /* and this one */ + { + sink_volume = max_volume; + pa_cvolume_remap(&sink_volume, &sink->channel_map, dest_channel_map); + pa_sw_cvolume_divide(dest_volume, dest_virtual_volume, &sink_volume); + pa_log_debug("caller sink input: { id = %d, flat = %.2f, true = %.2f }", + this ? (int)this->index : -1, + (double)pa_cvolume_avg(dest_virtual_volume)/PA_VOLUME_NORM, + (double)pa_cvolume_avg(dest_volume)/PA_VOLUME_NORM); + } +} + +static pa_hook_result_t sink_input_set_volume_hook_callback(pa_core *c, pa_sink_input_set_volume_data *this, struct userdata *u) { + pa_assert(this); + pa_assert(this->sink_input); + + process_input_volume_change(&this->volume, &this->virtual_volume, &this->sink_input->channel_map, + this->sink_input, this->sink_input->sink); + + return PA_HOOK_OK; +} + +static pa_hook_result_t sink_input_fixate_hook_callback(pa_core *core, pa_sink_input_new_data *this, struct userdata *u) { + pa_assert(this); + pa_assert(this->sink); + + process_input_volume_change(&this->volume, &this->virtual_volume, &this->channel_map, + NULL, this->sink); + + return PA_HOOK_OK; +} + +static void subscribe_callback(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { + struct userdata *u = userdata; + pa_sink *sink; + pa_sink_input *i; + uint32_t iidx; + pa_cvolume this_volume; + + pa_assert(core); + pa_assert(u); + + if (t != (PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_NEW) && + t != (PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE)) + return; + + if (!(sink = pa_idxset_get_by_index(core->sinks, idx))) + return; + + pa_log_debug("Sink volume changed"); + pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, FALSE)) / PA_VOLUME_NORM); + + for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &iidx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &iidx))) { + this_volume = *pa_sink_get_volume(sink, FALSE); + pa_cvolume_remap(&this_volume, &sink->channel_map, &i->channel_map); + pa_sw_cvolume_multiply(&i->virtual_volume, &i->volume, &this_volume); + pa_log_debug("sink input = { id = %d, flat = %.2f, true = %.2f }", + i->index, + (double)pa_cvolume_avg(&i->virtual_volume)/PA_VOLUME_NORM, + (double)pa_cvolume_avg(&i->volume)/PA_VOLUME_NORM); + pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index); + } +} + +int pa__init(pa_module*m) { + struct userdata *u; + + pa_assert(m); + + u = pa_xnew(struct userdata, 1); + m->userdata = u; + + u->sink_input_fixate_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_FIXATE], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_fixate_hook_callback, u); + u->sink_input_set_volume_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_SET_VOLUME], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_set_volume_hook_callback, u); + + u->subscription = pa_subscription_new(m->core, PA_SUBSCRIPTION_MASK_SINK, subscribe_callback, u); + + return 0; +} + +void pa__done(pa_module*m) { + struct userdata* u; + + pa_assert(m); + + if (!(u = m->userdata)) + return; + + if (u->subscription) + pa_subscription_free(u->subscription); + + if (u->sink_input_set_volume_hook_slot) + pa_hook_slot_free(u->sink_input_set_volume_hook_slot); + if (u->sink_input_fixate_hook_slot) + pa_hook_slot_free(u->sink_input_fixate_hook_slot); + + pa_xfree(u); +} -- cgit From 9f4033d1c40d6a4b81f88c45844c1da5ab0815f5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:08:51 +0200 Subject: if a stream comes with now sensible properties attached, use common fallback db entry. --- src/modules/module-stream-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index fe79291e..e1381a5e 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -134,7 +134,7 @@ static char *get_name(pa_proplist *p, const char *prefix) { else if ((r = pa_proplist_gets(p, PA_PROP_MEDIA_NAME))) return pa_sprintf_malloc("%s-by-media-name:%s", prefix, r); - return NULL; + return pa_sprintf_malloc("%s-fallback:%s", prefix); } static struct entry* read_entry(struct userdata *u, char *name) { -- cgit From 776c8dec3c0df2114d5012a2089642a6677a0317 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:10:56 +0200 Subject: remove $Id$ --- src/modules/module-flat-volume.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index 1a75e97c..5e339284 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of PulseAudio. -- cgit From 8bc58cc7579bf238cd0a5ffd48d44ebc08eaf5a7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:12:15 +0200 Subject: ignore sinks that do not carry decibel information --- src/modules/module-flat-volume.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index 5e339284..3bb0c876 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -69,6 +69,9 @@ static void process_input_volume_change(pa_cvolume *dest_volume, const pa_cvolum pa_assert(dest_channel_map); pa_assert(sink); + if (!(sink->flags & PA_SINK_DECIBEL_VOLUME)) + return; + pa_log_debug("Sink input volume changed"); max_volume = *dest_virtual_volume; @@ -167,6 +170,9 @@ static void subscribe_callback(pa_core *core, pa_subscription_event_type_t t, ui if (!(sink = pa_idxset_get_by_index(core->sinks, idx))) return; + if (!(sink->flags & PA_SINK_DECIBEL_VOLUME)) + return; + pa_log_debug("Sink volume changed"); pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, FALSE)) / PA_VOLUME_NORM); -- cgit From 404cf74332b4bee55015bfdc6ca3772c99d03f6c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:12:59 +0200 Subject: some minor reformatting --- src/modules/module-flat-volume.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index 3bb0c876..cd830c0f 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -58,8 +58,13 @@ struct userdata { pa_hook_slot *sink_input_fixate_hook_slot; }; -static void process_input_volume_change(pa_cvolume *dest_volume, const pa_cvolume *dest_virtual_volume, pa_channel_map *dest_channel_map, - pa_sink_input *this, pa_sink *sink) { +static void process_input_volume_change( + pa_cvolume *dest_volume, + const pa_cvolume *dest_virtual_volume, + pa_channel_map *dest_channel_map, + pa_sink_input *this, + pa_sink *sink) { + pa_sink_input *i; uint32_t idx; pa_cvolume max_volume, sink_volume; @@ -112,25 +117,24 @@ static void process_input_volume_change(pa_cvolume *dest_volume, const pa_cvolum sink_volume = max_volume; pa_cvolume_remap(&sink_volume, &sink->channel_map, &i->channel_map); pa_sw_cvolume_divide(&i->volume, &i->virtual_volume, &sink_volume); - pa_log_debug("sink input { id = %d, flat = %.2f, true = %.2f }", - i->index, - (double)pa_cvolume_avg(&i->virtual_volume)/PA_VOLUME_NORM, - (double)pa_cvolume_avg(&i->volume)/PA_VOLUME_NORM); - pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_VOLUME, pa_xnewdup(struct pa_cvolume, &i->volume, 1), 0, NULL, pa_xfree); + pa_log_debug("sink input { id = %d, flat = %.2f, true = %.2f }", + i->index, + (double)pa_cvolume_avg(&i->virtual_volume)/PA_VOLUME_NORM, + (double)pa_cvolume_avg(&i->volume)/PA_VOLUME_NORM); + pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_VOLUME, pa_xnewdup(struct pa_cvolume, &i->volume, 1), 0, NULL, pa_xfree); } } else pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM); /* and this one */ - { - sink_volume = max_volume; - pa_cvolume_remap(&sink_volume, &sink->channel_map, dest_channel_map); - pa_sw_cvolume_divide(dest_volume, dest_virtual_volume, &sink_volume); - pa_log_debug("caller sink input: { id = %d, flat = %.2f, true = %.2f }", - this ? (int)this->index : -1, - (double)pa_cvolume_avg(dest_virtual_volume)/PA_VOLUME_NORM, - (double)pa_cvolume_avg(dest_volume)/PA_VOLUME_NORM); - } + + sink_volume = max_volume; + pa_cvolume_remap(&sink_volume, &sink->channel_map, dest_channel_map); + pa_sw_cvolume_divide(dest_volume, dest_virtual_volume, &sink_volume); + pa_log_debug("caller sink input: { id = %d, flat = %.2f, true = %.2f }", + this ? (int)this->index : -1, + (double)pa_cvolume_avg(dest_virtual_volume)/PA_VOLUME_NORM, + (double)pa_cvolume_avg(dest_volume)/PA_VOLUME_NORM); } static pa_hook_result_t sink_input_set_volume_hook_callback(pa_core *c, pa_sink_input_set_volume_data *this, struct userdata *u) { @@ -138,7 +142,7 @@ static pa_hook_result_t sink_input_set_volume_hook_callback(pa_core *c, pa_sink_ pa_assert(this->sink_input); process_input_volume_change(&this->volume, &this->virtual_volume, &this->sink_input->channel_map, - this->sink_input, this->sink_input->sink); + this->sink_input, this->sink_input->sink); return PA_HOOK_OK; } -- cgit From b048ae9f789cdbc7540b343fb1890a86d91a505f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:13:53 +0200 Subject: check the maximum volume of all sink inputs instead of the average volume to avoid digital amplification in favour of attenuation --- src/modules/module-flat-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index cd830c0f..02e3ed13 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -87,7 +87,7 @@ static void process_input_volume_change( if (this && this == i) continue; - if (pa_cvolume_avg(&i->virtual_volume) > pa_cvolume_avg(&max_volume)) { + if (pa_cvolume_max(&i->virtual_volume) > pa_cvolume_max(&max_volume)) { max_volume = i->virtual_volume; pa_cvolume_remap(&max_volume, &i->channel_map, &sink->channel_map); } -- cgit 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') 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 From 37b8c45e2b4d996b328a4fc74f491498abbc9348 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Oct 2008 00:14:54 +0200 Subject: query the sink volume outside of the loop because it might be quite expensive --- src/modules/module-flat-volume.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c index 25b5707e..9bc8055a 100644 --- a/src/modules/module-flat-volume.c +++ b/src/modules/module-flat-volume.c @@ -154,7 +154,7 @@ static void subscribe_callback(pa_core *core, pa_subscription_event_type_t t, ui pa_sink *sink; pa_sink_input *i; uint32_t iidx; - pa_cvolume this_volume; + pa_cvolume sink_volume; pa_assert(core); pa_assert(u); @@ -172,10 +172,14 @@ static void subscribe_callback(pa_core *core, pa_subscription_event_type_t t, ui pa_log_debug("Sink volume changed"); pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, FALSE)) / PA_VOLUME_NORM); + sink_volume = *pa_sink_get_volume(sink, FALSE); + for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &iidx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &iidx))) { - this_volume = *pa_sink_get_volume(sink, FALSE); - pa_cvolume_remap(&this_volume, &sink->channel_map, &i->channel_map); - pa_sw_cvolume_multiply(&i->virtual_volume, &i->volume, &this_volume); + pa_cvolume si_volume; + + si_volume = sink_volume; + pa_cvolume_remap(&si_volume, &sink->channel_map, &i->channel_map); + pa_sw_cvolume_multiply(&i->virtual_volume, &i->volume, &si_volume); pa_log_debug("sink input = { id = %d, flat = %.2f, true = %.2f }", i->index, (double)pa_cvolume_avg(&i->virtual_volume)/PA_VOLUME_NORM, -- cgit