mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: bluez: move profile selection to function

Browse source 
Move the profile selection from `profile_new_connection()`
into a separate function to avoid checking the string more
than necessary.
This commit is contained in:
Barnabás Pőcze 2021-10-21 00:42:49 +02:00 • committed by Wim Taymans
parent dd4587acef
commit 4bdf495747
1 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1630,13 +1630,34 @@ static const struct spa_bt_device_events device_events = {
.destroy = device_destroy, .destroy = device_destroy,
}; };
static enum spa_bt_profile path_to_profile(const char *path)
{
#ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE
if (spa_streq(path, PROFILE_HSP_AG))
return SPA_BT_PROFILE_HSP_HS;
if (spa_streq(path, PROFILE_HSP_HS))
return SPA_BT_PROFILE_HSP_AG;
#endif
#ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
if (spa_streq(path, PROFILE_HFP_AG))
return SPA_BT_PROFILE_HFP_HF;
if (spa_streq(path, PROFILE_HFP_HF))
return SPA_BT_PROFILE_HFP_AG;
#endif
return SPA_BT_PROFILE_NULL;
}
static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessage *m, void *userdata) static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessage *m, void *userdata)
{ {
struct impl *backend = userdata; struct impl *backend = userdata;
DBusMessage *r; DBusMessage *r;
DBusMessageIter it[5]; DBusMessageIter it[5];
const char *handler, *path; const char *handler, *path;
enum spa_bt_profile profile = SPA_BT_PROFILE_NULL; enum spa_bt_profile profile;
struct rfcomm *rfcomm; struct rfcomm *rfcomm;
struct spa_bt_device *d; struct spa_bt_device *d;
struct spa_bt_transport *t = NULL; struct spa_bt_transport *t = NULL;
@ -1648,19 +1669,7 @@ static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessag
} }
handler = dbus_message_get_path(m); handler = dbus_message_get_path(m);
#ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE profile = path_to_profile(handler);
if (spa_streq(handler, PROFILE_HSP_AG))
profile = SPA_BT_PROFILE_HSP_HS;
else if (spa_streq(handler, PROFILE_HSP_HS))
profile = SPA_BT_PROFILE_HSP_AG;
#endif
#ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
if (spa_streq(handler, PROFILE_HFP_AG))
profile = SPA_BT_PROFILE_HFP_HF;
else if (spa_streq(handler, PROFILE_HFP_HF))
profile = SPA_BT_PROFILE_HFP_AG;
#endif
if (profile == SPA_BT_PROFILE_NULL) { if (profile == SPA_BT_PROFILE_NULL) {
spa_log_warn(backend->log, "invalid handler %s", handler); spa_log_warn(backend->log, "invalid handler %s", handler);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@ -1787,19 +1796,7 @@ static DBusHandlerResult profile_request_disconnection(DBusConnection *conn, DBu
} }
handler = dbus_message_get_path(m); handler = dbus_message_get_path(m);
#ifdef HAVE_BLUEZ_5_BACKEND_HSP_NATIVE profile = path_to_profile(handler);
if (spa_streq(handler, PROFILE_HSP_AG))
profile = SPA_BT_PROFILE_HSP_HS;
else if (spa_streq(handler, PROFILE_HSP_HS))
profile = SPA_BT_PROFILE_HSP_AG;
#endif
#ifdef HAVE_BLUEZ_5_BACKEND_HFP_NATIVE
if (spa_streq(handler, PROFILE_HFP_AG))
profile = SPA_BT_PROFILE_HFP_HF;
else if (spa_streq(handler, PROFILE_HFP_HF))
profile = SPA_BT_PROFILE_HFP_AG;
#endif
if (profile == SPA_BT_PROFILE_NULL) { if (profile == SPA_BT_PROFILE_NULL) {
spa_log_warn(backend->log, "invalid handler %s", handler); spa_log_warn(backend->log, "invalid handler %s", handler);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;