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

bluetooth: Revive module-bluetooth-discover

Browse source 
Create a wrapper module called module-bluetooth-discover to avoid
breaking backward-compatibility of default.pa. This wrapper may
eventually be dropped altoghether with BlueZ 4 support.
This commit is contained in:
João Paulo Rechi Vita 2013-09-24 19:45:59 -03:00 • committed by Tanu Kaskinen
parent 1ea8a2bdae
commit 8753b8c147
2 changed files with 86 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.am
View file

@ -1322,6 +1322,7 @@ endif
if HAVE_BLUEZ
modlibexec_LTLIBRARIES += \
module-bluetooth-discover.la \
module-bluetooth-policy.la
endif
@ -1426,6 +1427,7 @@ SYMDEF_FILES = \
module-udev-detect-symdef.h \
module-systemd-login-symdef.h \
module-bluetooth-policy-symdef.h \
module-bluetooth-discover-symdef.h \
module-bluez4-discover-symdef.h \
module-bluez4-device-symdef.h \
module-bluez5-discover-symdef.h \
@ -2031,6 +2033,12 @@ module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
# Bluetooth discover
module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c
module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD)
module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS)
# Bluetooth BlueZ 4 sink / source
module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c
module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS)

78
src/modules/bluetooth/module-bluetooth-discover.c Normal file
View file

@ -0,0 +1,78 @@
/***
This file is part of PulseAudio.
Copyright 2013 João Paulo Rechi Vita
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
#include <pulsecore/module.h>
#include "module-bluetooth-discover-symdef.h"
PA_MODULE_AUTHOR("João Paulo Rechi Vita");
PA_MODULE_DESCRIPTION("Detect available Bluetooth daemon and load the corresponding discovery module");
PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(true);
struct userdata {
pa_module *bluez5_module;
pa_module *bluez4_module;
};
int pa__init(pa_module* m) {
struct userdata *u;
pa_assert(m);
m->userdata = u = pa_xnew0(struct userdata, 1);
if (pa_module_exists("module-bluez5-discover"))
u->bluez5_module = pa_module_load(m->core, "module-bluez5-discover", NULL);
if (pa_module_exists("module-bluez4-discover"))
u->bluez4_module = pa_module_load(m->core, "module-bluez4-discover", NULL);
if (!u->bluez5_module && !u->bluez4_module) {
pa_xfree(u);
return -1;
}
return 0;
}
void pa__done(pa_module* m) {
struct userdata *u;
pa_assert(m);
if (!(u = m->userdata))
return;
if (u->bluez5_module)
pa_module_unload(m->core, u->bluez5_module, true);
if (u->bluez4_module)
pa_module_unload(m->core, u->bluez4_module, true);
pa_xfree(u);
}