diff options
author | Gilbok Lee <gilbok.lee@samsung.com> | 2016-11-11 16:55:30 +0900 |
---|---|---|
committer | Gilbok Lee <gilbok.lee@samsung.com> | 2016-11-11 16:55:30 +0900 |
commit | a5dbc4ce0c5a80a2fb694b83af2376daf54da0d9 (patch) | |
tree | 8072eab027999f8078016b435a4db72919e0abce | |
parent | 567c90e4a2d567e48902f4fffdd59c4d4cda6a73 (diff) | |
download | libmm-radio-a5dbc4ce0c5a80a2fb694b83af2376daf54da0d9.tar.gz libmm-radio-a5dbc4ce0c5a80a2fb694b83af2376daf54da0d9.tar.bz2 libmm-radio-a5dbc4ce0c5a80a2fb694b83af2376daf54da0d9.zip |
Fix typo error and log
[Version] 0.2.10
[Profile] Mobile, Wearable
[Issue Type] Fix typo error
Change-Id: Ie336224355c8c068756533b01d531c4c373c6a68
-rwxr-xr-x | packaging/libmm-radio.spec | 2 | ||||
-rw-r--r-- | src/include/mm_radio.h | 2 | ||||
-rw-r--r-- | src/mm_radio.c | 1 | ||||
-rw-r--r-- | src/mm_radio_priv_emulator.c | 21 | ||||
-rw-r--r-- | src/mm_radio_priv_hal.c | 12 | ||||
-rw-r--r-- | src/radio_hal_interface.c | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/packaging/libmm-radio.spec b/packaging/libmm-radio.spec index 7ccdf9a..68cd850 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.9 +Version: 0.2.10 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/include/mm_radio.h b/src/include/mm_radio.h index 68db5a7..00052f6 100644 --- a/src/include/mm_radio.h +++ b/src/include/mm_radio.h @@ -3459,7 +3459,7 @@ int mm_radio_get_region_frequency_range(MMHandleType hradio, unsigned int *min, int mm_radio_get_channel_spacing(MMHandleType hradio, int *channel_spacing); /** - * This function is to get volume + * This function is to set volume * * @param hradio [in] Handle of radio. * @param volume [in] volume value (0 ~ 1.0) diff --git a/src/mm_radio.c b/src/mm_radio.c index 2453af1..62cd24b 100644 --- a/src/mm_radio.c +++ b/src/mm_radio.c @@ -528,7 +528,6 @@ int mm_radio_get_volume(MMHandleType hradio, float *pVolume) MMRADIO_CMD_LOCK(radio); result = _mmradio_get_volume(radio, &volume); - if (result == MM_ERROR_NONE) *pVolume = volume; diff --git a/src/mm_radio_priv_emulator.c b/src/mm_radio_priv_emulator.c index 5363daf..3c7f67d 100644 --- a/src/mm_radio_priv_emulator.c +++ b/src/mm_radio_priv_emulator.c @@ -597,7 +597,6 @@ int _mmradio_start(mm_radio_t * radio) /* if( _mmradio_unmute(radio) != MM_ERROR_NONE) */ /* return MM_ERROR_RADIO_NOT_INITIALIZED; */ - MMRADIO_SET_STATE(radio, MM_RADIO_STATE_PLAYING); #ifdef USE_GST_PIPELINE ret = _mmradio_start_pipeline(radio); if (ret) { @@ -606,6 +605,8 @@ int _mmradio_start(mm_radio_t * radio) } #endif + MMRADIO_SET_STATE(radio, MM_RADIO_STATE_PLAYING); + MMRADIO_LOG_FLEAVE(); return ret; @@ -684,7 +685,7 @@ int _mmradio_realize_pipeline(mm_radio_t * radio) radio->pGstreamer_s->volume, radio->pGstreamer_s->audiosink, NULL)) { - MMRADIO_LOG_DEBUG("Fail to link b/w appsrc and ffmpeg in rotate\n"); + MMRADIO_LOG_DEBUG("Fail to link error (src - queue - volue - sink)\n"); return MM_ERROR_RADIO_NOT_INITIALIZED; } MMRADIO_LOG_FLEAVE(); @@ -699,7 +700,7 @@ int _mmradio_start_pipeline(mm_radio_t * radio) MMRADIO_LOG_FENTER(); if (gst_element_set_state(radio->pGstreamer_s->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) { - MMRADIO_LOG_DEBUG("Fail to change pipeline state"); + MMRADIO_LOG_ERROR("Fail to change pipeline state"); gst_object_unref(radio->pGstreamer_s->pipeline); g_free(radio->pGstreamer_s); return MM_ERROR_RADIO_INVALID_STATE; @@ -707,7 +708,7 @@ int _mmradio_start_pipeline(mm_radio_t * radio) ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE); if (ret_state == GST_STATE_CHANGE_FAILURE) { - MMRADIO_LOG_DEBUG("GST_STATE_CHANGE_FAILURE"); + MMRADIO_LOG_ERROR("GST_STATE_CHANGE_FAILURE"); gst_object_unref(radio->pGstreamer_s->pipeline); g_free(radio->pGstreamer_s); return MM_ERROR_RADIO_INVALID_STATE; @@ -1480,18 +1481,18 @@ int _mmradio_set_volume(mm_radio_t *radio, float volume) MMRADIO_SLOG_DEBUG("Setting %f volume", volume); - if (radio->radio_fd < 0) { - MMRADIO_LOG_DEBUG("radio device is not opened yet\n"); - radio->local_volume = volume; - return MM_ERROR_NONE; - } - /* check volume range */ if (volume < RADIO_MIN_VOLUME || volume > RADIO_MAX_VOLUME) { MMRADIO_LOG_ERROR("out of volume range"); return MM_ERROR_INVALID_ARGUMENT; } + if (radio->radio_fd < 0) { + MMRADIO_LOG_DEBUG("radio device is not opened yet\n"); + radio->local_volume = volume; + return MM_ERROR_NONE; + } + radio->local_volume = volume; #ifdef USE_GST_PIPELINE diff --git a/src/mm_radio_priv_hal.c b/src/mm_radio_priv_hal.c index 8880da4..09c5229 100644 --- a/src/mm_radio_priv_hal.c +++ b/src/mm_radio_priv_hal.c @@ -135,7 +135,7 @@ static void __mmradio_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_t #endif static void __mmradio_volume_changed_cb(volume_type_t type, unsigned int volume, void *user_data); -int __mmradio_set_total_volume(mm_radio_t *radio); +static int __mmradio_set_total_volume(mm_radio_t *radio); int _mmradio_apply_region(mm_radio_t *radio, MMRadioRegionType region, bool update) { @@ -545,7 +545,6 @@ int _mmradio_start(mm_radio_t *radio) } ret = mm_sound_volume_get_value(VOLUME_TYPE_MEDIA, &volume); - if (ret != MM_ERROR_NONE) MMRADIO_LOG_WARNING("failed to get MEDIA_VOLUME"); @@ -555,9 +554,9 @@ int _mmradio_start(mm_radio_t *radio) ret = __mmradio_set_total_volume(radio); if (ret == MM_ERROR_NOT_SUPPORT_API) { - MMRADIO_LOG_WARNING("radio_hal_start is not supported"); + MMRADIO_LOG_WARNING("radio_hal_set_volume is not supported"); } else if (ret) { - MMRADIO_LOG_ERROR("failed to radio_hal_start\n"); + MMRADIO_LOG_ERROR("failed to radio_hal_set_volume\n"); goto error1; } @@ -617,7 +616,7 @@ int _mmradio_stop(mm_radio_t *radio) #ifdef TIZEN_FEATURE_SOUND_VSTREAM ret = sound_manager_stop_virtual_stream(radio->vstream); if (ret != MM_ERROR_NONE) { - MMRADIO_LOG_ERROR("failed to set sound focus"); + MMRADIO_LOG_ERROR("failed to stop virtual_stream"); return ret; } #endif @@ -638,6 +637,7 @@ int _mmradio_stop(mm_radio_t *radio) MMRADIO_LOG_ERROR("radio_hal_close_device error"); return ret; } + ret = radio_hal_unprepare(radio->hal_inf); if (ret == MM_ERROR_NOT_SUPPORT_API) { MMRADIO_LOG_WARNING("radio_hal_unprepare is not supported"); @@ -1443,7 +1443,7 @@ static void __mmradio_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_t } #endif -int __mmradio_set_total_volume(mm_radio_t *radio) +static int __mmradio_set_total_volume(mm_radio_t *radio) { int ret = MM_ERROR_NONE; float total_volume = 0.0f; diff --git a/src/radio_hal_interface.c b/src/radio_hal_interface.c index fe7e587..adc1bf2 100644 --- a/src/radio_hal_interface.c +++ b/src/radio_hal_interface.c @@ -358,7 +358,7 @@ int radio_hal_set_volume(mm_radio_hal_interface *radio_handle, float volume) if (ret != RADIO_ERROR_NONE) return __convert_error_code(ret, (char *)__FUNCTION__); } else { - MMRADIO_LOG_WARNING("radio_hal unmute is NULL"); + MMRADIO_LOG_WARNING("radio_hal set_volume is NULL"); return MM_ERROR_NOT_SUPPORT_API; } return MM_ERROR_NONE; @@ -374,7 +374,7 @@ int radio_hal_get_volume(mm_radio_hal_interface *radio_handle, float *volume) if (ret != RADIO_ERROR_NONE) return __convert_error_code(ret, (char *)__FUNCTION__); } else { - MMRADIO_LOG_WARNING("radio_hal unmute is NULL"); + MMRADIO_LOG_WARNING("radio_hal get_volume is NULL"); return MM_ERROR_NOT_SUPPORT_API; } return MM_ERROR_NONE; |