[pulseaudio-discuss] [PATCH 2/2] bluetooth: Fix missing state checks for a2dp_source

Luiz Augusto von Dentz luiz.dentz at gmail.com
Mon Aug 20 01:05:16 PDT 2012


Hi Mikel,

On Thu, Aug 16, 2012 at 2:08 PM, Mikel Astiz <mikel.astiz.oss at gmail.com> wrote:
> From: Mikel Astiz <mikel.astiz at bmw-carit.de>
>
> Profile a2dp_source, just like any other card profile, should have
> state guards when the profile is being changed. If the BlueZ interface
> is not connected, the profile should be set to "off".
> ---
>  src/modules/bluetooth/module-bluetooth-device.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
> index 60881fc..5ef5487 100644
> --- a/src/modules/bluetooth/module-bluetooth-device.c
> +++ b/src/modules/bluetooth/module-bluetooth-device.c
> @@ -1969,7 +1969,10 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
>          pa_log_warn("HSP is not connected, refused to switch profile");
>          return -PA_ERR_IO;
>      } else if (device->audio_sink_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_A2DP) {
> -        pa_log_warn("A2DP is not connected, refused to switch profile");
> +        pa_log_warn("A2DP Sink is not connected, refused to switch profile");
> +        return -PA_ERR_IO;
> +    } else if (device->audio_source_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_A2DP_SOURCE) {
> +        pa_log_warn("A2DP Source is not connected, refused to switch profile");
>          return -PA_ERR_IO;
>      } else if (device->hfgw_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HFGW) {
>          pa_log_warn("HandsfreeGateway is not connected, refused to switch profile");
> @@ -2225,6 +2228,7 @@ static int add_card(struct userdata *u, const pa_bluetooth_device *device) {
>
>      if ((device->headset_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HSP) ||
>          (device->audio_sink_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_A2DP) ||
> +        (device->audio_source_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_A2DP_SOURCE) ||
>          (device->hfgw_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HFGW)) {
>          pa_log_warn("Default profile not connected, selecting off profile");
>          u->card->active_profile = pa_hashmap_get(u->card->profiles, "off");
> --
> 1.7.7.6

Ack.

-- 
Luiz Augusto von Dentz


More information about the pulseaudio-discuss mailing list