From c00ba036dcadf5e31ca25212e68511902bec6807 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Thu, 5 Dec 2013 18:56:39 +0200 Subject: [PATCH] card: Move pa_card_add_profile() implementation to a more logical place The old place was in the middle of pa_card_new_data functions, which made no sense. --- src/pulsecore/card.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c index 7d9e9f2..9a29aeb 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); @@ -261,6 +248,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; -- 2.7.4