From: Gilbok Lee Date: Tue, 8 May 2018 10:19:38 +0000 (+0900) Subject: Remove deprecated enumerator and code X-Git-Tag: submit/tizen/20180508.102312^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F178157%2F1;p=platform%2Fcore%2Fapi%2Fradio.git Remove deprecated enumerator and code [Version] 0.1.12 [Profile] Mobile, Wearable [Issue Type] remove deprecated code Change-Id: Ifbebb7999ffbc257e5e4c459c25cbb8569b4c425 --- diff --git a/packaging/capi-media-radio.spec b/packaging/capi-media-radio.spec index ceb488c..b5e3fe7 100644 --- a/packaging/capi-media-radio.spec +++ b/packaging/capi-media-radio.spec @@ -1,6 +1,6 @@ Name: capi-media-radio Summary: A Radio library in Tizen Native API -Version: 0.1.11 +Version: 0.1.12 Release: 1 Group: API/C API License: Apache-2.0 diff --git a/src/radio.c b/src/radio.c index f3cff56..f0c3f58 100644 --- a/src/radio.c +++ b/src/radio.c @@ -132,45 +132,6 @@ static radio_state_e __convert_radio_state(MMRadioStateType state) return converted_state; } -static radio_interrupted_code_e __convert_interrupted_code(int code) -{ - LOGI("[%s] Enter code: %d", __func__, code); - radio_interrupted_code_e ret = RADIO_INTERRUPTED_BY_RESOURCE_CONFLICT; - switch (code) { - case MM_MSG_CODE_INTERRUPTED_BY_CALL_END: - case MM_MSG_CODE_INTERRUPTED_BY_ALARM_END: - case MM_MSG_CODE_INTERRUPTED_BY_EMERGENCY_END: - case MM_MSG_CODE_INTERRUPTED_BY_NOTIFICATION_END: - ret = RADIO_INTERRUPTED_COMPLETED; - break; - case MM_MSG_CODE_INTERRUPTED_BY_MEDIA: - case MM_MSG_CODE_INTERRUPTED_BY_OTHER_PLAYER_APP: - ret = RADIO_INTERRUPTED_BY_MEDIA; - break; - case MM_MSG_CODE_INTERRUPTED_BY_CALL_START: - ret = RADIO_INTERRUPTED_BY_CALL; - break; - case MM_MSG_CODE_INTERRUPTED_BY_EARJACK_UNPLUG: - ret = RADIO_INTERRUPTED_BY_EARJACK_UNPLUG; - break; - case MM_MSG_CODE_INTERRUPTED_BY_ALARM_START: - ret = RADIO_INTERRUPTED_BY_ALARM; - break; - case MM_MSG_CODE_INTERRUPTED_BY_NOTIFICATION_START: - ret = RADIO_INTERRUPTED_BY_NOTIFICATION; - break; - case MM_MSG_CODE_INTERRUPTED_BY_EMERGENCY_START: - ret = RADIO_INTERRUPTED_BY_EMERGENCY; - break; - case MM_MSG_CODE_INTERRUPTED_BY_RESOURCE_CONFLICT: - default: - ret = RADIO_INTERRUPTED_BY_RESOURCE_CONFLICT; - break; - } - LOGE("[%s] interrupted code(%d) => ret(%d)", __FUNCTION__, code, ret); - return ret; -} - static int __set_callback(_radio_event_e type, radio_h radio, void *callback, void *user_data) { RADIO_INSTANCE_CHECK(radio); @@ -224,13 +185,9 @@ static int __msg_callback(int message, void *param, void *user_data) if (msg->union_type == MM_MSG_UNION_STATE) { handle->state = __convert_radio_state(msg->state.current); if (handle->user_cb[_RADIO_EVENT_TYPE_INTERRUPT]) - ((radio_interrupted_cb)handle->user_cb[_RADIO_EVENT_TYPE_INTERRUPT])(__convert_interrupted_code(msg->state.code), handle->user_data[_RADIO_EVENT_TYPE_INTERRUPT]); + ((radio_interrupted_cb)handle->user_cb[_RADIO_EVENT_TYPE_INTERRUPT])(RADIO_INTERRUPTED_BY_RESOURCE_CONFLICT, handle->user_data[_RADIO_EVENT_TYPE_INTERRUPT]); } break; - case MM_MESSAGE_READY_TO_RESUME: - if (handle->user_cb[_RADIO_EVENT_TYPE_INTERRUPT]) - ((radio_interrupted_cb)handle->user_cb[_RADIO_EVENT_TYPE_INTERRUPT])(RADIO_INTERRUPTED_COMPLETED, handle->user_data[_RADIO_EVENT_TYPE_INTERRUPT]); - break; case MM_MESSAGE_ERROR: __convert_error_code(msg->code, (char *)__FUNCTION__); break;