From: seungku kim Date: Fri, 17 Jul 2015 09:20:29 +0000 (+0900) Subject: Classify audio init into A2DP, HF, and AG types X-Git-Tag: submit/tizen_mobile/20150721.054200^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a38d7ab5f4ecbc91a6c8bfcc03e04c37e11a2310;p=platform%2Fcore%2Fapi%2Fbluetooth.git Classify audio init into A2DP, HF, and AG types Change-Id: I06c832852f00f2d5de3ec117192d0911fcf53af1 --- diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h index 768d768..8e00a43 100644 --- a/include/bluetooth_private.h +++ b/include/bluetooth_private.h @@ -138,36 +138,6 @@ typedef enum { BT_GATT_ROLE_CLIENT = 0x02, } bt_gatt_role_e; -#ifdef TIZEN_WEARABLE -/** - * @internal - */ -typedef enum { - BT_ADAPTER_LE_ADVERTISING_CONNECTABLE = 0x00, /**< Connectable undirected advertising (ADV_IND) */ - BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_HIGH = 0x01, /* @Deprecated since Tizen 2.4 */ - BT_ADAPTER_LE_ADVERTISING_SCANNABLE = 0x02, /**< Scannable undirected advertising (ADV_SCAN_IND) */ - BT_ADAPTER_LE_ADVERTISING_NON_CONNECTABLE = 0x03, /**< Non connectable undirected advertising (ADV_NONCOND_IND) */ - BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_LOW = 0x04, /* @Deprecated since Tizen 2.4 */ -} bt_adapter_le_advertising_type_e; - -/** - * @internal - */ -typedef enum { - BT_ADAPTER_LE_PACKET_DATA_INCOMP_LIST_16_BIT_SERVICE_CLASS_UUIDS = 0x02, /**list); @@ -574,7 +597,7 @@ int bt_ag_notify_voice_recognition_state(bool state) BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); if (state) error = bluetooth_telephony_start_voice_recognition(); else @@ -591,7 +614,7 @@ int bt_ag_set_call_handling_event_cb(bt_ag_call_handling_event_cb callback, { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_AG_CALL_HANDLING_EVENT, callback, user_data); return BT_ERROR_NONE; @@ -601,7 +624,7 @@ int bt_ag_unset_call_handling_event_cb(void) { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); if (_bt_check_cb(BT_EVENT_AG_CALL_HANDLING_EVENT) == true) _bt_unset_cb(BT_EVENT_AG_CALL_HANDLING_EVENT); return BT_ERROR_NONE; @@ -613,7 +636,7 @@ int bt_ag_set_multi_call_handling_event_cb( { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_AG_MULTI_CALL_HANDLING_EVENT, callback, user_data); return BT_ERROR_NONE; @@ -623,7 +646,7 @@ int bt_ag_unset_multi_call_handling_event_cb(void) { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); if (_bt_check_cb(BT_EVENT_AG_MULTI_CALL_HANDLING_EVENT) == true) _bt_unset_cb(BT_EVENT_AG_MULTI_CALL_HANDLING_EVENT); return BT_ERROR_NONE; @@ -634,7 +657,7 @@ int bt_ag_set_dtmf_transmitted_cb(bt_ag_dtmf_transmitted_cb callback, { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_AG_DTMF_TRANSMITTED, callback, user_data); return BT_ERROR_NONE; @@ -644,7 +667,7 @@ int bt_ag_unset_dtmf_transmitted_cb(void) { BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); if (_bt_check_cb(BT_EVENT_AG_DTMF_TRANSMITTED) == true) _bt_unset_cb(BT_EVENT_AG_DTMF_TRANSMITTED); return BT_ERROR_NONE; @@ -657,6 +680,7 @@ int bt_ag_is_connected(bool *connected) BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(connected); error = bluetooth_telephony_is_connected(&is_connected); @@ -678,7 +702,7 @@ int bt_call_list_create(bt_call_list_h *list) BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(list); if (*list != NULL) { BT_ERR("BT_ERROR_ALREADY_DONE(0x%08x)", BT_ERROR_ALREADY_DONE); @@ -701,7 +725,7 @@ int bt_call_list_destroy(bt_call_list_h list) BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(list); handle = (call_list_s *)list; result = bt_call_list_reset(list); @@ -716,7 +740,7 @@ int bt_call_list_reset(bt_call_list_h list) BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(list); handle = (call_list_s *)list; do { @@ -740,7 +764,7 @@ int bt_call_list_add(bt_call_list_h list, unsigned int call_id, bt_ag_call_state BT_CHECK_HFP_SUPPORT(); BT_CHECK_INIT_STATUS(); - BT_CHECK_AUDIO_INIT_STATUS(); + BT_CHECK_AG_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(list); BT_CHECK_INPUT_PARAMETER(phone_number); @@ -762,6 +786,10 @@ int bt_a2dp_set_content_protection(bool status) { int error; + BT_CHECK_A2DP_SUPPORT(); + BT_CHECK_INIT_STATUS(); + BT_CHECK_A2DP_INIT_STATUS(); + error = bluetooth_a2dp_set_content_protection(status); error = _bt_get_error_code(error); if (BT_ERROR_NONE != error) { @@ -774,7 +802,9 @@ int bt_a2dp_set_content_protection(bool status) #ifdef TIZEN_WEARABLE int bt_hf_initialize(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; BT_CHECK_INIT_STATUS(); @@ -785,15 +815,13 @@ int bt_hf_initialize(void) return error; } return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_deinitialize(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; BT_CHECK_INIT_STATUS(); @@ -804,18 +832,15 @@ int bt_hf_deinitialize(void) return error; } return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_notify_call_event(bt_hf_call_event_e event, char *phone_number) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error = BT_ERROR_NONE; - BT_CHECK_INIT_STATUS(); BT_INFO("event [%d]", event); switch(event) { @@ -857,145 +882,117 @@ int bt_hf_notify_call_event(bt_hf_call_event_e event, char *phone_number) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); } return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_notify_speaker_gain(int gain) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; - BT_CHECK_INIT_STATUS(); error = bluetooth_hf_set_speaker_gain((unsigned int)gain); error = _bt_get_error_code(error); if (BT_ERROR_NONE != error) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_set_speaker_gain_changed_cb(bt_hf_speaker_gain_changed_cb callback, void *user_data) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_HF_SPEAKER_GAIN_CHANGE, callback, user_data); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_unset_speaker_gain_changed_cb(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + if (_bt_check_cb(BT_EVENT_HF_SPEAKER_GAIN_CHANGE) == true) _bt_unset_cb(BT_EVENT_HF_SPEAKER_GAIN_CHANGE); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_notify_voice_recognition_state(bool state) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; - BT_CHECK_INIT_STATUS(); error = bluetooth_hf_voice_recognition(state); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_set_call_status_updated_event_cb(bt_hf_call_status_updated_event_cb callback, void *user_data) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_HF_CALL_STATUS_UPDATED_EVENT, callback, user_data); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_unset_call_status_updated_event_cb(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + if (_bt_check_cb(BT_EVENT_HF_CALL_STATUS_UPDATED_EVENT) == true) _bt_unset_cb(BT_EVENT_HF_CALL_STATUS_UPDATED_EVENT); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_close_sco(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; - BT_CHECK_INIT_STATUS(); error = bluetooth_hf_audio_disconnect(); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_send_dtmf(char *dtmf) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + int error; - BT_CHECK_INIT_STATUS(); error = bluetooth_hf_send_dtmf(dtmf); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_is_connected(bool *connected) { -#ifdef TIZEN_AUDIO_HF_ENABLE - int error; - gboolean is_connected = false; - BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(connected); + int error; + gboolean is_connected = false; + error = bluetooth_hf_is_connected(&is_connected); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) @@ -1007,21 +1004,17 @@ int bt_hf_is_connected(bool *connected) *connected = false; return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_is_sco_opened(bool *opened) { -#ifdef TIZEN_AUDIO_HF_ENABLE - int error; - unsigned int audio_connected = BLUETOOTH_HF_AUDIO_DISCONNECTED; - BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(opened); + int error; + unsigned int audio_connected = BLUETOOTH_HF_AUDIO_DISCONNECTED; + error = bluetooth_hf_get_audio_connected(&audio_connected); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) @@ -1033,42 +1026,34 @@ int bt_hf_is_sco_opened(bool *opened) *opened = false; return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_get_codec_id(unsigned int *codec_id) { -#ifdef TIZEN_AUDIO_HF_ENABLE - int error; - BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(codec_id); + int error; + error = bluetooth_hf_get_codec(codec_id); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error), error); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_get_call_status_info_list(GSList **call_list) { -#ifdef TIZEN_AUDIO_HF_ENABLE + BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + BT_CHECK_INPUT_PARAMETER(call_list); + int error; bt_hf_call_list_s *hf_call_list = NULL; GList *l; - BT_CHECK_INIT_STATUS(); - BT_CHECK_INPUT_PARAMETER(call_list); - error = bluetooth_hf_request_call_list(&hf_call_list); error = _bt_get_error_code(error); if (error != BT_ERROR_NONE) { @@ -1093,115 +1078,86 @@ int bt_hf_get_call_status_info_list(GSList **call_list) bluetooth_hf_free_call_list(hf_call_list); return error; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } -#ifdef TIZEN_AUDIO_HF_ENABLE static void __bt_hf_free_call_status_info(void *data) { bt_hf_call_status_info_s *call_info = (bt_hf_call_status_info_s*)data; g_free(call_info->number); g_free(call_info); } -#endif int bt_hf_free_call_status_info_list(GSList *call_list) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(call_list); g_slist_free_full(call_list, __bt_hf_free_call_status_info); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_set_sco_state_changed_cb(bt_hf_sco_state_changed_cb callback, void *user_data) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_HF_SCO_CONNECTION_STATUS, callback, user_data); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_unset_sco_state_changed_cb(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + if (_bt_check_cb(BT_EVENT_HF_SCO_CONNECTION_STATUS) == true) _bt_unset_cb(BT_EVENT_HF_SCO_CONNECTION_STATUS); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_set_call_handling_event_cb(bt_hf_call_handling_event_cb callback, void *user_data) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_HF_CALL_HANDLING_EVENT, callback, user_data); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_unset_call_handling_event_cb(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + if (_bt_check_cb(BT_EVENT_HF_CALL_HANDLING_EVENT) == true) _bt_unset_cb(BT_EVENT_HF_CALL_HANDLING_EVENT); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_set_multi_call_handling_event_cb( bt_hf_multi_call_handling_event_cb callback, void *user_data) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_HF_MULTI_CALL_HANDLING_EVENT, callback, user_data); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } int bt_hf_unset_multi_call_handling_event_cb(void) { -#ifdef TIZEN_AUDIO_HF_ENABLE BT_CHECK_INIT_STATUS(); + BT_CHECK_HF_SUPPORT(); + if (_bt_check_cb(BT_EVENT_HF_MULTI_CALL_HANDLING_EVENT) == true) _bt_unset_cb(BT_EVENT_HF_MULTI_CALL_HANDLING_EVENT); return BT_ERROR_NONE; -#else - BT_ERR("NOT_SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED); - return BT_ERROR_NOT_SUPPORTED; -#endif } #endif