From 204c0a925e2226522cb422dd19d8999ca2f81ca7 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Mon, 25 May 2020 20:35:19 +0900 Subject: [PATCH] Change function name - ms_state_change() to ms_set_state() [Version] 0.1.42 [Issue Type] Naming Change-Id: I6a32b0b4ba74034ba761d3183c70e347220f8e82 Signed-off-by: Sangchul Lee --- include/media_streamer_priv.h | 4 ++-- packaging/capi-media-streamer.spec | 2 +- src/media_streamer.c | 8 ++++---- src/media_streamer_gst.c | 4 ++-- src/media_streamer_priv.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h index f066325..4fcece7 100644 --- a/include/media_streamer_priv.h +++ b/include/media_streamer_priv.h @@ -156,9 +156,9 @@ int ms_destroy(media_streamer_s *ms_streamer); int ms_create(media_streamer_s *ms_streamer); /** - * @brief Changes state of media streamer. + * @brief Set state of media streamer. */ -int ms_state_change(media_streamer_s *ms_streamer, media_streamer_state_e state); +int ms_set_state(media_streamer_s *ms_streamer, media_streamer_state_e state); int ms_release_resources(media_streamer_s *ms_streamer); diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec index ec454cc..6dc4809 100644 --- a/packaging/capi-media-streamer.spec +++ b/packaging/capi-media-streamer.spec @@ -1,6 +1,6 @@ Name: capi-media-streamer Summary: A Media Streamer API -Version: 0.1.41 +Version: 0.1.42 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_streamer.c b/src/media_streamer.c index 94eb85b..b255ac8 100644 --- a/src/media_streamer.c +++ b/src/media_streamer.c @@ -263,7 +263,7 @@ int media_streamer_play(media_streamer_h streamer) g_mutex_lock(&ms_streamer->mutex_lock); - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_PLAYING); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_PLAYING); g_mutex_unlock(&ms_streamer->mutex_lock); @@ -301,7 +301,7 @@ int media_streamer_create(media_streamer_h *streamer) } ms_streamer->pend_state = MEDIA_STREAMER_STATE_NONE; - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_IDLE); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_IDLE); *streamer = ms_streamer; g_mutex_unlock(&ms_streamer->mutex_lock); @@ -565,7 +565,7 @@ int media_streamer_pause(media_streamer_h streamer) g_mutex_lock(&ms_streamer->mutex_lock); - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_PAUSED); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_PAUSED); g_mutex_unlock(&ms_streamer->mutex_lock); @@ -593,7 +593,7 @@ int media_streamer_stop(media_streamer_h streamer) if (ret != MEDIA_STREAMER_ERROR_NONE) ms_error("Error while putting media streamer to zero playing position"); else - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_PAUSED); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_PAUSED); ms_http_server_stop(ms_streamer->http_server); diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c index 7a7c712..1bd258e 100644 --- a/src/media_streamer_gst.c +++ b/src/media_streamer_gst.c @@ -2216,7 +2216,7 @@ int ms_pipeline_prepare(media_streamer_s *ms_streamer) goto prepare_fail; } - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_READY); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_READY); if (ret != MEDIA_STREAMER_ERROR_NONE) goto prepare_fail; @@ -2238,7 +2238,7 @@ int ms_pipeline_unprepare(media_streamer_s *ms_streamer) ms_retvm_if(ms_streamer == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "Handle is NULL"); ms_retvm_if(ms_streamer->nodes_table == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "ms_streamer->nodes_table is NULL"); - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_IDLE); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_IDLE); if (ret != MEDIA_STREAMER_ERROR_NONE) ms_error("Failed to unprepare pipeline"); diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c index cd62948..7589ae6 100644 --- a/src/media_streamer_priv.c +++ b/src/media_streamer_priv.c @@ -28,7 +28,7 @@ static gboolean __ms_resource_node_find(gpointer key, gpointer value, gpointer u static int __ms_resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h resource_h, void *user_data); -int ms_state_change(media_streamer_s *ms_streamer, media_streamer_state_e state) +int ms_set_state(media_streamer_s *ms_streamer, media_streamer_state_e state) { int ret = MEDIA_STREAMER_ERROR_NONE; @@ -203,7 +203,7 @@ int ms_destroy(media_streamer_s *ms_streamer) g_mutex_lock(&ms_streamer->mutex_lock); - ret = ms_state_change(ms_streamer, MEDIA_STREAMER_STATE_NONE); + ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_NONE); MS_TABLE_SAFE_UNREF(ms_streamer->nodes_table); MS_SAFE_UNREF(ms_streamer->bus); -- 2.7.4