Revise internal function names to have consistency

Previously, there were __ms_create() and __ms_streamer_destroy().
Only __mm_streamer_seek() and __ms_streamer_destroy() use the prefix
of "_streamer_" in the media_streamer_priv.h[c] files.

[Version] 0.1.31
[Issue Type] Refactory

Change-Id: I16cf48b8fb2dae88007b14564dfda88f2fd9ed59
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h
index b8836f8..c977c2d 100644 (file)
--- a/include/media_streamer_priv.h
+++ b/include/media_streamer_priv.h
@@ -170,14 +170,14 @@ int __ms_get_duration(media_streamer_s *ms_streamer, int *time);
  *
  * @since_tizen 3.0
  */
-int __ms_streamer_seek(media_streamer_s *ms_streamer, int time, bool flag);
+int __ms_seek(media_streamer_s *ms_streamer, int time, bool flag);
 
 /**
  * @brief Destroys media streamer structure.
  *
  * @since_tizen 3.0
  */
-int __ms_streamer_destroy(media_streamer_s *ms_streamer);
+int __ms_destroy(media_streamer_s *ms_streamer);
 
 /**
  * @brief Creates media streamer structure.

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 78d8c28..f3293ce 100644 (file)
--- 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.30
+Version:    0.1.31
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer.c b/src/media_streamer.c
index c1e5251..149b362 100644 (file)
--- a/src/media_streamer.c
+++ b/src/media_streamer.c
@@ -295,7 +295,7 @@ int media_streamer_create(media_streamer_h *streamer)
        if (ret != MEDIA_STREAMER_ERROR_NONE) {
                ms_error("Error creating Media Streamer");
                g_mutex_unlock(&ms_streamer->mutex_lock);
-               __ms_streamer_destroy(ms_streamer);
+               __ms_destroy(ms_streamer);
 
                return ret;
        }
@@ -323,7 +323,7 @@ int media_streamer_destroy(media_streamer_h streamer)
        ms_retvm_if(ms_streamer == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "streamer is NULL");
        ms_retvm_if(ms_streamer->state > MEDIA_STREAMER_STATE_IDLE, MEDIA_STREAMER_ERROR_INVALID_STATE, "Error: Media streamer must be unprepared before destroying!");
 
-       ret = __ms_streamer_destroy(ms_streamer);
+       ret = __ms_destroy(ms_streamer);
 
        ms_debug_fleave();
 
@@ -588,7 +588,7 @@ int media_streamer_stop(media_streamer_h streamer)
 
        g_mutex_lock(&ms_streamer->mutex_lock);
 
-       ret = __ms_streamer_seek(streamer, 0, FALSE);
+       ret = __ms_seek(streamer, 0, FALSE);
 
        if (ret != MEDIA_STREAMER_ERROR_NONE)
                ms_error("Error while putting media streamer to zero playing position");
@@ -644,7 +644,7 @@ int media_streamer_set_play_position(media_streamer_h streamer, int time, bool a
                ms_streamer->seek_done_cb.callback = callback;
                ms_streamer->seek_done_cb.user_data = user_data;
 
-               ret = __ms_streamer_seek(streamer, time, accurate);
+               ret = __ms_seek(streamer, time, accurate);
        } else
                ret = MEDIA_STREAMER_ERROR_NOT_SUPPORTED;
 

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index 9d42f0b..e1c7c9f 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -166,7 +166,7 @@ int __ms_get_duration(media_streamer_s *ms_streamer, int *time)
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-int __ms_streamer_seek(media_streamer_s *ms_streamer, int g_time, bool flag)
+int __ms_seek(media_streamer_s *ms_streamer, int g_time, bool flag)
 {
        GstSeekFlags seek_flag;
 
@@ -193,7 +193,7 @@ int __ms_streamer_seek(media_streamer_s *ms_streamer, int g_time, bool flag)
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-int __ms_streamer_destroy(media_streamer_s *ms_streamer)
+int __ms_destroy(media_streamer_s *ms_streamer)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;