[0.3.60] modify error checking of sound manager api

Change-Id: Ifbafd4133aac825954dec6b5f893e7457515521f

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 5ee098e..adf0750 100644 (file)
--- 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.59
+Version:    0.3.60
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/player.c b/src/player.c
index 72b2b5e..12e00f7 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -198,142 +198,6 @@ EXIT:
        return ret;
 }
 
-static int __player_convert_error_code(int code, char *func_name)
-{
-       int ret = PLAYER_ERROR_INVALID_OPERATION;
-       char *msg = "PLAYER_ERROR_INVALID_OPERATION";
-       switch (code) {
-       case MM_ERROR_NONE:
-       case MM_ERROR_PLAYER_AUDIO_CODEC_NOT_FOUND:
-       case MM_ERROR_PLAYER_VIDEO_CODEC_NOT_FOUND:
-               ret = PLAYER_ERROR_NONE;
-               msg = "PLAYER_ERROR_NONE";
-               break;
-       case MM_ERROR_INVALID_ARGUMENT:
-               ret = PLAYER_ERROR_INVALID_PARAMETER;
-               msg = "PLAYER_ERROR_INVALID_PARAMETER";
-               break;
-       case MM_ERROR_PLAYER_CODEC_NOT_FOUND:
-       case MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_AUDIO:
-       case MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_VIDEO:
-       case MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_MEDIA_TYPE:
-       case MM_ERROR_PLAYER_NOT_SUPPORTED_FORMAT:
-               ret = PLAYER_ERROR_NOT_SUPPORTED_FILE;
-               msg = "PLAYER_ERROR_NOT_SUPPORTED_FILE";
-               break;
-       case MM_ERROR_PLAYER_INVALID_STATE:
-       case MM_ERROR_PLAYER_NOT_INITIALIZED:
-               ret = PLAYER_ERROR_INVALID_STATE;
-               msg = "PLAYER_ERROR_INVALID_STATE";
-               break;
-       case MM_ERROR_PLAYER_INTERNAL:
-       case MM_ERROR_PLAYER_INVALID_STREAM:
-       case MM_ERROR_PLAYER_STREAMING_FAIL:
-       case MM_ERROR_PLAYER_NO_OP:
-               ret = PLAYER_ERROR_INVALID_OPERATION;
-               msg = "PLAYER_ERROR_INVALID_OPERATION";
-               break;
-       case MM_ERROR_PLAYER_SOUND_EFFECT_INVALID_STATUS:
-       case MM_ERROR_NOT_SUPPORT_API:
-       case MM_ERROR_PLAYER_SOUND_EFFECT_NOT_SUPPORTED_FILTER:
-               ret = PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE;
-               msg = "PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE";
-               break;
-       case MM_ERROR_PLAYER_NO_FREE_SPACE:
-               ret = PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE;
-               msg = "PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE";
-               break;
-       case MM_ERROR_PLAYER_FILE_NOT_FOUND:
-               ret = PLAYER_ERROR_NO_SUCH_FILE;
-               msg = "PLAYER_ERROR_NO_SUCH_FILE";
-               break;
-       case MM_ERROR_PLAYER_SEEK:
-               ret = PLAYER_ERROR_SEEK_FAILED;
-               msg = "PLAYER_ERROR_SEEK_FAILED";
-               break;
-       case MM_ERROR_PLAYER_INVALID_URI:
-       case MM_ERROR_PLAYER_STREAMING_INVALID_URL:
-               ret = PLAYER_ERROR_INVALID_URI;
-               msg = "PLAYER_ERROR_INVALID_URI";
-               break;
-       case MM_ERROR_PLAYER_STREAMING_CONNECTION_FAIL:
-       case MM_ERROR_PLAYER_STREAMING_DNS_FAIL:
-       case MM_ERROR_PLAYER_STREAMING_SERVER_DISCONNECTED:
-       case MM_ERROR_PLAYER_STREAMING_INVALID_PROTOCOL:
-       case MM_ERROR_PLAYER_STREAMING_UNEXPECTED_MSG:
-       case MM_ERROR_PLAYER_STREAMING_OUT_OF_MEMORIES:
-       case MM_ERROR_PLAYER_STREAMING_RTSP_TIMEOUT:
-       case MM_ERROR_PLAYER_STREAMING_BAD_REQUEST:
-       case MM_ERROR_PLAYER_STREAMING_NOT_AUTHORIZED:
-       case MM_ERROR_PLAYER_STREAMING_PAYMENT_REQUIRED:
-       case MM_ERROR_PLAYER_STREAMING_FORBIDDEN:
-       case MM_ERROR_PLAYER_STREAMING_CONTENT_NOT_FOUND:
-       case MM_ERROR_PLAYER_STREAMING_METHOD_NOT_ALLOWED:
-       case MM_ERROR_PLAYER_STREAMING_NOT_ACCEPTABLE:
-       case MM_ERROR_PLAYER_STREAMING_PROXY_AUTHENTICATION_REQUIRED:
-       case MM_ERROR_PLAYER_STREAMING_SERVER_TIMEOUT:
-       case MM_ERROR_PLAYER_STREAMING_GONE:
-       case MM_ERROR_PLAYER_STREAMING_LENGTH_REQUIRED:
-       case MM_ERROR_PLAYER_STREAMING_PRECONDITION_FAILED:
-       case MM_ERROR_PLAYER_STREAMING_REQUEST_ENTITY_TOO_LARGE:
-       case MM_ERROR_PLAYER_STREAMING_REQUEST_URI_TOO_LARGE:
-       case MM_ERROR_PLAYER_STREAMING_PARAMETER_NOT_UNDERSTOOD:
-       case MM_ERROR_PLAYER_STREAMING_CONFERENCE_NOT_FOUND:
-       case MM_ERROR_PLAYER_STREAMING_NOT_ENOUGH_BANDWIDTH:
-       case MM_ERROR_PLAYER_STREAMING_NO_SESSION_ID:
-       case MM_ERROR_PLAYER_STREAMING_METHOD_NOT_VALID_IN_THIS_STATE:
-       case MM_ERROR_PLAYER_STREAMING_HEADER_FIELD_NOT_VALID_FOR_SOURCE:
-       case MM_ERROR_PLAYER_STREAMING_INVALID_RANGE:
-       case MM_ERROR_PLAYER_STREAMING_PARAMETER_IS_READONLY:
-       case MM_ERROR_PLAYER_STREAMING_AGGREGATE_OP_NOT_ALLOWED:
-       case MM_ERROR_PLAYER_STREAMING_ONLY_AGGREGATE_OP_ALLOWED:
-       case MM_ERROR_PLAYER_STREAMING_BAD_TRANSPORT:
-       case MM_ERROR_PLAYER_STREAMING_DESTINATION_UNREACHABLE:
-       case MM_ERROR_PLAYER_STREAMING_INTERNAL_SERVER_ERROR:
-       case MM_ERROR_PLAYER_STREAMING_NOT_IMPLEMENTED:
-       case MM_ERROR_PLAYER_STREAMING_BAD_GATEWAY:
-       case MM_ERROR_PLAYER_STREAMING_SERVICE_UNAVAILABLE:
-       case MM_ERROR_PLAYER_STREAMING_GATEWAY_TIME_OUT:
-       case MM_ERROR_PLAYER_STREAMING_OPTION_NOT_SUPPORTED:
-               ret = PLAYER_ERROR_CONNECTION_FAILED;
-               msg = "PLAYER_ERROR_CONNECTION_FAILED";
-               break;
-       case MM_ERROR_POLICY_BLOCKED:
-       case MM_ERROR_POLICY_INTERRUPTED:
-       case MM_ERROR_POLICY_INTERNAL:
-       case MM_ERROR_POLICY_DUPLICATED:
-               ret = PLAYER_ERROR_SOUND_POLICY;
-               msg = "PLAYER_ERROR_SOUND_POLICY";
-               break;
-       case MM_ERROR_PLAYER_DRM_EXPIRED:
-               ret = PLAYER_ERROR_DRM_EXPIRED;
-               msg = "PLAYER_ERROR_DRM_EXPIRED";
-               break;
-       case MM_ERROR_PLAYER_DRM_NOT_AUTHORIZED:
-       case MM_ERROR_PLAYER_DRM_NO_LICENSE:
-               ret = PLAYER_ERROR_DRM_NO_LICENSE;
-               msg = "PLAYER_ERROR_DRM_NO_LICENSE";
-               break;
-       case MM_ERROR_PLAYER_DRM_FUTURE_USE:
-               ret = PLAYER_ERROR_DRM_FUTURE_USE;
-               msg = "PLAYER_ERROR_DRM_FUTURE_USE";
-               break;
-       case MM_ERROR_PLAYER_DRM_OUTPUT_PROTECTION:
-               ret = PLAYER_ERROR_DRM_NOT_PERMITTED;
-               msg = "PLAYER_ERROR_DRM_NOT_PERMITTED";
-               break;
-       case MM_ERROR_PLAYER_RESOURCE_LIMIT:
-               ret = PLAYER_ERROR_RESOURCE_LIMIT;
-               msg = "PLAYER_ERROR_RESOURCE_LIMIT";
-               break;
-       case MM_ERROR_PLAYER_PERMISSION_DENIED:
-               ret = PLAYER_ERROR_PERMISSION_DENIED;
-               msg = "PLAYER_ERROR_PERMISSION_DENIED";
-       }
-       LOGE("[%s] %s(0x%08x) : core fw error(0x%x)", func_name, msg, ret, code);
-       return ret;
-}
-
 static bool _player_check_network_availability(void)
 {
 #define _FEATURE_NAME_WIFI             "http://tizen.org/feature/network.wifi"
@@ -2302,32 +2166,33 @@ int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_inf
 
        muse_player_api_e api = MUSE_PLAYER_API_SET_SOUND_STREAM_INFO;
        player_cli_s *pc = (player_cli_s *) player;
+       bool is_available = false;
        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__);
+       int ret = sound_manager_is_available_stream_information(stream_info, NATIVE_API_PLAYER, &is_available);
+       if (ret != SOUND_MANAGER_ERROR_NONE) {
+               LOGE("failed to checking available stream info");
+               return PLAYER_ERROR_INVALID_OPERATION;
+       }
 
-       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;
-               }
+       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;
        }
 
+       LOGD("LEAVE ret: 0x%X", ret);
+
        g_free(ret_buf);
        return ret;