mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Create pa_bluetooth_adapter for BlueZ 5 support

Browse source
This commit is contained in:
João Paulo Rechi Vita 2013-09-18 16:16:57 -05:00 • committed by Tanu Kaskinen
parent 19a23cef10
commit 546da17cbe
2 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/modules/bluetooth/bluez5-util.c
View file

@ -45,8 +45,36 @@ struct pa_bluetooth_discovery {
bool filter_added; bool filter_added;
bool matches_added; bool matches_added;
pa_hook hooks[PA_BLUETOOTH_HOOK_MAX]; pa_hook hooks[PA_BLUETOOTH_HOOK_MAX];
pa_hashmap *adapters;
}; };
static pa_bluetooth_adapter* adapter_create(pa_bluetooth_discovery *y, const char *path) {
pa_bluetooth_adapter *a;
pa_assert(y);
pa_assert(path);
a = pa_xnew0(pa_bluetooth_adapter, 1);
a->discovery = y;
a->path = pa_xstrdup(path);
pa_hashmap_put(y->adapters, a->path, a);
return a;
}
static void adapter_remove_all(pa_bluetooth_discovery *y) {
pa_bluetooth_adapter *a;
pa_assert(y);
while ((a = pa_hashmap_steal_first(y->adapters))) {
pa_xfree(a->path);
pa_xfree(a->address);
pa_xfree(a);
}
}
pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hook_t hook) { pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hook_t hook) {
pa_assert(y); pa_assert(y);
pa_assert(PA_REFCNT_VALUE(y) > 0); pa_assert(PA_REFCNT_VALUE(y) > 0);
@ -109,6 +137,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
y = pa_xnew0(pa_bluetooth_discovery, 1); y = pa_xnew0(pa_bluetooth_discovery, 1);
PA_REFCNT_INIT(y); PA_REFCNT_INIT(y);
y->core = c; y->core = c;
y->adapters = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
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);
@ -165,6 +194,11 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
if (PA_REFCNT_DEC(y) > 0) if (PA_REFCNT_DEC(y) > 0)
return; return;
if (y->adapters) {
adapter_remove_all(y);
pa_hashmap_free(y->adapters);
}
if (y->connection) { if (y->connection) {
if (y->matches_added) if (y->matches_added)

7
src/modules/bluetooth/bluez5-util.h
View file

@ -24,12 +24,19 @@
#include <pulsecore/core.h> #include <pulsecore/core.h>
typedef struct pa_bluetooth_adapter pa_bluetooth_adapter;
typedef struct pa_bluetooth_discovery pa_bluetooth_discovery; typedef struct pa_bluetooth_discovery pa_bluetooth_discovery;
typedef enum pa_bluetooth_hook { typedef enum pa_bluetooth_hook {
PA_BLUETOOTH_HOOK_MAX PA_BLUETOOTH_HOOK_MAX
} pa_bluetooth_hook_t; } pa_bluetooth_hook_t;
struct pa_bluetooth_adapter {
pa_bluetooth_discovery *discovery;
char *path;
char *address;
};
pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hook_t hook); pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hook_t hook);
pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core); pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core);