From 6ec01626869763720c88b7eea605c14dc7c6ab91 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 10 Nov 2008 16:59:09 +0200 Subject: sink: add a virtual_volume to sink --- src/pulsecore/sink.c | 22 ++++++++++++++-------- src/pulsecore/sink.h | 2 ++ 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 48c8f794..809e8273 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -192,6 +192,8 @@ pa_sink* pa_sink_new( s->volume = data->volume; s->base_volume = PA_VOLUME_NORM; + s->virtual_volume = s->volume; + s->muted = data->muted; s->refresh_volume = s->refresh_muted = FALSE; @@ -856,24 +858,26 @@ void pa_sink_set_volume(pa_sink *s, const pa_cvolume *volume) { pa_assert(pa_cvolume_compatible(volume, &s->sample_spec)); data.sink = s; - data.volume = *volume; + data.virtual_volume = data.volume = *volume; - changed = !pa_cvolume_equal(&data.volume, &s->volume); + changed = !pa_cvolume_equal(&data.virtual_volume, &s->virtual_volume) || + !pa_cvolume_equal(&data.volume, &s->volume); if (changed) { if (pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_SET_VOLUME], &data) < 0) return; - changed = !pa_cvolume_equal(&data.volume, &s->volume); + changed = !pa_cvolume_equal(&data.virtual_volume, &s->virtual_volume); /* from client-side view */ } s->volume = data.volume; + s->virtual_volume = data.virtual_volume; if (s->set_volume && s->set_volume(s) < 0) s->set_volume = NULL; if (!s->set_volume) - pa_sink_set_soft_volume(s, volume); + pa_sink_set_soft_volume(s, &s->volume); if (changed) pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); @@ -896,19 +900,21 @@ const pa_cvolume *pa_sink_get_volume(pa_sink *s, pa_bool_t force_refresh) { pa_assert(PA_SINK_IS_LINKED(s->state)); if (s->refresh_volume || force_refresh) { - struct pa_cvolume old_volume = s->volume; + struct pa_cvolume old_volume = s->virtual_volume; if (s->get_volume && s->get_volume(s) < 0) s->get_volume = NULL; - if (!s->get_volume) + if (!s->get_volume) { pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_VOLUME, &s->volume, 0, NULL); + s->virtual_volume = s->volume; + } - if (!pa_cvolume_equal(&old_volume, &s->volume)) + if (!pa_cvolume_equal(&old_volume, &s->virtual_volume)) pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); } - return &s->volume; + return &s->virtual_volume; } /* Called from main thread */ diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index 092e30f2..fb5e1e89 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -79,6 +79,7 @@ struct pa_sink { pa_source *monitor_source; pa_cvolume volume; + pa_cvolume virtual_volume; pa_bool_t muted; pa_volume_t base_volume; /* shall be constant */ @@ -211,6 +212,7 @@ void pa_sink_new_data_done(pa_sink_new_data *data); typedef struct pa_sink_set_volume_data { pa_sink *sink; pa_cvolume volume; + pa_cvolume virtual_volume; } pa_sink_set_volume_data; /* To be called exclusively by the sink driver, from main context */ -- cgit From e97ed21892402a09873b61a5cc200ce61c187488 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 17 Nov 2008 21:09:42 +0200 Subject: match: can now change properties also --- src/modules/module-match.c | 53 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/modules/module-match.c b/src/modules/module-match.c index 769a6b59..5c36fe0d 100644 --- a/src/modules/module-match.c +++ b/src/modules/module-match.c @@ -63,6 +63,7 @@ static const char* const valid_modargs[] = { struct rule { regex_t regex; pa_volume_t volume; + pa_proplist *proplist; struct rule *next; }; @@ -95,11 +96,12 @@ static int load_rules(struct userdata *u, const char *filename) { while (!feof(f)) { char *d, *v; - pa_volume_t volume; + pa_volume_t volume = PA_VOLUME_NORM; uint32_t k; regex_t regex; char ln[256]; struct rule *rule; + pa_proplist *proplist = NULL; if (!fgets(ln, sizeof(ln), f)) break; @@ -121,14 +123,33 @@ static int load_rules(struct userdata *u, const char *filename) { } *d = 0; - if (pa_atou(v, &k) < 0) { - pa_log("[%s:%u] failed to parse volume", filename, n); - goto finish; + if (pa_atou(v, &k) >= 0) { + volume = (pa_volume_t) k; + } else if (*v == '"') { + char *e; + + e = strchr(v+1, '"'); + if (!e) { + pa_log(__FILE__ ": [%s:%u] failed to parse line - missing role closing quote", filename, n); + goto finish; + } + + *e = '\0'; + e = pa_sprintf_malloc("media.role=\"%s\"", v+1); + proplist = pa_proplist_from_string(e); + pa_xfree(e); + } else { + char *e; + + e = v+strspn(v, WHITESPACE); + if (!*e) { + pa_log(__FILE__ ": [%s:%u] failed to parse line - missing end of property list", filename, n); + goto finish; + } + *e = '\0'; + proplist = pa_proplist_from_string(v); } - volume = (pa_volume_t) k; - - if (regcomp(®ex, ln, REG_EXTENDED|REG_NOSUB) != 0) { pa_log("[%s:%u] invalid regular expression", filename, n); goto finish; @@ -136,6 +157,7 @@ static int load_rules(struct userdata *u, const char *filename) { rule = pa_xnew(struct rule, 1); rule->regex = regex; + rule->proplist = proplist; rule->volume = volume; rule->next = NULL; @@ -180,12 +202,19 @@ static void callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, v if (!(n = pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME))) return; + pa_log_debug("Matching with %s", n); + for (r = u->rules; r; r = r->next) { if (!regexec(&r->regex, n, 0, NULL, 0)) { - pa_cvolume cv; - pa_log_debug("changing volume of sink input '%s' to 0x%03x", n, r->volume); - pa_cvolume_set(&cv, si->sample_spec.channels, r->volume); - pa_sink_input_set_volume(si, &cv); + if (r->proplist) { + pa_log_debug("updating proplist of sink input '%s'", n); + pa_proplist_update(si->proplist, PA_UPDATE_MERGE, r->proplist); + } else { + pa_cvolume cv; + pa_log_debug("changing volume of sink input '%s' to 0x%03x", n, r->volume); + pa_cvolume_set(&cv, si->sample_spec.channels, r->volume); + pa_sink_input_set_volume(si, &cv); + } } } } @@ -238,6 +267,8 @@ void pa__done(pa_module*m) { n = r->next; regfree(&r->regex); + if (r->proplist) + pa_proplist_free(r->proplist); pa_xfree(r); } -- cgit From e0f8ffe41f99789fafac575e944acf02e940bbf7 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 17 Nov 2008 21:37:25 +0200 Subject: match: add "key" argument to match different properties --- src/modules/module-match.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/modules/module-match.c b/src/modules/module-match.c index 5c36fe0d..8c825c4f 100644 --- a/src/modules/module-match.c +++ b/src/modules/module-match.c @@ -48,7 +48,8 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("Playback stream expression matching module"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(TRUE); -PA_MODULE_USAGE("table="); +PA_MODULE_USAGE("table= " + "key="); #define WHITESPACE "\n\r \t" @@ -57,6 +58,7 @@ PA_MODULE_USAGE("table="); static const char* const valid_modargs[] = { "table", + "key", NULL, }; @@ -69,6 +71,7 @@ struct rule { struct userdata { struct rule *rules; + char *property_key; pa_subscription *subscription; }; @@ -199,7 +202,7 @@ static void callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, v if (!(si = pa_idxset_get_by_index(c->sink_inputs, idx))) return; - if (!(n = pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME))) + if (!(n = pa_proplist_gets(si->proplist, u->property_key))) return; pa_log_debug("Matching with %s", n); @@ -230,11 +233,14 @@ int pa__init(pa_module*m) { goto fail; } + u = pa_xnew(struct userdata, 1); u->rules = NULL; u->subscription = NULL; m->userdata = u; + u->property_key = pa_xstrdup(pa_modargs_get_value(ma, "key", PA_PROP_MEDIA_NAME)); + if (load_rules(u, pa_modargs_get_value(ma, "table", NULL)) < 0) goto fail; @@ -263,6 +269,9 @@ void pa__done(pa_module*m) { if (u->subscription) pa_subscription_free(u->subscription); + if (u->property_key) + pa_xfree(u->property_key); + for (r = u->rules; r; r = n) { n = r->next; -- cgit