Move internal functions to the proper place

Missing static directives are also added.
Change include syntax to use quotation mark
only for the headers of this library.

[Version] 0.1.29
[Issue Type] Refactory

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

diff --git a/include/media_streamer_gst.h b/include/media_streamer_gst.h
index 9f3d083..b9d1494 100644 (file)
--- a/include/media_streamer_gst.h
+++ b/include/media_streamer_gst.h
@@ -15,8 +15,7 @@
  */
 
 #include <gst/gst.h>
-
-#include <media_streamer_priv.h>
+#include "media_streamer_priv.h"
 
 #define DOT_FILE_NAME "streamer"
 
@@ -46,13 +45,6 @@
 void __ms_generate_dots(GstElement *bin, gchar *name_tag);
 
 /**
- * @brief Gets Node`s information by its type.
- *
- * @since_tizen 3.0
- */
-node_info_s *__ms_node_get_klass_by_its_type(media_streamer_node_type_e element_type);
-
-/**
  * @brief Link two elements.
  *
  * @since_tizen 3.0
@@ -192,6 +184,13 @@ gboolean __ms_element_lock_state(const GValue *item, GValue *ret, gpointer user_
 gboolean __ms_element_unlock_state(const GValue *item, GValue *ret, gpointer user_data);
 
 /**
+ * @brief Gets state of media streamer.
+ *
+ * @since_tizen 3.0
+ */
+void __ms_get_state(media_streamer_s *ms_streamer);
+
+/**
  * @brief Creates pipeline, bus and src/sink/transform bins.
  *
  * @since_tizen 3.0
@@ -199,6 +198,21 @@ gboolean __ms_element_unlock_state(const GValue *item, GValue *ret, gpointer use
 int __ms_pipeline_create(media_streamer_s *ms_streamer);
 
 /**
+ * @brief Prepares Media Streamer pipeline and autoplug nodes if needed.
+ *
+ * @since_tizen 3.0
+ */
+int __ms_pipeline_prepare(media_streamer_s *ms_streamer);
+
+/**
+ * @brief Unprepares Media Streamer pipeline and unlink nodes
+ *        which user did't link before.
+ *
+ * @since_tizen 3.0
+ */
+int __ms_pipeline_unprepare(media_streamer_s *ms_streamer);
+
+/**
  * @brief Adds node to bin
  *
  * @since_tizen 3.0

diff --git a/include/media_streamer_http_server.h b/include/media_streamer_http_server.h
index 32d3ebc..d7855dd 100644 (file)
--- a/include/media_streamer_http_server.h
+++ b/include/media_streamer_http_server.h
@@ -18,7 +18,7 @@
 #ifndef __MEDIA_STREAMER_HTTP_H__
 #define __MEDIA_STREAMER_HTTP_H__
 
-#include <media_streamer.h>
+#include "media_streamer.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/media_streamer_node.h b/include/media_streamer_node.h
index 5c441b8..b2d13d1 100644 (file)
--- a/include/media_streamer_node.h
+++ b/include/media_streamer_node.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <media_streamer_priv.h>
+#include "media_streamer_priv.h"
 
 /**
- * @brief Gets state of media streamer.
+ * @brief Gets Node's information by its type.
  *
  * @since_tizen 3.0
  */
-void __ms_get_state(media_streamer_s *ms_streamer);
+node_info_s *__ms_node_get_klass_by_its_type(media_streamer_node_type_e element_type);
 
 /**
  * @brief Creates media streamer node using input and output format.
@@ -66,21 +66,6 @@ int __ms_node_insert_into_table(GHashTable *nodes_table, media_streamer_node_s *
 void __ms_node_remove_from_table(void *data);
 
 /**
- * @brief Prepares Media Streamer pipeline and autoplug nodes if needed.
- *
- * @since_tizen 3.0
- */
-int __ms_pipeline_prepare(media_streamer_s *ms_streamer);
-
-/**
- * @brief Unprepares Media Streamer pipeline and unlink nodes
- *        which user did't link before.
- *
- * @since_tizen 3.0
- */
-int __ms_pipeline_unprepare(media_streamer_s *ms_streamer);
-
-/**
  * @brief Reads node parameters from user's bundle object.
  *
  * @since_tizen 3.0

diff --git a/include/media_streamer_node_policy.h b/include/media_streamer_node_policy.h
index 5f9adef..61fd37b 100644 (file)
--- a/include/media_streamer_node_policy.h
+++ b/include/media_streamer_node_policy.h
@@ -17,7 +17,7 @@
 #ifndef __MEDIA_STREAMER_NODE_POLICY_H__
 #define __MEDIA_STREAMER_NODE_POLICY_H__
 
-#include <media_streamer_priv.h>
+#include "media_streamer_priv.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/media_streamer_node_resources.h b/include/media_streamer_node_resources.h
index e13aed3..e63b7dd 100644 (file)
--- a/include/media_streamer_node_resources.h
+++ b/include/media_streamer_node_resources.h
@@ -17,7 +17,7 @@
 #ifndef __MEDIA_STREAMER_NODE_RESOURCE_H__
 #define __MEDIA_STREAMER_NODE_RESOURCE_H__
 
-#include <media_streamer_priv.h>
+#include "media_streamer_priv.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h
index 8c3c2e4..b8836f8 100644 (file)
--- a/include/media_streamer_priv.h
+++ b/include/media_streamer_priv.h
@@ -25,11 +25,10 @@ extern "C" {
 #include <gst/gst.h>
 #include <stdio.h>
 #include <restriction.h>
-
-#include <media_streamer.h>
-#include <media_streamer_util.h>
 #include <mm_resource_manager.h>
-#include <media_streamer_http_server.h>
+#include "media_streamer.h"
+#include "media_streamer_util.h"
+#include "media_streamer_http_server.h"
 
 struct media_streamer_node_s;
 

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 7acc25b..dd27a67 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.28
+Version:    0.1.29
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer.c b/src/media_streamer.c
index f728561..c1e5251 100644 (file)
--- a/src/media_streamer.c
+++ b/src/media_streamer.c
@@ -16,13 +16,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-
 #include <dlog.h>
-
-#include <media_streamer.h>
-#include <media_streamer_priv.h>
-#include <media_streamer_node.h>
-#include <media_streamer_gst.h>
+#include "media_streamer.h"
+#include "media_streamer_priv.h"
+#include "media_streamer_node.h"
+#include "media_streamer_gst.h"
 
 /*
 * Public Implementation

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index c491b20..dd9e5b2 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -15,7 +15,8 @@
  */
 
 #include <bundle.h>
-#include <media_streamer_gst.h>
+#include "media_streamer_gst.h"
+#include "media_streamer_node.h"
 
 #define MS_PADS_UNLINK(pad, peer) GST_PAD_IS_SRC(pad) ? \
                gst_pad_unlink(pad, peer) : \

diff --git a/src/media_streamer_http_server.c b/src/media_streamer_http_server.c
index 79272a8..5f59675 100644 (file)
--- a/src/media_streamer_http_server.c
+++ b/src/media_streamer_http_server.c
@@ -18,14 +18,11 @@
 #include <libsoup/soup.h>
 #include <mime_type.h>
 #include <string.h>
-
 #include <fcntl.h>
 #include <sys/stat.h>
-
-#include <media_streamer.h>
-#include <media_streamer_util.h>
-
-#include <media_streamer_http_server.h>
+#include "media_streamer.h"
+#include "media_streamer_util.h"
+#include "media_streamer_http_server.h"
 
 #define HTTP_SERVER_LOG_LEVEL AD_LOG_DEBUG
 

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index 00e6a2c..e75a856 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-#include <media_streamer_node.h>
-#include <media_streamer_node_resources.h>
-#include <media_streamer_node_policy.h>
-#include <media_streamer_util.h>
-#include <media_streamer_gst.h>
 #include <cynara-client.h>
 #include <system_info.h>
 #include <Evas.h>
@@ -26,6 +21,11 @@
 #include <Ecore_Wl2.h>
 #include <tizen-extension-client-protocol.h>
 #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_util.h"
+#include "media_streamer_gst.h"
 
 #define SMACK_LABEL_LEN 255
 #define DEFAULT_URI_SCHEME_LENGTH 10

diff --git a/src/media_streamer_node_policy.c b/src/media_streamer_node_policy.c
index 0556dd7..b90d777 100644 (file)
--- a/src/media_streamer_node_policy.c
+++ b/src/media_streamer_node_policy.c
@@ -16,11 +16,11 @@
 
 #include <gst/gst.h>
 #include <restriction.h>
-
-#include <media_streamer_node_policy.h>
-#include <media_streamer.h>
-#include <media_streamer_priv.h>
-#include <media_streamer_node.h>
+#include "media_streamer.h"
+#include "media_streamer_gst.h"
+#include "media_streamer_priv.h"
+#include "media_streamer_node.h"
+#include "media_streamer_node_policy.h"
 
 #define DPM_ALLOWED 1
 #define DPM_DISALLOWED 0

diff --git a/src/media_streamer_node_resources.c b/src/media_streamer_node_resources.c
index d92e31c..ac23b6a 100644 (file)
--- a/src/media_streamer_node_resources.c
+++ b/src/media_streamer_node_resources.c
@@ -15,14 +15,12 @@
  */
 
 #include <gst/gst.h>
-
 #include <system_info.h>
-
-#include <media_streamer_node_resources.h>
-#include <media_streamer.h>
-#include <media_streamer_priv.h>
-#include <media_streamer_node.h>
 #include <mm_resource_manager.h>
+#include "media_streamer.h"
+#include "media_streamer_priv.h"
+#include "media_streamer_node.h"
+#include "media_streamer_node_resources.h"
 
 static gboolean __ms_node_resources_is_needed_by_platform(media_streamer_node_s *node)
 {

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index 9c45253..d1fb279 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
+#include <mm_resource_manager.h>
 #include "media_streamer_priv.h"
 #include "media_streamer_util.h"
 #include "media_streamer_node.h"
 #include "media_streamer_gst.h"
-#include <mm_resource_manager.h>
 
 #define GST_TIME_TO_MSEC(t) (t == GST_CLOCK_TIME_NONE ? t : (int)(((GstClockTime)(t)) / GST_MSECOND))
 
-int __ms_change_resources_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
-int __ms_change_policy_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
+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 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);
@@ -312,7 +312,7 @@ int __ms_release_resources(media_streamer_s *ms_streamer)
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-int __ms_change_resources_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
+static int __ms_change_resources_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
@@ -431,7 +431,7 @@ static int __ms_resource_release_cb(mm_resource_manager_h rm,
 }
 //LCOV_EXCL_STOP
 
-int __ms_check_policy(media_streamer_s *ms_streamer)
+static int __ms_check_policy(media_streamer_s *ms_streamer)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
@@ -452,7 +452,7 @@ int __ms_check_policy(media_streamer_s *ms_streamer)
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-int __ms_change_policy_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)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 

diff --git a/src/media_streamer_util.c b/src/media_streamer_util.c
index 8428b95..f089962 100644 (file)
--- a/src/media_streamer_util.c
+++ b/src/media_streamer_util.c
@@ -15,13 +15,11 @@
  */
 
 #include <glib/gstdio.h>
-
-#include <media_streamer.h>
-#include <media_streamer_priv.h>
-#include <media_streamer_util.h>
-
 #include <fcntl.h>
 #include <sys/stat.h>
+#include "media_streamer.h"
+#include "media_streamer_priv.h"
+#include "media_streamer_util.h"
 
 static const format_s format_table[] = {
        /* Audio - ENCODED */