mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-05 13:29:57 -05:00
bluetooth: Rename shared struct to make it BlueZ 4 specific
This commit is contained in:
parent
e414b5828b
commit
438094baa4
1 changed files with 3 additions and 3 deletions
|
|
@ -1654,7 +1654,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
|
||||||
|
|
||||||
dbus_error_init(&err);
|
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);
|
return pa_bluetooth_discovery_ref(y);
|
||||||
|
|
||||||
y = pa_xnew0(pa_bluetooth_discovery, 1);
|
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++)
|
for (i = 0; i < PA_BLUETOOTH_HOOK_MAX; i++)
|
||||||
pa_hook_init(&y->hooks[i], y);
|
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)
|
if (setup_dbus(y) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
@ -1781,7 +1781,7 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
|
||||||
pa_hook_done(&y->hooks[i]);
|
pa_hook_done(&y->hooks[i]);
|
||||||
|
|
||||||
if (y->core)
|
if (y->core)
|
||||||
pa_shared_remove(y->core, "bluetooth-discovery");
|
pa_shared_remove(y->core, "bluez4-discovery");
|
||||||
|
|
||||||
pa_xfree(y);
|
pa_xfree(y);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue