From: Sangchul Lee Date: Mon, 6 Jul 2020 01:43:33 +0000 (+0900) Subject: Compare error value explicitly in sound_manager.c X-Git-Tag: submit/tizen/20200707.024535~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eca8da0a052399a6f0f68ea4eb6daed675ef1911;p=platform%2Fcore%2Fapi%2Fsound-manager.git Compare error value explicitly in sound_manager.c [Version] 0.6.20 [Issue Type] Improvement Change-Id: Iaf3ffdbd9072373478884a02bceb3ce5fd52b100 Signed-off-by: Sangchul Lee --- diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec index ad55e24..029509e 100644 --- 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.6.19 +Version: 0.6.20 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/sound_manager.c b/src/sound_manager.c index 1e9aac1..82c3154 100644 --- a/src/sound_manager.c +++ b/src/sound_manager.c @@ -167,7 +167,7 @@ int sound_manager_create_stream_information(sound_stream_type_e stream_type, sou } LEAVE: - if (ret) + if (ret != SOUND_MANAGER_ERROR_NONE) SM_SAFE_FREE(stream_h); return ret; @@ -319,7 +319,7 @@ int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_fo LOGI(">> enter"); - if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread))) + if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); if (stream_h->is_focus_unavailable) { @@ -389,7 +389,7 @@ int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_fo LOGI(">> enter"); - if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread))) + if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); if (!is_focus_cb_thread) { @@ -450,7 +450,7 @@ int sound_manager_acquire_focus_all(sound_stream_info_h stream_info, int sound_b LOGI(">> enter"); - if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread))) + if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); if (stream_h->is_focus_unavailable) { @@ -519,7 +519,7 @@ int sound_manager_release_focus_all(sound_stream_info_h stream_info, int sound_b LOGI(">> enter"); - if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread))) + if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, &is_focus_watch_cb_thread)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); if (!is_focus_cb_thread) { @@ -601,7 +601,7 @@ int sound_manager_deliver_focus(sound_stream_info_h source, sound_stream_info_h LOGI(">> enter"); - if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL))) + if ((ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); if (is_focus_cb_thread) { @@ -681,7 +681,7 @@ int sound_manager_get_current_playback_focus(sound_stream_focus_change_reason_e LOGI(">> enter"); - if ((mm_ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL))) + if ((mm_ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); if (is_focus_cb_thread) { @@ -690,7 +690,7 @@ int sound_manager_get_current_playback_focus(sound_stream_focus_change_reason_e } mm_ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_PLAYBACK, &stream_type_str, &option, &extra_info_str); - if (mm_ret) + if (mm_ret != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); LOGI("current acquired PLAYBACK focus : stream_type[%s]", stream_type_str); @@ -721,7 +721,7 @@ int sound_manager_get_current_recording_focus(sound_stream_focus_change_reason_e LOGI(">> enter"); - if ((mm_ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL))) + if ((mm_ret = mm_sound_focus_is_cb_thread(&is_focus_cb_thread, NULL)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); if (is_focus_cb_thread) { @@ -730,7 +730,7 @@ int sound_manager_get_current_recording_focus(sound_stream_focus_change_reason_e } mm_ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_RECORDING, &stream_type_str, &option, &extra_info_str); - if (mm_ret) + if (mm_ret != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); LOGI("current acquired RECORDING focus : stream_type[%s]", stream_type_str); @@ -862,7 +862,7 @@ int sound_manager_get_device_type(sound_device_h device, sound_device_type_e *ty SM_ARG_CHECK(device); SM_ARG_CHECK(type); - if ((ret = mm_sound_get_device_type(device, &mm_sound_device_type))) + if ((ret = mm_sound_get_device_type(device, &mm_sound_device_type)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); return _convert_device_type(mm_sound_device_type, type); @@ -876,7 +876,7 @@ int sound_manager_get_device_io_direction(sound_device_h device, sound_device_io SM_ARG_CHECK(device); SM_ARG_CHECK(io_direction); - if ((ret = mm_sound_get_device_io_direction(device, &mm_sound_io_direction))) + if ((ret = mm_sound_get_device_io_direction(device, &mm_sound_io_direction)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, ret); return _convert_device_io_direction(mm_sound_io_direction, io_direction); @@ -943,10 +943,10 @@ int sound_manager_get_supported_sample_formats(sound_device_h device, sound_samp SM_ARG_CHECK(formats); SM_ARG_CHECK(num_of_elems); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_supported_sample_formats(device_id, formats, num_of_elems); @@ -960,10 +960,10 @@ int sound_manager_set_sample_format(sound_device_h device, sound_sample_format_e SM_ARG_CHECK(device); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _set_sample_format(device_id, format); @@ -978,10 +978,10 @@ int sound_manager_get_sample_format(sound_device_h device, sound_sample_format_e SM_ARG_CHECK(device); SM_ARG_CHECK(format); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_sample_format(device_id, format); @@ -997,10 +997,10 @@ int sound_manager_get_supported_sample_rates(sound_device_h device, sound_sample SM_ARG_CHECK(rates); SM_ARG_CHECK(num_of_elems); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_supported_sample_rates(device_id, rates, num_of_elems); @@ -1014,10 +1014,10 @@ int sound_manager_set_sample_rate(sound_device_h device, sound_sample_rate_e rat SM_ARG_CHECK(device); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _set_sample_rate(device_id, rate); @@ -1032,10 +1032,10 @@ int sound_manager_get_sample_rate(sound_device_h device, sound_sample_rate_e *ra SM_ARG_CHECK(device); SM_ARG_CHECK(rate); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_sample_rate(device_id, rate); @@ -1049,10 +1049,10 @@ int sound_manager_set_avoid_resampling(sound_device_h device, bool enable) SM_ARG_CHECK(device); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _set_avoid_resampling(device_id, enable); @@ -1067,10 +1067,10 @@ int sound_manager_get_avoid_resampling(sound_device_h device, bool *enabled) SM_ARG_CHECK(device); SM_ARG_CHECK(enabled); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_avoid_resampling(device_id, enabled); @@ -1084,10 +1084,10 @@ int sound_manager_set_media_stream_only(sound_device_h device, bool enable) SM_ARG_CHECK(device); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _set_media_stream_only(device_id, enable); @@ -1102,10 +1102,10 @@ int sound_manager_get_media_stream_only(sound_device_h device, bool *enabled) SM_ARG_CHECK(device); SM_ARG_CHECK(enabled); - if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION))) + if ((ret = _return_val_if_not_usb_device(device, SOUND_MANAGER_ERROR_INVALID_OPERATION)) != SOUND_MANAGER_ERROR_NONE) return ret; - if ((mm_ret = mm_sound_get_device_id(device, &device_id))) + if ((mm_ret = mm_sound_get_device_id(device, &device_id)) != MM_ERROR_NONE) return _convert_sound_manager_error_code(__func__, mm_ret); return _get_media_stream_only(device_id, enabled);