[pulseaudio-commits] 2 commits - src/pulsecore

[Tanu Kaskinen]

 src/pulsecore/card.c |   29 +++++++++++++++++++++++++++++
 src/pulsecore/card.h |    3 +++
 src/pulsecore/core.h |    2 ++
 3 files changed, 34 insertions(+)

New commits:
commit a9c3f2fb0fc1a1ee0072aac6425ad7311a2a5888
Author: Mikel Astiz <mikel.astiz at bmw-carit.de>
Date:   Tue Oct 23 16:41:56 2012 +0200

    card: Support adding ports dynamically
    
    Card profiles -specially the ones registered with pa_card_add_profile()-
    might need to create new ports during the lifetime of the card.

diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index 3b8e8db..b1daa63 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -91,6 +91,23 @@ void pa_card_add_profile(pa_card *c, pa_card_profile *profile) {
     pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], profile);
 }
 
+void pa_card_add_ports(pa_card *c, pa_hashmap *ports) {
+    pa_device_port *p;
+    void *state;
+
+    pa_assert(c);
+    pa_assert(ports);
+
+    /* take ownership of the ports */
+    PA_HASHMAP_FOREACH(p, ports, state)
+        pa_assert_se(pa_hashmap_put(c->ports, p->name, p) >= 0);
+
+    pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
+
+    while ((p = pa_hashmap_steal_first(ports)) != NULL)
+        pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_PORT_ADDED], p);
+}
+
 void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile) {
     pa_assert(data);
 
diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h
index 6c42271..5b5be81 100644
--- a/src/pulsecore/card.h
+++ b/src/pulsecore/card.h
@@ -101,6 +101,7 @@ pa_card *pa_card_new(pa_core *c, pa_card_new_data *data);
 void pa_card_free(pa_card *c);
 
 void pa_card_add_profile(pa_card *c, pa_card_profile *profile);
+void pa_card_add_ports(pa_card *c, pa_hashmap *ports);
 
 int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save);
 
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index aec7f80..cf7cc11 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -115,6 +115,7 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_CARD_PROFILE_CHANGED,
     PA_CORE_HOOK_CARD_PROFILE_ADDED,
     PA_CORE_HOOK_PORT_AVAILABLE_CHANGED,
+    PA_CORE_HOOK_PORT_ADDED,
     PA_CORE_HOOK_MAX
 } pa_core_hook_t;
 

commit 3c9b42d2bc3b42c0ac59c9c27e960a3af6d2f734
Author: Mikel Astiz <mikel.astiz at bmw-carit.de>
Date:   Tue Oct 23 16:41:55 2012 +0200

    card: Support adding profiles dynamically
    
    Some cards might need to add profiles during their lifetime, that is,
    after the card has been created.

diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index 492c051..3b8e8db 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -79,6 +79,18 @@ 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);
+
+    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);
 
diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h
index 6f942e8..6c42271 100644
--- a/src/pulsecore/card.h
+++ b/src/pulsecore/card.h
@@ -100,6 +100,8 @@ void pa_card_new_data_done(pa_card_new_data *data);
 pa_card *pa_card_new(pa_core *c, pa_card_new_data *data);
 void pa_card_free(pa_card *c);
 
+void pa_card_add_profile(pa_card *c, pa_card_profile *profile);
+
 int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save);
 
 int pa_card_suspend(pa_card *c, pa_bool_t suspend, pa_suspend_cause_t cause);
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index ba21fa9..aec7f80 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -113,6 +113,7 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_CARD_PUT,
     PA_CORE_HOOK_CARD_UNLINK,
     PA_CORE_HOOK_CARD_PROFILE_CHANGED,
+    PA_CORE_HOOK_CARD_PROFILE_ADDED,
     PA_CORE_HOOK_PORT_AVAILABLE_CHANGED,
     PA_CORE_HOOK_MAX
 } pa_core_hook_t;