From 493892434a63e0e3e1ef2bd4347c0c21e69c6ba1 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 26 Mar 2018 17:15:51 +0300 Subject: [PATCH] bluetooth: policy: Remove BlueZ 4 related code This removes hfpw option and profile which were only used by BlueZ 4. --- src/modules/bluetooth/module-bluetooth-policy.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/modules/bluetooth/module-bluetooth-policy.c b/src/modules/bluetooth/module-bluetooth-policy.c index a6a812b57..4d3126f65 100644 --- a/src/modules/bluetooth/module-bluetooth-policy.c +++ b/src/modules/bluetooth/module-bluetooth-policy.c @@ -38,8 +38,7 @@ PA_MODULE_LOAD_ONCE(true); PA_MODULE_USAGE( "auto_switch= " "a2dp_source= " - "ag= " - "hfgw= DEPRECATED"); + "ag= "); static const char* const valid_modargs[] = { "auto_switch", @@ -88,8 +87,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source, if (u->enable_a2dp_source && pa_streq(s, "a2dp_source")) role = "music"; - /* TODO: remove hfgw when we remove BlueZ 4 support */ - else if (u->enable_ag && (pa_streq(s, "hfgw") || pa_streq(s, "headset_audio_gateway"))) + else if (u->enable_ag && pa_streq(s, "headset_audio_gateway")) role = "phone"; else { pa_log_debug("Profile %s cannot be selected for loopback", s); @@ -128,8 +126,7 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void * if (!s) return PA_HOOK_OK; - /* TODO: remove hfgw when we remove BlueZ 4 support */ - if (u->enable_ag && (pa_streq(s, "hfgw") || pa_streq(s, "headset_audio_gateway"))) + if (u->enable_ag && pa_streq(s, "headset_audio_gateway")) role = "phone"; else { pa_log_debug("Profile %s cannot be selected for loopback", s); @@ -363,9 +360,7 @@ static pa_hook_result_t profile_available_hook_callback(pa_core *c, pa_card_prof return PA_HOOK_OK; /* Do not automatically switch profiles for headsets, just in case */ - /* TODO: remove a2dp and hsp when we remove BlueZ 4 support */ - if (pa_streq(profile->name, "hsp") || pa_streq(profile->name, "a2dp") || pa_streq(profile->name, "a2dp_sink") || - pa_streq(profile->name, "headset_head_unit")) + if (pa_streq(profile->name, "a2dp_sink") || pa_streq(profile->name, "headset_head_unit")) return PA_HOOK_OK; is_active_profile = card->active_profile == profile; @@ -448,10 +443,6 @@ int pa__init(pa_module *m) { } u->enable_ag = true; - if (pa_modargs_get_value_boolean(ma, "hfgw", &u->enable_ag) < 0) { - pa_log("Failed to parse hfgw argument."); - goto fail; - } if (pa_modargs_get_value_boolean(ma, "ag", &u->enable_ag) < 0) { pa_log("Failed to parse ag argument."); goto fail;