diff options
author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-05 18:56:39 +0200 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-05 19:03:13 +0200 |
commit | b28ebd57f58b24b82fc19a7e067e07c2ebb0f1aa (patch) | |
tree | a9c4598a0ec6d414e15c348535d149cef92f11bf | |
parent | 37429cb07ef745a1be91011ca8b7700553ceb44c (diff) |
card: Move pa_card_add_profile() implementation to a more logical placerouting
The old place was in the middle of pa_card_new_data functions, which
made no sense.
-rw-r--r-- | src/pulsecore/card.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c index 8ca6e54da..6e1f77a35 100644 --- a/src/pulsecore/card.c +++ b/src/pulsecore/card.c @@ -101,19 +101,6 @@ void pa_card_new_data_set_name(pa_card_new_data *data, const char *name) { data->name = pa_xstrdup(name); } -void pa_card_add_profile(pa_card *c, pa_card_profile *profile) { - pa_assert(c); - pa_assert(profile); - - /* take ownership of the profile */ - pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0); - profile->card = c; - - pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index); - - pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], profile); -} - void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile) { pa_assert(data); @@ -250,6 +237,19 @@ void pa_card_free(pa_card *c) { pa_xfree(c); } +void pa_card_add_profile(pa_card *c, pa_card_profile *profile) { + pa_assert(c); + pa_assert(profile); + + /* take ownership of the profile */ + pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0); + profile->card = c; + + pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index); + + pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], profile); +} + int pa_card_set_profile(pa_card *c, pa_card_profile *profile, bool save) { int r; |