mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: Use str2ba() function

Browse source 
bluez5 SPA is already linked to the BlueZ library so we can use this
helper function and simplify code.
This commit is contained in:
Frédéric Danis 2021-02-10 10:46:56 +01:00 • committed by Wim Taymans
parent 2af7f8204a
commit add8329374
1 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spa/plugins/bluez5/backend-native.c
View file

@ -214,10 +214,7 @@ static bool rfcomm_hsp_hs(struct spa_source *source, char* buf)
#ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE #ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
static bool device_supports_required_mSBC_transport_modes( static bool device_supports_required_mSBC_transport_modes(
struct spa_bt_backend *backend, struct spa_bt_device *device) { struct spa_bt_backend *backend, struct spa_bt_device *device) {
const char *src_addr;
bdaddr_t src; bdaddr_t src;
int i;
uint8_t features[8], max_page = 0; uint8_t features[8], max_page = 0;
int device_id; int device_id;
int sock; int sock;
@ -227,11 +224,7 @@ static bool device_supports_required_mSBC_transport_modes(
spa_log_debug(backend->log, NAME": Entering function"); spa_log_debug(backend->log, NAME": Entering function");
src_addr = device->adapter->address; str2ba(device->adapter->address, &src);
/* don't use ba2str to avoid -lbluetooth */
for (i = 5; i >= 0; i--, src_addr += 3)
src.b[i] = strtol(src_addr, NULL, 16);
device_id = hci_get_route(&src); device_id = hci_get_route(&src);
sock = hci_open_dev(device_id); sock = hci_open_dev(device_id);
@ -483,25 +476,18 @@ static int sco_do_connect(struct spa_bt_transport *t)
struct spa_bt_device *d = t->device; struct spa_bt_device *d = t->device;
struct sockaddr_sco addr; struct sockaddr_sco addr;
socklen_t len; socklen_t len;
int err, i; int err;
int sock; int sock;
bdaddr_t src; bdaddr_t src;
bdaddr_t dst; bdaddr_t dst;
const char *src_addr, *dst_addr;
spa_log_debug(backend->log, NAME": transport %p: enter sco_do_connect", t); spa_log_debug(backend->log, NAME": transport %p: enter sco_do_connect", t);
if (d->adapter == NULL) if (d->adapter == NULL)
return -EIO; return -EIO;
src_addr = d->adapter->address; str2ba(d->adapter->address, &src);
dst_addr = d->address; str2ba(d->address, &dst);
/* don't use ba2str to avoid -lbluetooth */
for (i = 5; i >= 0; i--, src_addr += 3)
src.b[i] = strtol(src_addr, NULL, 16);
for (i = 5; i >= 0; i--, dst_addr += 3)
dst.b[i] = strtol(dst_addr, NULL, 16);
sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO); sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
if (sock < 0) { if (sock < 0) {