Merge "Remove the obex unregister function" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-audio.c

diff --git a/bt-api/bt-audio.c b/bt-api/bt-audio.c
index 1b12414..0bca5f2 100644 (file)
--- a/bt-api/bt-audio.c
+++ b/bt-api/bt-audio.c
@@ -24,9 +24,7 @@
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 BT_EXPORT_API int bluetooth_audio_init(bt_audio_func_ptr cb, void *user_data)
 {
@@ -88,7 +86,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -118,7 +115,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -128,7 +124,6 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
 
        g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t));
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (service_function == BT_AV_CONNECT)
                result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_CONNECT,
                                in_param1, in_param2, in_param3, in_param4,
@@ -138,7 +133,7 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add
                                in_param1, in_param2, in_param3, in_param4,
                                user_info->cb, user_info->user_data);
        else /* default case - with or without DPM enabled */
-#endif
+
                result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AUDIO_CONNECT,
                                in_param1, in_param2, in_param3, in_param4,
                                user_info->cb, user_info->user_data);
@@ -193,7 +188,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -216,7 +210,6 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -282,7 +275,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -305,7 +297,6 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -339,7 +330,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -349,7 +339,6 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote
                BT_ERR("Not allow to use A2DP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        user_info = _bt_get_user_data(BT_AUDIO);
        retv_if(user_info->cb == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -451,6 +440,75 @@ BT_EXPORT_API int bluetooth_audio_select_role(bluetooth_audio_role_t role)
        return result;
 }
 
+BT_EXPORT_API int bluetooth_audio_set_absolute_volume(unsigned int volume)
+{
+       int result;
+
+       BT_CHECK_ENABLED(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &volume, sizeof(unsigned int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_SET_ABSOLUTE_VOLUME,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_audio_get_absolute_volume(unsigned int *volume)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(volume, return);
+       BT_CHECK_ENABLED(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_GET_ABSOLUTE_VOLUME,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               *volume = g_array_index(out_param,
+                               unsigned int, 0);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_audio_is_avc_activated(bool *activated)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(activated, return);
+
+       if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
+               BT_DBG("BT is not enabled. So activated value is false");
+               *activated = false;
+               return BLUETOOTH_ERROR_NONE;
+       }
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_IS_AVC_ACTIVATED,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               *activated = g_array_index(out_param,
+                               bool, 0);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
 BT_EXPORT_API int bluetooth_ag_get_headset_volume(unsigned int *speaker_gain)
 {
        int result;
@@ -480,12 +538,10 @@ BT_EXPORT_API int bluetooth_ag_set_speaker_gain(unsigned int speaker_gain)
 
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) {
                BT_ERR("Not allow to use HSP profile");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
        }
-#endif
 
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -512,7 +568,7 @@ static GVariant* __bt_hf_agent_dbus_send(const char *path, const char *interface
        GDBusProxy *proxy = NULL;
        GDBusConnection *conn = NULL;
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        retv_if(conn == NULL, NULL);
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
@@ -565,6 +621,8 @@ static int __bt_hf_agent_read_call_list(GVariant *reply,
                (*call_list)->list = g_list_append((*call_list)->list,
                                                        (gpointer)call_info);
        }
+
+       g_variant_unref(var_temp);
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }