[pulseaudio-discuss] [PATCH 17/21] bluetooth: Add node support

Tanu Kaskinen tanu.kaskinen at linux.intel.com
Wed Jun 19 08:40:14 PDT 2013


---
 src/modules/bluetooth/module-bluetooth-device.c | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index f7c6a57..2668651 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -35,8 +35,10 @@
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
 
+#include <pulsecore/dynarray.h>
 #include <pulsecore/i18n.h>
 #include <pulsecore/module.h>
+#include <pulsecore/port-node.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/core-rtclock.h>
 #include <pulsecore/core-util.h>
@@ -158,6 +160,7 @@ struct userdata {
     pa_card *card;
     pa_sink *sink;
     pa_source *source;
+    pa_dynarray *nodes;
 
     pa_thread_mq thread_mq;
     pa_rtpoll *rtpoll;
@@ -2396,6 +2399,31 @@ static pa_hook_result_t discovery_hook_cb(pa_bluetooth_discovery *y, const pa_bl
     return PA_HOOK_OK;
 }
 
+static void create_nodes(struct userdata *u) {
+    void *state;
+    pa_device_port *port;
+
+    pa_assert(u);
+
+    u->nodes = pa_dynarray_new((pa_free_cb_t) pa_port_node_free);
+
+    PA_HASHMAP_FOREACH(port, u->card->ports, state) {
+        pa_port_node *node;
+
+        if ((node = pa_port_node_new(port, port->direction == PA_DIRECTION_OUTPUT ? "bluetooth-output" : "bluetooth-input")))
+            pa_dynarray_append(u->nodes, node);
+        else {
+            /* We could perhaps just ignore failures, but it's nice to be able
+             * to assume that nodes exist either for all or none of the
+             * ports. */
+            pa_log("Failed to create a node for port %s. Removing all nodes of card %s.", port->name, u->card->name);
+            pa_dynarray_free(u->nodes);
+            u->nodes = NULL;
+            break;
+        }
+    }
+}
+
 int pa__init(pa_module* m) {
     pa_modargs *ma;
     uint32_t channels;
@@ -2511,6 +2539,8 @@ int pa__init(pa_module* m) {
         if (start_thread(u) < 0)
             goto off;
 
+    create_nodes(u);
+
     return 0;
 
 off:
@@ -2518,6 +2548,8 @@ off:
 
     pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
 
+    create_nodes(u);
+
     return 0;
 
 fail:
@@ -2546,6 +2578,9 @@ void pa__done(pa_module *m) {
     if (!(u = m->userdata))
         return;
 
+    if (u->nodes)
+        pa_dynarray_free(u->nodes);
+
     stop_thread(u);
 
     if (u->discovery_slot)
-- 
1.8.1.2



More information about the pulseaudio-discuss mailing list