make right return of the set_params

Change-Id: I61494561481d0575012e6fc49382d89a1448ab6b

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
old mode 100755 (executable)
new mode 100644 (file)
index 8430faa..0aeaa64
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer library in Tizen Native API
-Version:    0.1.5
+Version:    0.1.6
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer.c b/src/media_streamer.c
index 7a12e3359bb688a871e5b65ca5cf36e7e893df88..8bd592f184dc7fd0367aa1f6f4089d3047cb1d9e 100644 (file)
--- a/src/media_streamer.c
+++ b/src/media_streamer.c
@@ -655,7 +655,6 @@ int media_streamer_node_set_params(media_streamer_node_h node, bundle *param_lis
        ms_retvm_if(param_list == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "Parameters list is NULL");
 
        ret = __ms_node_set_params_from_bundle(ms_node, param_list);
-       ms_retvm_if(ret != MEDIA_STREAMER_ERROR_NONE, MEDIA_STREAMER_ERROR_INVALID_OPERATION, "Parameters list is NULL");
 
        return ret;
 }

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
old mode 100755 (executable)
new mode 100644 (file)
index b45b142..51221f9
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -725,15 +725,21 @@ int __ms_node_set_params_from_bundle(media_streamer_node_s *node, bundle *param_
                char *string_val = NULL;
                for (list_iter = p_list; list_iter != NULL; list_iter = list_iter->next) {
                        param = (param_s *)list_iter->data;
-                       if (bundle_get_str(param_list, param->param_name, &string_val) != BUNDLE_ERROR_KEY_NOT_AVAILABLE
-                               && __ms_node_set_param_value(node, param, string_val) == MEDIA_STREAMER_ERROR_NONE)
-                               written_count++;
+                       if (bundle_get_str(param_list, param->param_name, &string_val) != BUNDLE_ERROR_KEY_NOT_AVAILABLE) {
+                               ret = __ms_node_set_param_value(node, param, string_val);
+                               if (ret == MEDIA_STREAMER_ERROR_NONE) {
+                                       written_count++;
+                               } else {
+                                       ms_error("failed to set param");
+                                       break;
+                               }
+                       }
                }
        }
        g_list_free(p_list);
 
        ms_info("Set [%d] parameters of [%d]", written_count, bundle_get_count(param_list));
-       if (written_count == 0)
+       if (ret == MEDIA_STREAMER_ERROR_NONE && written_count == 0)
                ret = MEDIA_STREAMER_ERROR_INVALID_PARAMETER;
 
        return ret;