2012-05-24 17:26:25

by Lucas De Marchi

Subject: [PATCH BlueZ] AVRCP: Remove unneeded check for set_volume callback

---

Luiz, feel free to put this in your patchset if you prefer so it doesn't
conflict with your patches.

audio/avrcp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/audio/avrcp.c b/audio/avrcp.c
index cb6906d..7eda6e8 100644
--- a/audio/avrcp.c
+++ b/audio/avrcp.c
@@ -1150,8 +1150,7 @@ static gboolean avrcp_handle_volume_changed(struct avctp *session,
if (code == AVC_CTYPE_REJECTED || code == AVC_CTYPE_NOT_IMPLEMENTED)
return FALSE;

- if (player->cb->set_volume != NULL)
- player->cb->set_volume(abs_volume, player->dev, player->user_data);
+ player->cb->set_volume(abs_volume, player->dev, player->user_data);

return TRUE;
}
--
1.7.10.2

2012-05-25 07:44:09

by Johan Hedberg

Subject: Re: [PATCH BlueZ] AVRCP: Remove unneeded check for set_volume callback

Hi Lucas,

On Thu, May 24, 2012, Lucas De Marchi wrote:
> ---
>
> Luiz, feel free to put this in your patchset if you prefer so it doesn't
> conflict with your patches.
>
> audio/avrcp.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

This didn't conflict with current git (with first three Luiz's patches)
so I went ahead and applied it.

Johan