diff options
| author | Gilbok Lee <gilbok.lee@samsung.com> | 2017-03-30 15:13:48 +0900 |
|---|---|---|
| committer | Gilbok Lee <gilbok.lee@samsung.com> | 2017-03-30 15:13:48 +0900 |
| commit | 22626812ea67f551f47973ea4b8304a0559dcc0b (patch) | |
| tree | 4d9e7e9b63751dcae827647ac37c35c970228515 | |
| parent | 77c4ff2daf8029e23e8699edef5701d7fe5853d4 (diff) | |
| download | libmm-radio-accepted/tizen_ivi.tar.gz libmm-radio-accepted/tizen_ivi.tar.bz2 libmm-radio-accepted/tizen_ivi.zip | |
Add state change timeout on emulatorsubmit/tizen/20170403.050513accepted/tizen/wearable/20170403.125924accepted/tizen/unified/20170403.130130accepted/tizen/mobile/20170403.125706accepted/tizen/ivi/20170403.130040accepted/tizen/common/20170404.142409accepted/tizen_wearableaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_common
[Version] 0.2.23
[Profile] Mobile, Wearable
Change-Id: I734104878cad379cece98606c46fb61be9d3a430
| -rwxr-xr-x | packaging/libmm-radio.spec | 2 | ||||
| -rw-r--r-- | src/mm_radio_priv_emulator.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/libmm-radio.spec b/packaging/libmm-radio.spec index e0a44fd..615747f 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.22 +Version: 0.2.23 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/mm_radio_priv_emulator.c b/src/mm_radio_priv_emulator.c index 19d5c6b..9debc9a 100644 --- a/src/mm_radio_priv_emulator.c +++ b/src/mm_radio_priv_emulator.c @@ -76,7 +76,7 @@ #define EMULATOR_FREQ_MAX 5 #define RADIO_MIN_VOLUME 0.0 #define RADIO_MAX_VOLUME 1.0 - +#define RADIO_GST_STATE_CHANGE_TIMEOUT (10 * GST_SECOND) /*--------------------------------------------------------------------------- LOCAL CONSTANT DEFINITIONS: ---------------------------------------------------------------------------*/ @@ -705,7 +705,7 @@ int _mmradio_start_pipeline(mm_radio_t * radio) return MM_ERROR_RADIO_INVALID_STATE; } - ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE); + ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, RADIO_GST_STATE_CHANGE_TIMEOUT); if (ret_state == GST_STATE_CHANGE_FAILURE) { MMRADIO_LOG_ERROR("GST_STATE_CHANGE_FAILURE"); gst_object_unref(radio->pGstreamer_s->pipeline); @@ -732,7 +732,7 @@ int _mmradio_stop_pipeline(mm_radio_t * radio) return MM_ERROR_RADIO_INVALID_STATE; } - ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE); + ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, RADIO_GST_STATE_CHANGE_TIMEOUT); if (ret_state == GST_STATE_CHANGE_FAILURE) { MMRADIO_LOG_DEBUG("GST_STATE_CHANGE_FAILURE"); gst_object_unref(radio->pGstreamer_s->pipeline); @@ -758,7 +758,7 @@ int _mmradio_destroy_pipeline(mm_radio_t * radio) return MM_ERROR_RADIO_INVALID_STATE; } - ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE); + ret_state = gst_element_get_state(radio->pGstreamer_s->pipeline, NULL, NULL, RADIO_GST_STATE_CHANGE_TIMEOUT); if (ret_state == GST_STATE_CHANGE_FAILURE) { MMRADIO_LOG_DEBUG("GST_STATE_CHANGE_FAILURE"); gst_object_unref(radio->pGstreamer_s->pipeline); |