mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
bluetooth: Remove BlueZ 4 support
BlueZ 4 is no longer supported by BlueZ community for a long long time, also by moving to BlueZ 5 it should make it even more clearer that BlueZ 4 is no longer an option.
This commit is contained in:
parent
fb600395e1
commit
3b1093c0ad
27 changed files with 61 additions and 5505 deletions
|
|
@ -36,7 +36,6 @@ PA_MODULE_USAGE(
|
|||
|
||||
struct userdata {
|
||||
uint32_t bluez5_module_idx;
|
||||
uint32_t bluez4_module_idx;
|
||||
};
|
||||
|
||||
int pa__init(pa_module* m) {
|
||||
|
|
@ -47,7 +46,6 @@ int pa__init(pa_module* m) {
|
|||
|
||||
m->userdata = u = pa_xnew0(struct userdata, 1);
|
||||
u->bluez5_module_idx = PA_INVALID_INDEX;
|
||||
u->bluez4_module_idx = PA_INVALID_INDEX;
|
||||
|
||||
if (pa_module_exists("module-bluez5-discover")) {
|
||||
pa_module_load(&mm, m->core, "module-bluez5-discover", m->argument);
|
||||
|
|
@ -55,13 +53,7 @@ int pa__init(pa_module* m) {
|
|||
u->bluez5_module_idx = mm->index;
|
||||
}
|
||||
|
||||
if (pa_module_exists("module-bluez4-discover")) {
|
||||
pa_module_load(&mm, m->core, "module-bluez4-discover", NULL);
|
||||
if (mm)
|
||||
u->bluez4_module_idx = mm->index;
|
||||
}
|
||||
|
||||
if (u->bluez5_module_idx == PA_INVALID_INDEX && u->bluez4_module_idx == PA_INVALID_INDEX) {
|
||||
if (u->bluez5_module_idx == PA_INVALID_INDEX) {
|
||||
pa_xfree(u);
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -80,8 +72,5 @@ void pa__done(pa_module* m) {
|
|||
if (u->bluez5_module_idx != PA_INVALID_INDEX)
|
||||
pa_module_unload_by_index(m->core, u->bluez5_module_idx, true);
|
||||
|
||||
if (u->bluez4_module_idx != PA_INVALID_INDEX)
|
||||
pa_module_unload_by_index(m->core, u->bluez4_module_idx, true);
|
||||
|
||||
pa_xfree(u);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue