Separate AVRCP callbacks for target & control

Change-Id: I55afabb350e48df8432ac4347a6c14e7868aa27d
Signed-off-by: Deokhyun Kim <dukan.kim@samsung.com>

diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index 4f7e392..e66477d 100644 (file)
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -116,6 +116,7 @@ typedef enum {
        BT_EVENT_AVRCP_SONG_POSITION_CHANGED, /**< AVRCP scan mode change callback */
        BT_EVENT_AVRCP_TRACK_INFO_CHANGED, /**< AVRCP scan mode change callback */
        BT_EVENT_AVRCP_DELAY_CHANGED, /**< AVRCP scan mode change callback */
+       BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS, /**< AVRCP control connection change callback */
        BT_EVENT_HID_CONNECTION_STATUS, /**< HID connection status callback */
        BT_EVENT_HID_DEVICE_CONNECTION_STATUS, /**< HID Device connection status callback */
        BT_EVENT_HID_DEVICE_DATA_RECEIVED, /**< HID Device Data received callback */

diff --git a/src/bluetooth-avrcp.c b/src/bluetooth-avrcp.c
index fd8ce89..e4fa420 100644 (file)
--- a/src/bluetooth-avrcp.c
+++ b/src/bluetooth-avrcp.c
@@ -301,7 +301,7 @@ int bt_avrcp_control_initialize(bt_avrcp_control_connection_state_changed_cb cal
        BT_CHECK_AVRCP_CONTROL_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(callback);
-       _bt_set_cb(BT_EVENT_AVRCP_CONNECTION_STATUS, callback, user_data);
+       _bt_set_cb(BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS, callback, user_data);
        error = bluetooth_media_control_init(_bt_avrcp_event_proxy, NULL);
        error = _bt_convert_avrcp_error_code(error);
        error = _bt_get_error_code(error);
@@ -321,8 +321,8 @@ int bt_avrcp_control_deinitialize(void)
        BT_CHECK_AVRCP_CONTROL_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_AVRCP_CONTROL_INIT_STATUS();
-       if (_bt_check_cb(BT_EVENT_AVRCP_CONNECTION_STATUS) == true)
-               _bt_unset_cb(BT_EVENT_AVRCP_CONNECTION_STATUS);
+       if (_bt_check_cb(BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS) == true)
+               _bt_unset_cb(BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS);
 
        error = bluetooth_media_control_deinit();
        error = _bt_convert_avrcp_error_code(error);

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 78161ec..dfa1239 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -206,8 +206,8 @@ static bt_event2index_table_t event2index[] = {
        { BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED, BT_EVENT_AUDIO_CONNECTION_STATUS },
        { BLUETOOTH_EVENT_AVRCP_CONNECTED, BT_EVENT_AVRCP_CONNECTION_STATUS },
        { BLUETOOTH_EVENT_AVRCP_DISCONNECTED, BT_EVENT_AVRCP_CONNECTION_STATUS },
-       { BLUETOOTH_EVENT_AVRCP_CONTROL_CONNECTED, BT_EVENT_AVRCP_CONNECTION_STATUS },
-       { BLUETOOTH_EVENT_AVRCP_CONTROL_DISCONNECTED, BT_EVENT_AVRCP_CONNECTION_STATUS },
+       { BLUETOOTH_EVENT_AVRCP_CONTROL_CONNECTED, BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS },
+       { BLUETOOTH_EVENT_AVRCP_CONTROL_DISCONNECTED, BT_EVENT_AVRCP_CONTROL_CONNECTION_STATUS },
        { BLUETOOTH_EVENT_AVRCP_SETTING_SHUFFLE_STATUS, BT_EVENT_AVRCP_SHUFFLE_MODE_CHANGED },
        { BLUETOOTH_EVENT_AVRCP_CONTROL_SHUFFLE_STATUS, BT_EVENT_AVRCP_SHUFFLE_MODE_CHANGED },
        { BLUETOOTH_EVENT_AVRCP_SETTING_EQUALIZER_STATUS, BT_EVENT_AVRCP_EQUALIZER_STATE_CHANGED },
@@ -2216,13 +2216,13 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
        case BLUETOOTH_EVENT_AVRCP_CONTROL_CONNECTED:
                BT_INFO("BLUETOOTH_EVENT_AVRCP_CONTROL_CONNECTED ");
                device_addr = (char *)(param->param_data);
-               ((bt_avrcp_target_connection_state_changed_cb)bt_event_slot_container[event_index].callback)
+               ((bt_avrcp_control_connection_state_changed_cb)bt_event_slot_container[event_index].callback)
                (TRUE, device_addr, bt_event_slot_container[event_index].user_data);
                break;
        case BLUETOOTH_EVENT_AVRCP_CONTROL_DISCONNECTED:
                BT_INFO("BLUETOOTH_EVENT_AVRCP_CONTROL_DISCONNECTED ");
                device_addr = (char *)(param->param_data);
-               ((bt_avrcp_target_connection_state_changed_cb)bt_event_slot_container[event_index].callback)
+               ((bt_avrcp_control_connection_state_changed_cb)bt_event_slot_container[event_index].callback)
                (FALSE, device_addr, bt_event_slot_container[event_index].user_data);
                break;
        case BLUETOOTH_EVENT_AVRCP_CONTROL_SHUFFLE_STATUS: