Remove unused argument and rename function

__ms_parse_gst_error() is changed to __ms_trigger_error_cb().
Meaningless comments are also removed.

[Version] 0.1.118
[Issue Type] Code cleanup

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

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 3b892bb..1e8c910 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.117
+Version:    0.1.118
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index 8165890..c663490 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -1884,13 +1884,12 @@ GstElement *ms_rtp_element_create(void)
 }
 
 //LCOV_EXCL_START
-static gboolean __ms_parse_gst_error(media_streamer_s *ms_streamer, GstMessage *message, GError *error)
+static void __ms_trigger_error_cb(media_streamer_s *ms_streamer, GError *error)
 {
        media_streamer_error_e ret_error = MEDIA_STREAMER_ERROR_NONE;
 
-       ms_retvm_if(!ms_streamer, FALSE, "ms_streamer is NULL");
-       ms_retvm_if(!message, FALSE, "message is NULL");
-       ms_retvm_if(!error, FALSE, "error is NULL");
+       ms_retm_if(!ms_streamer, "ms_streamer is NULL");
+       ms_retm_if(!error, "error is NULL");
 
        if (error->domain == GST_RESOURCE_ERROR)
                ret_error = MEDIA_STREAMER_ERROR_RESOURCE_CONFLICT;
@@ -1899,15 +1898,12 @@ static gboolean __ms_parse_gst_error(media_streamer_s *ms_streamer, GstMessage *
        else
                ret_error = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
 
-       /* post error to application */
        if (ms_streamer->error_cb.callback) {
                media_streamer_error_cb error_cb = (media_streamer_error_cb) ms_streamer->error_cb.callback;
                error_cb((media_streamer_h) ms_streamer, ret_error, ms_streamer->error_cb.user_data);
        }
 
        ms_error("error[%s], ret[0x%x]", error->message, ret_error);
-
-       return TRUE;
 }
 //LCOV_EXCL_STOP
 
@@ -2050,12 +2046,10 @@ static gboolean __ms_bus_cb(GstBus *bus, GstMessage *message, gpointer userdata)
        case GST_MESSAGE_ERROR:
                gst_message_parse_error(message, &err, &debug);
 
-               /* Transform gst error code to media streamer error code.
-               * then post it to application if needed */
-               __ms_parse_gst_error(ms_streamer, message, err);
-
                ms_error("Error from [%s]: %s", GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))), err->message);
 
+               __ms_trigger_error_cb(ms_streamer, err);
+
                g_error_free(err);
                MS_SAFE_GFREE(debug);
                break;