[pulseaudio-discuss] [PATCHv2 15/60] bluetooth: Rename shared struct to make it BlueZ 4 specific

jprvita at gmail.com jprvita at gmail.com
Mon Aug 12 21:53:53 PDT 2013


From: João Paulo Rechi Vita <jprvita at openbossa.org>

---
 src/modules/bluetooth/bluez4-util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c
index 29b237b..4179783 100644
--- a/src/modules/bluetooth/bluez4-util.c
+++ b/src/modules/bluetooth/bluez4-util.c
@@ -1654,7 +1654,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
 
     dbus_error_init(&err);
 
-    if ((y = pa_shared_get(c, "bluetooth-discovery")))
+    if ((y = pa_shared_get(c, "bluez4-discovery")))
         return pa_bluetooth_discovery_ref(y);
 
     y = pa_xnew0(pa_bluetooth_discovery, 1);
@@ -1667,7 +1667,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
     for (i = 0; i < PA_BLUETOOTH_HOOK_MAX; i++)
         pa_hook_init(&y->hooks[i], y);
 
-    pa_shared_set(c, "bluetooth-discovery", y);
+    pa_shared_set(c, "bluez4-discovery", y);
 
     if (setup_dbus(y) < 0)
         goto fail;
@@ -1781,7 +1781,7 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
         pa_hook_done(&y->hooks[i]);
 
     if (y->core)
-        pa_shared_remove(y->core, "bluetooth-discovery");
+        pa_shared_remove(y->core, "bluez4-discovery");
 
     pa_xfree(y);
 }
-- 
1.7.11.7



More information about the pulseaudio-discuss mailing list