Change file name - _node_policy_ to _node_dpm_policy_

The name of files and internal APIs are changed
to clarify what it relates.

[Version] 0.1.44
[Issue Type] Naming

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

diff --git a/include/media_streamer_node.h b/include/media_streamer_node.h
index 9e2615e..02d4a18 100644 (file)
--- a/include/media_streamer_node.h
+++ b/include/media_streamer_node.h
@@ -117,7 +117,7 @@ gboolean ms_sink_node_prepare_iter(const GValue *item, GValue *g_ret, gpointer u
 gboolean ms_src_node_prepare_iter(const GValue *item, GValue *g_ret, gpointer user_data);
 gboolean ms_node_resources_acquire_iter(const GValue *item, GValue *ret, gpointer user_data);
 gboolean ms_node_resources_release_iter(const GValue *item, GValue *ret, gpointer user_data);
-gboolean ms_node_policy_check_iter(const GValue *item, GValue *ret, gpointer user_data);
+gboolean ms_node_dpm_policy_check_iter(const GValue *item, GValue *ret, gpointer user_data);
 
 #ifdef __cplusplus
 }

diff --git a/include/media_streamer_node_policy.h b/include/media_streamer_node_dpm_policy.h
similarity index 67%
rename from include/media_streamer_node_policy.h
rename to include/media_streamer_node_dpm_policy.h
index cf4e6ae..d6328ed 100644 (file)
--- a/include/media_streamer_node_policy.h
+++ b/include/media_streamer_node_dpm_policy.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__
-#define __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__
+#ifndef __TIZEN_MEDIA_STREAMER_NODE_DPM_POLICY_H__
+#define __TIZEN_MEDIA_STREAMER_NODE_DPM_POLICY_H__
 
 #include "media_streamer_priv.h"
 
@@ -27,14 +27,14 @@ typedef enum {
        POLICY_TYPE_NONE,
        POLICY_TYPE_CAMERA,
        POLICY_TYPE_MIC,
-} media_streamer_policy_type_e;
+} media_streamer_dpm_policy_type_e;
 
-int ms_node_policy_init(media_streamer_node_s *node);
-int ms_node_policy_deinit(media_streamer_node_s *node);
-int ms_node_policy_check(media_streamer_node_s *node, gboolean *allowed);
+int ms_node_dpm_policy_init(media_streamer_node_s *node);
+int ms_node_dpm_policy_deinit(media_streamer_node_s *node);
+int ms_node_dpm_policy_check(media_streamer_node_s *node, gboolean *allowed);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_NODE_DPM_POLICY_H__ */

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 8ee803a..46f6ffb 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.43
+Version:    0.1.44
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index a897daf..47c05e9 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -20,7 +20,7 @@
 #include <gst/video/videooverlay.h>
 #include "media_streamer_node.h"
 #include "media_streamer_node_resources.h"
-#include "media_streamer_node_policy.h"
+#include "media_streamer_node_dpm_policy.h"
 #include "media_streamer_util.h"
 #include "media_streamer_gst.h"
 
@@ -651,9 +651,9 @@ int ms_src_node_create(media_streamer_node_s *node)
        else
                node->name = gst_element_get_name(node->gst_element);
 
-       ret = ms_node_policy_init(node);
+       ret = ms_node_dpm_policy_init(node);
        if (MEDIA_STREAMER_ERROR_NONE != ret) {
-               ms_error("Failed to init policy for node [%s]", node->name);
+               ms_error("Failed to init DPM policy for node [%s]", node->name);
                return ret;
        }
 
@@ -802,8 +802,8 @@ void ms_node_destroy(media_streamer_node_s *node)
        g_list_free_full(node->sig_list, ms_signal_destroy);
 
        /* Deinitialize policy manager */
-       if (MEDIA_STREAMER_ERROR_NONE != ms_node_policy_deinit(node))
-               ms_error("Failed to deinitialize policy manager");
+       if (MEDIA_STREAMER_ERROR_NONE != ms_node_dpm_policy_deinit(node))
+               ms_error("Failed to deinitialize DPM policy");
 
        MS_SAFE_UNREF(node->gst_element);
        MS_SAFE_FREE(node->name);
@@ -1767,7 +1767,7 @@ gboolean ms_node_resources_release_iter(const GValue *item, GValue *ret, gpointe
        return TRUE;
 }
 
-gboolean ms_node_policy_check_iter(const GValue *item, GValue *ret, gpointer user_data)
+gboolean ms_node_dpm_policy_check_iter(const GValue *item, GValue *ret, gpointer user_data)
 {
        media_streamer_s *ms_streamer = (media_streamer_s *) user_data;
        media_streamer_node_s *node = NULL;
@@ -1795,8 +1795,8 @@ gboolean ms_node_policy_check_iter(const GValue *item, GValue *ret, gpointer use
                return TRUE;
        }
 
-       if (ms_node_policy_check(node, &allowed)) {
-               ms_error("Failed to check policy for node [%s]", node->name);
+       if (ms_node_dpm_policy_check(node, &allowed)) {
+               ms_error("Failed to check DPM policy for node [%s]", node->name);
                /* Note that it should be TRUE(allowed) if the DPM API failed. */
                g_value_set_boolean(ret, TRUE);
                g_object_unref(element);

diff --git a/src/media_streamer_node_policy.c b/src/media_streamer_node_dpm_policy.c
similarity index 90%
rename from src/media_streamer_node_policy.c
rename to src/media_streamer_node_dpm_policy.c
index 8bb8650..f7ef4dd 100644 (file)
--- a/src/media_streamer_node_policy.c
+++ b/src/media_streamer_node_dpm_policy.c
@@ -20,7 +20,7 @@
 #include "media_streamer_gst.h"
 #include "media_streamer_priv.h"
 #include "media_streamer_node.h"
-#include "media_streamer_node_policy.h"
+#include "media_streamer_node_dpm_policy.h"
 
 #define DPM_ALLOWED 1
 #define DPM_DISALLOWED 0
@@ -31,7 +31,7 @@ enum {
        DPM_POLICY_MAX,
 };
 
-static void __ms_node_get_dpm_check_needed(media_streamer_node_s *node, media_streamer_policy_type_e *policy)
+static void __ms_node_get_dpm_check_needed(media_streamer_node_s *node, media_streamer_dpm_policy_type_e *policy)
 {
        int subtype;
 
@@ -63,7 +63,7 @@ static void __ms_node_get_dpm_check_needed(media_streamer_node_s *node, media_st
 }
 
 //LCOV_EXCL_START
-static void __ms_node_policy_changed_cb(const char *name, const char *value, void *user_data)
+static void __ms_node_dpm_policy_changed_cb(const char *name, const char *value, void *user_data)
 {
        media_streamer_node_s *node;
        media_streamer_s *streamer;
@@ -106,9 +106,9 @@ static void __ms_node_policy_changed_cb(const char *name, const char *value, voi
 }
 //LCOV_EXCL_STOP
 
-int ms_node_policy_init(media_streamer_node_s *node)
+int ms_node_dpm_policy_init(media_streamer_node_s *node)
 {
-       media_streamer_policy_type_e policy = POLICY_TYPE_NONE;
+       media_streamer_dpm_policy_type_e policy = POLICY_TYPE_NONE;
        int ret = MEDIA_STREAMER_ERROR_NONE;
        const char *policy_name = NULL;
        static const char* policy_str[DPM_POLICY_MAX] = {"camera", "microphone"};
@@ -140,7 +140,7 @@ int ms_node_policy_init(media_streamer_node_s *node)
        if (node->dpm_handle) {
                int dpm_ret = DPM_ERROR_NONE;
                dpm_ret = dpm_add_policy_changed_cb(node->dpm_handle, policy_name,
-                               __ms_node_policy_changed_cb, (void *)node, &node->policy_changed_cb_id);
+                               __ms_node_dpm_policy_changed_cb, (void *)node, &node->policy_changed_cb_id);
 
                if (dpm_ret != DPM_ERROR_NONE) {
                        ms_error("add DPM changed cb failed, keep going");
@@ -154,9 +154,9 @@ int ms_node_policy_init(media_streamer_node_s *node)
        return ret;
 }
 
-int ms_node_policy_deinit(media_streamer_node_s *node)
+int ms_node_dpm_policy_deinit(media_streamer_node_s *node)
 {
-       media_streamer_policy_type_e policy = POLICY_TYPE_NONE;
+       media_streamer_dpm_policy_type_e policy = POLICY_TYPE_NONE;
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
        ms_debug_fenter();
@@ -187,9 +187,9 @@ int ms_node_policy_deinit(media_streamer_node_s *node)
        return ret;
 }
 
-int ms_node_policy_check(media_streamer_node_s *node, gboolean *allowed)
+int ms_node_dpm_policy_check(media_streamer_node_s *node, gboolean *allowed)
 {
-       media_streamer_policy_type_e policy = POLICY_TYPE_NONE;
+       media_streamer_dpm_policy_type_e policy = POLICY_TYPE_NONE;
        int dpm_state = DPM_ALLOWED;
        int dpm_ret = DPM_ERROR_NONE;
 

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index 7589ae6..0791f5b 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -23,7 +23,7 @@
 #define GST_TIME_TO_MSEC(t) (t == GST_CLOCK_TIME_NONE ? t : (int)(((GstClockTime)(t)) / GST_MSECOND))
 
 static int __ms_change_resources_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
-static int __ms_change_policy_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
+static int __ms_change_dpm_policy_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
 static gboolean __ms_resource_node_find(gpointer key, gpointer value, gpointer user_data);
 static int __ms_resource_release_cb(mm_resource_manager_h rm,
                mm_resource_manager_res_h resource_h, void *user_data);
@@ -38,7 +38,7 @@ int ms_set_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
        ms_retvm_if(ms_streamer->state == state, MEDIA_STREAMER_ERROR_NONE, "Media streamer already in this state");
 
        if (!ms_streamer->is_interrupted) {
-               ret = __ms_change_policy_state(ms_streamer, state);
+               ret = __ms_change_dpm_policy_state(ms_streamer, state);
                if (MEDIA_STREAMER_ERROR_NONE != ret) {
                        ms_error("Failed to change policy state for streamer %p", ms_streamer);
                        return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
@@ -431,7 +431,7 @@ static int __ms_resource_release_cb(mm_resource_manager_h rm,
 }
 //LCOV_EXCL_STOP
 
-static int __ms_check_policy(media_streamer_s *ms_streamer)
+static int __ms_check_dpm_policy(media_streamer_s *ms_streamer)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
@@ -439,11 +439,10 @@ static int __ms_check_policy(media_streamer_s *ms_streamer)
 
        ms_retvm_if(ms_streamer == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "ms_streamer is NULL");
 
-       /* Acquire resources for src bin */
        ret = ms_bin_foreach_elements(GST_BIN(ms_streamer->src_bin),
-               ms_node_policy_check_iter, ms_streamer);
+               ms_node_dpm_policy_check_iter, ms_streamer);
        if (MEDIA_STREAMER_ERROR_NONE != ret) {
-               ms_error("Failed to check policies for src bin");
+               ms_error("Failed to check DPM policies for src bin");
                return ret;
        }
 
@@ -452,7 +451,7 @@ static int __ms_check_policy(media_streamer_s *ms_streamer)
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-static int __ms_change_policy_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
+static int __ms_change_dpm_policy_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
@@ -466,7 +465,7 @@ static int __ms_change_policy_state(media_streamer_s *ms_streamer, media_streame
                switch (ms_streamer->pend_state) {
                case MEDIA_STREAMER_STATE_IDLE:
                        /* After prepare function */
-                       ret = __ms_check_policy(ms_streamer);
+                       ret = __ms_check_dpm_policy(ms_streamer);
                        break;
                case MEDIA_STREAMER_STATE_PAUSED:
                case MEDIA_STREAMER_STATE_PLAYING:

diff --git a/src/media_streamer_util.c b/src/media_streamer_util.c
index 363bc14..7348e4e 100644 (file)
--- a/src/media_streamer_util.c
+++ b/src/media_streamer_util.c
@@ -611,4 +611,4 @@ _DONE:
 
        return ret;
 }
-//LCOV_EXCL_STOP
\ No newline at end of file
+//LCOV_EXCL_STOP