From dc4c3340d41ebcf0124dcf2b43a492888e2f17c5 Mon Sep 17 00:00:00 2001 From: Jeongho Mok Date: Thu, 1 Dec 2016 17:31:35 +0900 Subject: [PATCH] remove avail mode [Version] 0.3.83 [Profile] Common [Issue Type] Remove API Change-Id: I17c3f4432df37d40f038e0c0f9a10b8afa190615 (cherry picked from commit 097409d0b83d602dff2181085ff373c4e9caa45f) --- include/sound_manager.h | 37 --------------------------------- packaging/capi-media-sound-manager.spec | 2 +- src/sound_manager.c | 26 ----------------------- 3 files changed, 1 insertion(+), 64 deletions(-) diff --git a/include/sound_manager.h b/include/sound_manager.h index fa5cbff..9171d40 100644 --- a/include/sound_manager.h +++ b/include/sound_manager.h @@ -295,19 +295,6 @@ typedef enum { } sound_device_state_e; /** - * @brief Enumeration for Bluetooth sound device modes. - * @since_tizen 3.0 - * - * @remarks This enumeration is only for Bluetooth devices.\n - * These values can be combined with bitwise 'or'. - */ - -typedef enum { - SOUND_DEVICE_BLUETOOTH_MODE_MEDIA = 0x01, /**< Media mode (for music, system, and so on) */ - SOUND_DEVICE_BLUETOOTH_MODE_VOICE = 0x02, /**< Voice mode (for call, voip, voice-recognition, and so on) */ -} sound_device_bluetooth_mode_e; - -/** * @brief Enumeration for sound device mask. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ @@ -329,7 +316,6 @@ typedef enum { typedef enum { SOUND_DEVICE_CHANGED_INFO_STATE, /**< State of the device was changed */ SOUND_DEVICE_CHANGED_INFO_IO_DIRECTION, /**< IO direction of the device was changed */ - SOUND_DEVICE_CHANGED_INFO_BT_AVAIL_MODES /**< Available modes of a Bluetooth device were changed (Since 3.0) */ } sound_device_changed_info_e; /** @@ -1359,29 +1345,6 @@ int sound_manager_get_device_name(sound_device_h device, char **name); int sound_manager_get_device_state(sound_device_h device, sound_device_state_e *state); /** - * @brief Gets the available modes of a Bluetooth device. - * @since_tizen 3.0 - * - * @remarks This function is only for Bluetooth devices. - * - * @param[in] device The device of #SOUND_DEVICE_BLUETOOTH type - * @param[out] modes The available modes of the Bluetooth device, values of #sound_device_bluetooth_mode_e combined with bitwise 'or' - * @return @c 0 on success, - * otherwise a negative error value - * @retval #SOUND_MANAGER_ERROR_NONE Success - * @retval #SOUND_MANAGER_ERROR_INVALID_PARAMETER Invalid parameter - * @see sound_manager_get_device_list() - * @see sound_manager_get_next_device() - * @see sound_manager_get_prev_device() - * @see sound_manager_get_device_type() - * @see sound_manager_get_device_io_direction() - * @see sound_manager_get_device_id() - * @see sound_manager_get_device_name() - * @see sound_manager_free_device_list() - */ -int sound_manager_get_bt_device_avail_modes(sound_device_h device, int *modes); - -/** * @brief Registers a callback function to be invoked when the state of connection of a sound device was changed. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec index ff1d72b..be70f82 100755 --- a/packaging/capi-media-sound-manager.spec +++ b/packaging/capi-media-sound-manager.spec @@ -1,6 +1,6 @@ Name: capi-media-sound-manager Summary: Sound Manager library -Version: 0.3.82 +Version: 0.3.83 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/sound_manager.c b/src/sound_manager.c index 0347f40..ed663f8 100644 --- a/src/sound_manager.c +++ b/src/sound_manager.c @@ -1150,32 +1150,6 @@ int sound_manager_get_device_state(sound_device_h device, sound_device_state_e * return _convert_sound_manager_error_code(__func__, ret); } -int sound_manager_get_bt_device_avail_modes(sound_device_h device, int *modes) -{ - int ret = MM_ERROR_NONE; - sound_device_type_e device_type; - mm_sound_device_type_e mm_sound_device_type; - - if (!device || !modes) - return _convert_sound_manager_error_code(__func__, MM_ERROR_INVALID_ARGUMENT); - - ret = mm_sound_get_device_type(device, (mm_sound_device_type_e*)&mm_sound_device_type); - if (ret == MM_ERROR_NONE) - _convert_device_type(mm_sound_device_type, &device_type); - if (ret != MM_ERROR_NONE) - goto LEAVE; - if (device_type != SOUND_DEVICE_BLUETOOTH_MEDIA && device_type != SOUND_DEVICE_BLUETOOTH_VOICE) { - ret = MM_ERROR_INVALID_ARGUMENT; - goto LEAVE; - } - - /* temporary code, this API should be removed */ - *modes = SOUND_DEVICE_BLUETOOTH_MODE_MEDIA | SOUND_DEVICE_BLUETOOTH_MODE_VOICE; - -LEAVE: - return _convert_sound_manager_error_code(__func__, ret); -} - int sound_manager_set_device_connected_cb(sound_device_mask_e device_mask, sound_device_connected_cb callback, void *user_data) { int ret = MM_ERROR_NONE; -- 2.7.4