From 09da1e79a96fa28daae44b2e88563faf128571a5 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Thu, 22 Dec 2016 19:49:32 +0900 Subject: [PATCH] [v0.3.40] remove deprecated api Change-Id: I18077c55dcc77f3cf56308a976d79bb9f986b5ce --- include/common/player.h | 22 ---------------------- include/wearable/player.h | 22 ---------------------- packaging/capi-media-player.spec | 2 +- src/player.c | 37 ------------------------------------- 4 files changed, 1 insertion(+), 82 deletions(-) diff --git a/include/common/player.h b/include/common/player.h index af45268..cc9670c 100644 --- a/include/common/player.h +++ b/include/common/player.h @@ -667,28 +667,6 @@ int player_set_sound_type(player_h player, sound_type_e type) TIZEN_DEPRECATED_A int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_info); /** - * @brief Sets the player's sound manager stream information. - * @since_tizen 3.0 - * @remarks You can set sound stream information including audio routing and volume type. - * For more details, please refer to sound_manager.h - * - * @param[in] player The handle to the media player - * @param[in] stream_info The sound manager info type - * @return @c 0 on success, - * otherwise a negative error value - * @retval #PLAYER_ERROR_NONE Successful - * @retval #PLAYER_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #PLAYER_ERROR_INVALID_OPERATION Invalid operation - * @retval #PLAYER_ERROR_INVALID_STATE Invalid player state - * @retval #PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE Unsupported feature - * @pre The player state must be set to #PLAYER_STATE_IDLE by calling player_create(). - * @see #sound_stream_info_h - * @see sound_manager_create_stream_information() - * @see sound_manager_destroy_stream_information() - */ -int player_set_audio_policy_info(player_h player, sound_stream_info_h stream_info); - -/** * @brief Sets the audio latency mode. * @since_tizen 2.3 * @remarks The default audio latency mode of the player is #AUDIO_LATENCY_MODE_MID. diff --git a/include/wearable/player.h b/include/wearable/player.h index 5b8bf55..8a1a5a9 100644 --- a/include/wearable/player.h +++ b/include/wearable/player.h @@ -668,28 +668,6 @@ int player_set_sound_type(player_h player, sound_type_e type) TIZEN_DEPRECATED_A int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_info); /** - * @brief Sets the player's sound manager stream information. - * @since_tizen 3.0 - * @remarks You can set sound stream information including audio routing and volume type. - * For more details, please refer to sound_manager.h - * - * @param[in] player The handle to the media player - * @param[in] stream_info The sound manager info type - * @return @c 0 on success, - * otherwise a negative error value - * @retval #PLAYER_ERROR_NONE Successful - * @retval #PLAYER_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #PLAYER_ERROR_INVALID_OPERATION Invalid operation - * @retval #PLAYER_ERROR_INVALID_STATE Invalid player state - * @retval #PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE Unsupported feature - * @pre The player state must be set to #PLAYER_STATE_IDLE by calling player_create(). - * @see #sound_stream_info_h - * @see sound_manager_create_stream_information() - * @see sound_manager_destroy_stream_information() - */ -int player_set_audio_policy_info(player_h player, sound_stream_info_h stream_info); - -/** * @brief Sets the audio latency mode. * @since_tizen 2.3.1 * @remarks The default audio latency mode of the player is #AUDIO_LATENCY_MODE_MID. diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec index b13d38d..e6421be 100644 --- a/packaging/capi-media-player.spec +++ b/packaging/capi-media-player.spec @@ -1,6 +1,6 @@ Name: capi-media-player Summary: A Media Player API -Version: 0.3.39 +Version: 0.3.40 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/player.c b/src/player.c index 701176c..f13b2f0 100644 --- a/src/player.c +++ b/src/player.c @@ -2073,43 +2073,6 @@ int player_set_sound_type(player_h player, sound_type_e type) return ret; } -int player_set_audio_policy_info(player_h player, sound_stream_info_h stream_info) -{ - PLAYER_INSTANCE_CHECK(player); - - muse_player_api_e api = MUSE_PLAYER_API_SET_SOUND_STREAM_INFO; - player_cli_s *pc = (player_cli_s *) player; - char *ret_buf = NULL; - - LOGD("ENTER"); - - bool is_available = false; - - /* check if stream_info is valid */ - int ret = __player_convert_error_code( - sound_manager_is_available_stream_information( - stream_info, NATIVE_API_PLAYER, &is_available), (char *)__FUNCTION__); - - if (ret == PLAYER_ERROR_NONE) { - if (is_available == false) - ret = PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE; - else { - char *stream_type = NULL; - int stream_index = 0; - ret = sound_manager_get_type_from_stream_information(stream_info, &stream_type); - ret = sound_manager_get_index_from_stream_information(stream_info, &stream_index); - if (ret == SOUND_MANAGER_ERROR_NONE) - player_msg_send2(api, pc, ret_buf, ret, STRING, stream_type, INT, stream_index); - else - ret = PLAYER_ERROR_INVALID_OPERATION; - } - } - - g_free(ret_buf); - return ret; - -} - int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_info) { PLAYER_INSTANCE_CHECK(player); -- 2.7.4