From 6727058328454ff7fda21c082000da33e7fbdbcf Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Sat, 1 Mar 2014 15:59:38 +0200 Subject: [PATCH] android/avrcp-lib: Fix not passing user data of passthrough callback --- android/avrcp-lib.c | 2 +- android/avrcp-lib.h | 2 +- unit/test-avrcp.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c index c6f94cab8..4fd86f63f 100644 --- a/android/avrcp-lib.c +++ b/android/avrcp-lib.c @@ -219,7 +219,7 @@ static bool handle_passthrough_pdu(struct avctp *conn, uint8_t op, if (!pressed) return true; - return handler->func(session); + return handler->func(session, session->passthrough_data); } static void disconnect_cb(void *data) diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h index df9f1c61e..430f54508 100644 --- a/android/avrcp-lib.h +++ b/android/avrcp-lib.h @@ -86,7 +86,7 @@ struct avrcp_control_handler { struct avrcp_passthrough_handler { uint8_t op; - bool (*func) (struct avrcp *session); + bool (*func) (struct avrcp *session, void *user_data); }; typedef void (*avrcp_destroy_cb_t) (void *user_data); diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c index d8484cd97..ac267bbf9 100644 --- a/unit/test-avrcp.c +++ b/unit/test-avrcp.c @@ -257,28 +257,28 @@ static void execute_context(struct context *context) destroy_context(context); } -static bool handle_play(struct avrcp *session) +static bool handle_play(struct avrcp *session, void *user_data) { DBG(""); return true; } -static bool handle_volume_up(struct avrcp *session) +static bool handle_volume_up(struct avrcp *session, void *user_data) { DBG(""); return true; } -static bool handle_channel_up(struct avrcp *session) +static bool handle_channel_up(struct avrcp *session, void *user_data) { DBG(""); return true; } -static bool handle_select(struct avrcp *session) +static bool handle_select(struct avrcp *session, void *user_data) { DBG(""); -- 2.47.3