Replace TELEPHONY_DISABLE build option to TIZEN_HFP_DISABLE

Change-Id: Ief2118a62be42366523a5c874bbde1a4e2ccf723
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index 8d744bd9ecb0923ad9c8f19479f81c035a531941..d43e71bb8b8f4ec92600c77be4bf66c60badf242 100644 (file)
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -92,15 +92,15 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
 export FFLAGS="$FFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
 
 %if "%{?profile}" == "wearable"
-export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE -DTELEPHONY_DISABLED -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE -DTELEPHONY_DISABLED -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
-export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE -DTELEPHONY_DISABLED -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
+export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
+export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE -DTIZEN_HDP_DISABLE -DTIZEN_HID_HOST_DISABLE -DTIZEN_HID_DEVICE_DISABLE -DTIZEN_OPP_CLIENT_DISABLE -DTIZEN_OPP_SERVER_DISABLE -DTIZEN_WEARABLE"
 %endif
 
 %if "%{?profile}" == "common"
-export CFLAGS="$CFLAGS -DTELEPHONY_DISABLED"
-export CXXFLAGS="$CXXFLAGS -DTELEPHONY_DISABLED"
-export FFLAGS="$FFLAGS -DTELEPHONY_DISABLED"
+export CFLAGS="$CFLAGS -DTIZEN_HFP_DISABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_HFP_DISABLE"
+export FFLAGS="$FFLAGS -DTIZEN_HFP_DISABLE"
 %endif
 %endif # _with_emulator
 

diff --git a/src/bluetooth-audio.c b/src/bluetooth-audio.c
index 0947aad3021a22e8511106aad811bba89a615d70..f5b34c2245010a60bea957d4041def9a00404fd2 100644 (file)
--- a/src/bluetooth-audio.c
+++ b/src/bluetooth-audio.c
@@ -164,7 +164,7 @@ int bt_audio_initialize(void)
                is_audio_hf_initialized = true;
 #endif
 
-#ifndef TELEPHONY_DISABLED /* B2_3G */
+#ifndef TIZEN_HFP_DISABLE /* B2_3G */
        error = bluetooth_telephony_init((void *)_bt_telephony_event_proxy, NULL);
        error = _bt_convert_telephony_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -208,7 +208,7 @@ int bt_audio_deinitialize(void)
        is_audio_hf_initialized = false;
 #endif
 
-#ifndef TELEPHONY_DISABLED /* B2_3G */
+#ifndef TIZEN_HFP_DISABLE /* B2_3G */
        error = bluetooth_telephony_deinit();
        error = _bt_convert_telephony_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -235,7 +235,7 @@ int bt_audio_connect(const char *remote_address, bt_audio_profile_type_e type)
                BT_CHECK_A2DP_SUPPORT();
                BT_CHECK_A2DP_INIT_STATUS();
        } else if (type == BT_AUDIO_PROFILE_TYPE_ALL) {
-#if defined(TIZEN_HFP_DISABLE) || defined(TELEPHONY_DISABLED)
+#if defined(TIZEN_HFP_DISABLE)
                BT_CHECK_A2DP_INIT_STATUS();
                BT_ERR("HSP NOT SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED);
                type = BT_AUDIO_PROFILE_TYPE_A2DP;
@@ -255,7 +255,7 @@ int bt_audio_connect(const char *remote_address, bt_audio_profile_type_e type)
        BT_CHECK_INPUT_PARAMETER(remote_address);
        _bt_convert_address_to_hex(&addr_hex, remote_address);
        switch (type) {
-#ifndef TELEPHONY_DISABLED
+#ifndef TIZEN_HFP_DISABLE
        case BT_AUDIO_PROFILE_TYPE_HSP_HFP:
                error = bluetooth_ag_connect(&addr_hex);
                break;
@@ -299,7 +299,7 @@ int bt_audio_disconnect(const char *remote_address, bt_audio_profile_type_e type
                BT_CHECK_A2DP_SUPPORT();
                BT_CHECK_A2DP_INIT_STATUS();
        } else if (type == BT_AUDIO_PROFILE_TYPE_ALL) {
-#if defined(TIZEN_HFP_DISABLE) || defined(TELEPHONY_DISABLED)
+#if defined(TIZEN_HFP_DISABLE)
                BT_CHECK_A2DP_INIT_STATUS();
                BT_ERR("HSP NOT SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED);
                type = BT_AUDIO_PROFILE_TYPE_A2DP;
@@ -313,7 +313,7 @@ int bt_audio_disconnect(const char *remote_address, bt_audio_profile_type_e type
        BT_CHECK_INPUT_PARAMETER(remote_address);
        _bt_convert_address_to_hex(&addr_hex, remote_address);
        switch (type) {
-#ifndef TELEPHONY_DISABLED
+#ifndef TIZEN_HFP_DISABLE
        case BT_AUDIO_PROFILE_TYPE_HSP_HFP:
                error = bluetooth_ag_disconnect(&addr_hex);
                break;