diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2015-11-17 15:10:30 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2015-11-22 04:59:21 +0200 |
| commit | 2a71fd7597dd76eb6abab867cd3762429792f680 (patch) | |
| tree | 92c4ee165e1a6bc6c73c41a6a2266951b3a46936 /src | |
| parent | b9818b016f021a80ab8c4ca9f2360756eefe2a87 (diff) | |
alsa-mixer: Fill in input and output names
Fill in input_name and output_name to make routing easier for
routing modules.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 8 | ||||
| -rw-r--r-- | src/modules/alsa/alsa-mixer.h | 3 | ||||
| -rw-r--r-- | src/modules/alsa/module-alsa-card.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index af7adeaf5..3f5171788 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -3473,6 +3473,8 @@ static void profile_free(pa_alsa_profile *p) { pa_xfree(p->name); pa_xfree(p->description); + pa_xfree(p->input_name); + pa_xfree(p->output_name); pa_xstrfreev(p->input_mapping_names); pa_xstrfreev(p->output_mapping_names); @@ -4123,6 +4125,7 @@ static void profile_set_add_auto_pair( p->name = name; if (m) { + p->output_name = pa_xstrdup(m->name); p->output_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func); pa_idxset_put(p->output_mappings, m, NULL); p->priority += m->priority * 100; @@ -4130,6 +4133,7 @@ static void profile_set_add_auto_pair( } if (n) { + p->input_name = pa_xstrdup(n->name); p->input_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func); pa_idxset_put(p->input_mappings, n, NULL); p->priority += n->priority; @@ -4292,9 +4296,11 @@ void pa_alsa_profile_dump(pa_alsa_profile *p) { pa_alsa_mapping *m; pa_assert(p); - pa_log_debug("Profile %s (%s), priority=%u, supported=%s n_input_mappings=%u, n_output_mappings=%u", + pa_log_debug("Profile %s (%s), input=%s, output=%s priority=%u, supported=%s n_input_mappings=%u, n_output_mappings=%u", p->name, pa_strnull(p->description), + pa_strnull(p->input_name), + pa_strnull(p->output_name), p->priority, pa_yes_no(p->supported), p->input_mappings ? pa_idxset_size(p->input_mappings) : 0, diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h index 621a71bde..4ebf1922b 100644 --- a/src/modules/alsa/alsa-mixer.h +++ b/src/modules/alsa/alsa-mixer.h @@ -293,6 +293,9 @@ struct pa_alsa_profile { char *description; unsigned priority; + char *input_name; + char *output_name; + bool supported:1; bool fallback_input:1; bool fallback_output:1; diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c index e173e5156..286cfc9e2 100644 --- a/src/modules/alsa/module-alsa-card.c +++ b/src/modules/alsa/module-alsa-card.c @@ -143,6 +143,8 @@ static void add_profiles(struct userdata *u, pa_hashmap *h, pa_hashmap *ports) { cp = pa_card_profile_new(ap->name, ap->description, sizeof(struct profile_data)); cp->priority = ap->priority; + cp->input_name = pa_xstrdup(ap->input_name); + cp->output_name = pa_xstrdup(ap->output_name); if (ap->output_mappings) { cp->n_sinks = pa_idxset_size(ap->output_mappings); |