diff options
author | Gilbok Lee <gilbok.lee@samsung.com> | 2017-01-17 17:37:38 +0900 |
---|---|---|
committer | Gilbok Lee <gilbok.lee@samsung.com> | 2017-01-17 17:37:45 +0900 |
commit | ae5d1e1bc033a0e0177e2748ba1a51d39b33435c (patch) | |
tree | ce762c0434d9b3af9fef6e911d6e3457251f8dfd | |
parent | 28cc8320393ff1a2ed570496d2a3b2eb7673f2f1 (diff) | |
parent | 8093452a10d40d764f039b1e2ad276e9e6891a5d (diff) | |
download | libmm-radio-submit/tizen/20170117.085451.tar.gz libmm-radio-submit/tizen/20170117.085451.tar.bz2 libmm-radio-submit/tizen/20170117.085451.zip |
Merge branch 'tizen_3.0' into tizensubmit/tizen/20170117.085451accepted/tizen/wearable/20170118.040602accepted/tizen/mobile/20170118.040528accepted/tizen/ivi/20170118.040616accepted/tizen/common/20170117.174946
Change-Id: I12ab289c12156df43761445f35bb8cdc983be9d8
-rwxr-xr-x | packaging/libmm-radio.spec | 2 | ||||
-rw-r--r-- | src/include/radio_hal_interface.h | 2 | ||||
-rw-r--r-- | src/include/tizen-radio.h | 4 | ||||
-rw-r--r-- | src/radio_hal_interface.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/packaging/libmm-radio.spec b/packaging/libmm-radio.spec index d8619bb..edc364d 100755 --- a/packaging/libmm-radio.spec +++ b/packaging/libmm-radio.spec @@ -1,6 +1,6 @@ Name: libmm-radio Summary: Multimedia Framework Radio Library -Version: 0.2.18 +Version: 0.2.19 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/include/radio_hal_interface.h b/src/include/radio_hal_interface.h index 7662e05..058b52f 100644 --- a/src/include/radio_hal_interface.h +++ b/src/include/radio_hal_interface.h @@ -48,7 +48,7 @@ int radio_hal_stop(mm_radio_hal_interface *radio_handle); int radio_hal_seek(mm_radio_hal_interface *radio_handle, seek_direction_type_t direction); int radio_hal_get_frequency(mm_radio_hal_interface *radio_handle, uint32_t *frequency); int radio_hal_set_frequency(mm_radio_hal_interface *radio_handle, uint32_t frequency); -int radio_hal_get_signal_strength(mm_radio_hal_interface *radio_handle, uint32_t *strength); +int radio_hal_get_signal_strength(mm_radio_hal_interface *radio_handle, int32_t *strength); int radio_hal_mute(mm_radio_hal_interface *radio_handle); int radio_hal_unmute(mm_radio_hal_interface *radio_handle); int radio_hal_set_volume(mm_radio_hal_interface *radio_handle, float volume); diff --git a/src/include/tizen-radio.h b/src/include/tizen-radio.h index db0b67c..4f1493a 100644 --- a/src/include/tizen-radio.h +++ b/src/include/tizen-radio.h @@ -82,7 +82,7 @@ typedef struct radio_interface { radio_error_t (*set_frequency)(void *radio_handle, uint32_t frequency); radio_error_t (*mute)(void *radio_handle); radio_error_t (*unmute)(void *radio_handle); - radio_error_t (*get_signal_strength)(void *radio_handle, uint32_t *strength); + radio_error_t (*get_signal_strength)(void *radio_handle, int32_t *strength); radio_error_t (*get_volume)(void *radio_handle, float *volume); radio_error_t (*set_volume)(void *radio_handle, float volume); radio_error_t (*set_media_volume)(void *radio_handle, uint32_t level); @@ -253,7 +253,7 @@ radio_error_t radio_unmute(void *radio_handle); * @retval #RADIO_ERROR_INVALID_PARAMETER Invalid parameter * @retval #RADIO_ERROR_INVALID_OPERATION Invalid operation */ -radio_error_t radio_get_signal_strength(void *radio_handle, uint32_t *strength); +radio_error_t radio_get_signal_strength(void *radio_handle, int32_t *strength); /** * @brief Gets the radio's current volume. diff --git a/src/radio_hal_interface.c b/src/radio_hal_interface.c index cd62ba9..86b449b 100644 --- a/src/radio_hal_interface.c +++ b/src/radio_hal_interface.c @@ -305,7 +305,7 @@ int radio_hal_set_frequency(mm_radio_hal_interface *radio_handle, uint32_t frequ return MM_ERROR_NONE; } -int radio_hal_get_signal_strength(mm_radio_hal_interface *radio_handle, uint32_t *strength) +int radio_hal_get_signal_strength(mm_radio_hal_interface *radio_handle, int32_t *strength) { radio_error_t ret = RADIO_ERROR_NONE; MMRADIO_CHECK_ARG(radio_handle); |