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

bluetooth: Rename bluetooth modules to BlueZ 4

Browse source
This commit is contained in:
João Paulo Rechi Vita 2013-08-13 01:53:52 -03:00 • committed by Tanu Kaskinen
parent 0589bed305
commit e414b5828b
5 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/Makefile.am
View file

@ -1322,11 +1322,11 @@ endif
if HAVE_BLUEZ if HAVE_BLUEZ
modlibexec_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
libbluetooth-util.la \
module-bluetooth-proximity.la \ module-bluetooth-proximity.la \
module-bluetooth-discover.la \
module-bluetooth-policy.la \ module-bluetooth-policy.la \
module-bluetooth-device.la libbluez4-util.la \
module-bluez4-discover.la \
module-bluez4-device.la
pulselibexec_PROGRAMS += \ pulselibexec_PROGRAMS += \
proximity-helper proximity-helper
@ -1419,9 +1419,9 @@ SYMDEF_FILES = \
module-udev-detect-symdef.h \ module-udev-detect-symdef.h \
module-systemd-login-symdef.h \ module-systemd-login-symdef.h \
module-bluetooth-proximity-symdef.h \ module-bluetooth-proximity-symdef.h \
module-bluetooth-discover-symdef.h \
module-bluetooth-policy-symdef.h \ module-bluetooth-policy-symdef.h \
module-bluetooth-device-symdef.h \ module-bluez4-discover-symdef.h \
module-bluez4-device-symdef.h \
module-raop-sink-symdef.h \ module-raop-sink-symdef.h \
module-raop-discover-symdef.h \ module-raop-discover-symdef.h \
module-gconf-symdef.h \ module-gconf-symdef.h \
@ -2028,25 +2028,24 @@ proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS)
proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS) proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS)
proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# Bluetooth sink / source # Bluetooth BlueZ 4 sink / source
module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c
module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS) module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la module_bluez4_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez4-util.la
module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) module_bluez4_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
libbluez4_util_la_SOURCES = \
libbluetooth_util_la_SOURCES = \
modules/bluetooth/a2dp-codecs.h \ modules/bluetooth/a2dp-codecs.h \
modules/bluetooth/bluetooth-util.c \ modules/bluetooth/bluez4-util.c \
modules/bluetooth/bluetooth-util.h modules/bluetooth/bluez4-util.h
libbluetooth_util_la_LDFLAGS = -avoid-version libbluez4_util_la_LDFLAGS = -avoid-version
libbluetooth_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez4_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) libbluez4_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h module_bluez4_device_la_SOURCES = modules/bluetooth/module-bluez4-device.c modules/bluetooth/rtp.h
module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS) module_bluez4_device_la_LDFLAGS = $(MODULE_LDFLAGS)
module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluetooth-util.la module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluez4-util.la
module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS) module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS)
module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c
module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS) module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)

2
src/modules/bluetooth/bluetooth-util.c → src/modules/bluetooth/bluez4-util.c
View file

@ -29,7 +29,7 @@
#include <pulsecore/shared.h> #include <pulsecore/shared.h>
#include <pulsecore/dbus-shared.h> #include <pulsecore/dbus-shared.h>
#include "bluetooth-util.h" #include "bluez4-util.h"
#include "a2dp-codecs.h" #include "a2dp-codecs.h"
#define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG" #define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG"

4
src/modules/bluetooth/bluetooth-util.h → src/modules/bluetooth/bluez4-util.h
View file

@ -1,5 +1,5 @@
#ifndef foobluetoothutilhfoo #ifndef foobluez4utilhfoo
#define foobluetoothutilhfoo #define foobluez4utilhfoo
/*** /***
This file is part of PulseAudio. This file is part of PulseAudio.

4
src/modules/bluetooth/module-bluetooth-device.c → src/modules/bluetooth/module-bluez4-device.c
View file

@ -52,10 +52,10 @@
#include <sbc/sbc.h> #include <sbc/sbc.h>
#include "module-bluetooth-device-symdef.h" #include "module-bluez4-device-symdef.h"
#include "a2dp-codecs.h" #include "a2dp-codecs.h"
#include "rtp.h" #include "rtp.h"
#include "bluetooth-util.h" #include "bluez4-util.h"
#define BITPOOL_DEC_LIMIT 32 #define BITPOOL_DEC_LIMIT 32
#define BITPOOL_DEC_STEP 5 #define BITPOOL_DEC_STEP 5

8
src/modules/bluetooth/module-bluetooth-discover.c → src/modules/bluetooth/module-bluez4-discover.c
View file

@ -34,8 +34,8 @@
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulsecore/dbus-shared.h> #include <pulsecore/dbus-shared.h>
#include "module-bluetooth-discover-symdef.h" #include "module-bluez4-discover-symdef.h"
#include "bluetooth-util.h" #include "bluez4-util.h"
PA_MODULE_AUTHOR("João Paulo Rechi Vita"); PA_MODULE_AUTHOR("João Paulo Rechi Vita");
PA_MODULE_DESCRIPTION("Detect available BlueZ 4 Bluetooth audio devices and load BlueZ 4 Bluetooth audio drivers"); PA_MODULE_DESCRIPTION("Detect available BlueZ 4 Bluetooth audio devices and load BlueZ 4 Bluetooth audio drivers");
@ -94,8 +94,8 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
args = tmp; args = tmp;
} }
pa_log_debug("Loading module-bluetooth-device %s", args); pa_log_debug("Loading module-bluez4-device %s", args);
m = pa_module_load(u->module->core, "module-bluetooth-device", args); m = pa_module_load(u->module->core, "module-bluez4-device", args);
pa_xfree(args); pa_xfree(args);
if (m) { if (m) {