From: João Paulo Rechi Vita Date: Tue, 13 Aug 2013 04:53:52 +0000 (-0300) Subject: bluetooth: Rename bluetooth modules to BlueZ 4 X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/e414b5828b43bc3817eeea0f4a2017c5356bf857?ds=sidebyside;hp=0589bed30512acb2c7160e4285c44fe2bdb17fbf bluetooth: Rename bluetooth modules to BlueZ 4 --- diff --git a/src/Makefile.am b/src/Makefile.am index 8392953a..9113d837 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1322,11 +1322,11 @@ endif if HAVE_BLUEZ modlibexec_LTLIBRARIES += \ - libbluetooth-util.la \ module-bluetooth-proximity.la \ - module-bluetooth-discover.la \ module-bluetooth-policy.la \ - module-bluetooth-device.la + libbluez4-util.la \ + module-bluez4-discover.la \ + module-bluez4-device.la pulselibexec_PROGRAMS += \ proximity-helper @@ -1419,9 +1419,9 @@ SYMDEF_FILES = \ module-udev-detect-symdef.h \ module-systemd-login-symdef.h \ module-bluetooth-proximity-symdef.h \ - module-bluetooth-discover-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-discover-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_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -# Bluetooth sink / source -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) $(DBUS_LIBS) libbluetooth-util.la -module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +# Bluetooth BlueZ 4 sink / source +module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c +module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez4_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez4-util.la +module_bluez4_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) - -libbluetooth_util_la_SOURCES = \ +libbluez4_util_la_SOURCES = \ modules/bluetooth/a2dp-codecs.h \ - modules/bluetooth/bluetooth-util.c \ - modules/bluetooth/bluetooth-util.h -libbluetooth_util_la_LDFLAGS = -avoid-version -libbluetooth_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) -libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) - -module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h -module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS) -module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluetooth-util.la -module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS) + modules/bluetooth/bluez4-util.c \ + modules/bluetooth/bluez4-util.h +libbluez4_util_la_LDFLAGS = -avoid-version +libbluez4_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) +libbluez4_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + +module_bluez4_device_la_SOURCES = modules/bluetooth/module-bluez4-device.c modules/bluetooth/rtp.h +module_bluez4_device_la_LDFLAGS = $(MODULE_LDFLAGS) +module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluez4-util.la +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_LDFLAGS = $(MODULE_LDFLAGS) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluez4-util.c similarity index 99% rename from src/modules/bluetooth/bluetooth-util.c rename to src/modules/bluetooth/bluez4-util.c index 49831e65..f7550690 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluez4-util.c @@ -29,7 +29,7 @@ #include #include -#include "bluetooth-util.h" +#include "bluez4-util.h" #include "a2dp-codecs.h" #define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG" diff --git a/src/modules/bluetooth/bluetooth-util.h b/src/modules/bluetooth/bluez4-util.h similarity index 99% rename from src/modules/bluetooth/bluetooth-util.h rename to src/modules/bluetooth/bluez4-util.h index c69ba71a..4570a10d 100644 --- a/src/modules/bluetooth/bluetooth-util.h +++ b/src/modules/bluetooth/bluez4-util.h @@ -1,5 +1,5 @@ -#ifndef foobluetoothutilhfoo -#define foobluetoothutilhfoo +#ifndef foobluez4utilhfoo +#define foobluez4utilhfoo /*** This file is part of PulseAudio. diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluez4-device.c similarity index 99% rename from src/modules/bluetooth/module-bluetooth-device.c rename to src/modules/bluetooth/module-bluez4-device.c index 5da197b3..2d1224fe 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluez4-device.c @@ -52,10 +52,10 @@ #include -#include "module-bluetooth-device-symdef.h" +#include "module-bluez4-device-symdef.h" #include "a2dp-codecs.h" #include "rtp.h" -#include "bluetooth-util.h" +#include "bluez4-util.h" #define BITPOOL_DEC_LIMIT 32 #define BITPOOL_DEC_STEP 5 diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluez4-discover.c similarity index 95% rename from src/modules/bluetooth/module-bluetooth-discover.c rename to src/modules/bluetooth/module-bluez4-discover.c index d89890b3..e5b30f5f 100644 --- a/src/modules/bluetooth/module-bluetooth-discover.c +++ b/src/modules/bluetooth/module-bluez4-discover.c @@ -34,8 +34,8 @@ #include #include -#include "module-bluetooth-discover-symdef.h" -#include "bluetooth-util.h" +#include "module-bluez4-discover-symdef.h" +#include "bluez4-util.h" 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"); @@ -94,8 +94,8 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const args = tmp; } - pa_log_debug("Loading module-bluetooth-device %s", args); - m = pa_module_load(u->module->core, "module-bluetooth-device", args); + pa_log_debug("Loading module-bluez4-device %s", args); + m = pa_module_load(u->module->core, "module-bluez4-device", args); pa_xfree(args); if (m) {