[pulseaudio-commits] src/modules

[Tanu Kaskinen]

 src/modules/bluetooth/module-bluetooth-device.c   |   20 ++++++++++++++++++++
 src/modules/bluetooth/module-bluetooth-discover.c |    6 ++----
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit ea45f2c7951a81b2f43029892535d6a6280eb97e
Author: Mikel Astiz <mikel.astiz at bmw-carit.de>
Date:   Mon Oct 22 10:46:38 2012 +0200

    bluetooth: Self unload module-bluetooth-device
    
    If the device has been removed, unload the module without depending on
    module-bluetooth-discovery.

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 30a1807..7167390 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -144,6 +144,7 @@ struct userdata {
     pa_bluetooth_transport *transport;
     char *accesstype;
     pa_hook_slot *transport_removed_slot;
+    pa_hook_slot *device_removed_slot;
 
     pa_bluetooth_discovery *discovery;
     pa_bool_t auto_connect;
@@ -2524,6 +2525,17 @@ static int setup_dbus(struct userdata *u) {
     return 0;
 }
 
+/* Run from main thread */
+static pa_hook_result_t device_removed_cb(pa_bluetooth_device *d, void *call_data, struct userdata *u) {
+    pa_assert(d);
+    pa_assert(u);
+
+    pa_log_debug("Device %s removed: unloading module", d->path);
+    pa_module_unload(u->core, u->module, TRUE);
+
+    return PA_HOOK_OK;
+}
+
 int pa__init(pa_module* m) {
     pa_modargs *ma;
     uint32_t channels;
@@ -2594,6 +2606,9 @@ int pa__init(pa_module* m) {
     if (!(device = find_device(u, address, path)))
         goto fail;
 
+    u->device_removed_slot = pa_hook_connect(&device->hooks[PA_BLUETOOTH_DEVICE_HOOK_REMOVED], PA_HOOK_NORMAL,
+                                             (pa_hook_cb_t) device_removed_cb, u);
+
     /* Add the card structure. This will also initialize the default profile */
     if (add_card(u, device) < 0)
         goto fail;
@@ -2681,6 +2696,11 @@ void pa__done(pa_module *m) {
 
     stop_thread(u);
 
+    if (u->device_removed_slot) {
+        pa_hook_slot_free(u->device_removed_slot);
+        u->device_removed_slot = NULL;
+    }
+
     if (USE_SCO_OVER_PCM(u))
         restore_sco_volume_callbacks(u);
 
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 1ec71eb..2dc7cf5 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -116,11 +116,9 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
 
         if (mi) {
 
-            /* Hmm, disconnection? Then let's unload our module */
-
-            pa_log_debug("Unloading module for %s", d->path);
-            pa_module_unload_request_by_index(u->core, mi->module, TRUE);
+            /* Hmm, disconnection? Then the module unloads itself */
 
+            pa_log_debug("Unregistering module for %s", d->path);
             pa_hashmap_remove(u->hashmap, mi->path);
             pa_xfree(mi->path);
             pa_xfree(mi);