Add file path to mm_wfd_sink_create parameter

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Ic708116b09405cf1363f24fb4ea90961b5475ee2

diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec
old mode 100755 (executable)
new mode 100644 (file)
index 8f0a6ba..53643d0
--- a/packaging/libmm-wfd.spec
+++ b/packaging/libmm-wfd.spec
@@ -1,6 +1,6 @@
 Name:       libmm-wfd
 Summary:    Multimedia Framework Wifi-Display Library
-Version:    0.2.196
+Version:    0.2.197
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_wfd_sink.h b/src/include/mm_wfd_sink.h
old mode 100755 (executable)
new mode 100644 (file)
index 620324f..806e1cc
--- a/src/include/mm_wfd_sink.h
+++ b/src/include/mm_wfd_sink.h
@@ -78,7 +78,7 @@ typedef void(*MMWFDMessageCallback)(int error_type, MMWFDSinkStateType state_typ
  *
  * @par Example
  * @code
-if (mm_wfd_sink_create(&g_wfd_sink) != MM_ERROR_NONE)
+if (mm_wfd_sink_create(&g_wfd_sink_handle) != MM_ERROR_NONE)
 {
        wfd_sink_error("failed to create wi-fi display sink\n");
 }

diff --git a/src/include/mm_wfd_sink_ini.h b/src/include/mm_wfd_sink_ini.h
old mode 100755 (executable)
new mode 100644 (file)
index f1122ce..40102a8
--- a/src/include/mm_wfd_sink_ini.h
+++ b/src/include/mm_wfd_sink_ini.h
@@ -341,7 +341,7 @@ hdcp port no=0\n\
 "
 
 int
-mm_wfd_sink_ini_load(mm_wfd_sink_ini_t *ini);
+mm_wfd_sink_ini_load(mm_wfd_sink_ini_t *ini, const char *path);
 
 int
 mm_wfd_sink_ini_unload(mm_wfd_sink_ini_t *ini);

diff --git a/src/include/mm_wfd_sink_priv.h b/src/include/mm_wfd_sink_priv.h
old mode 100755 (executable)
new mode 100644 (file)
index 2a0d20b..dd10633
--- a/src/include/mm_wfd_sink_priv.h
+++ b/src/include/mm_wfd_sink_priv.h
@@ -224,7 +224,7 @@ typedef struct {
 } mm_wfd_sink_t;
 
 
-int _mm_wfd_sink_create(mm_wfd_sink_t **wfd_sink);
+int _mm_wfd_sink_create(mm_wfd_sink_t **wfd_sink, const char *ini_path);
 int _mm_wfd_sink_destroy(mm_wfd_sink_t *wfd_sink);
 int _mm_wfd_sink_prepare(mm_wfd_sink_t *wfd_sink);
 int _mm_wfd_sink_unprepare(mm_wfd_sink_t *wfd_sink);

diff --git a/src/mm_wfd_sink.c b/src/mm_wfd_sink.c
old mode 100755 (executable)
new mode 100644 (file)
index fd0d335..6b10442
--- a/src/mm_wfd_sink.c
+++ b/src/mm_wfd_sink.c
@@ -22,8 +22,8 @@
 
 #include <gst/gst.h>
 
-#include "mm_wfd_sink_util.h"
 #include "mm_wfd_sink.h"
+#include "mm_wfd_sink_util.h"
 #include "mm_wfd_sink_priv.h"
 #include "mm_wfd_sink_dlog.h"
 
@@ -36,7 +36,7 @@ int mm_wfd_sink_create(MMHandleType *wfd_sink)
 
        wfd_sink_return_val_if_fail(wfd_sink, MM_ERROR_WFD_NOT_INITIALIZED);
 
-       result = _mm_wfd_sink_create(&new_wfd_sink);
+       result = _mm_wfd_sink_create(&new_wfd_sink, MM_WFD_SINK_INI_DEFAULT_PATH);
        if (result != MM_ERROR_NONE) {
                wfd_sink_error("fail to create wi-fi display sink handle. ret[%d]", result);
                *wfd_sink = (MMHandleType)NULL;

diff --git a/src/mm_wfd_sink_ini.c b/src/mm_wfd_sink_ini.c
old mode 100755 (executable)
new mode 100644 (file)
index 24b7de4..247f84f
--- a/src/mm_wfd_sink_ini.c
+++ b/src/mm_wfd_sink_ini.c
@@ -25,8 +25,9 @@
 #include <stdlib.h>
 #include <iniparser.h>
 #include <mm_error.h>
-#include "mm_wfd_sink_ini.h"
+
 #include "mm_wfd_sink_dlog.h"
+#include "mm_wfd_sink_ini.h"
 
 static gboolean loaded = FALSE;
 
@@ -35,7 +36,7 @@ static gboolean loaded = FALSE;
 static gboolean        __generate_sink_default_ini(void);
 #endif
 
-static void __mm_wfd_sink_ini_check_status(void);
+static void __mm_wfd_sink_ini_check_status(const char *path);
 
 /* macro */
 #define MM_WFD_SINK_INI_GET_STRING(x_dict, x_item, x_ini, x_default) \
@@ -82,30 +83,31 @@ gboolean __generate_sink_default_ini(void)
 #endif
 
 int
-mm_wfd_sink_ini_load(mm_wfd_sink_ini_t *ini)
+mm_wfd_sink_ini_load(mm_wfd_sink_ini_t *ini, const char *path)
 {
        dictionary *dict = NULL;
 
        wfd_sink_debug_fenter();
 
+       __mm_wfd_sink_ini_check_status(path);
 
-       __mm_wfd_sink_ini_check_status();
+       wfd_sink_debug("ini path : %s", path);
 
        /* first, try to load existing ini file */
-       dict = iniparser_load(MM_WFD_SINK_INI_DEFAULT_PATH);
+       dict = iniparser_load(path);
 
        /* if no file exists. create one with set of default values */
        if (!dict) {
 #ifdef MM_WFD_SINK_DEFAULT_INI
-               wfd_sink_debug("No inifile found. create default ini file.\n");
+               wfd_sink_debug("No inifile found. create default ini file.");
                if (FALSE == __generate_sink_default_ini()) {
-                       wfd_sink_error("Creating default ini file failed. Use default values.\n");
+                       wfd_sink_error("Creating default ini file failed. Use default values.");
                } else {
                        /* load default ini */
                        dict = iniparser_load(MM_WFD_SINK_INI_DEFAULT_PATH);
                }
 #else
-               wfd_sink_error("No ini file found. \n");
+               wfd_sink_error("No ini file found. ");
 
                return MM_ERROR_FILE_NOT_FOUND;
 #endif
@@ -343,18 +345,20 @@ mm_wfd_sink_ini_load(mm_wfd_sink_ini_t *ini)
 
 
 static
-void __mm_wfd_sink_ini_check_status(void)
+void __mm_wfd_sink_ini_check_status(const char *path)
 {
        struct stat ini_buff;
 
+       wfd_sink_return_if_fail(path);
+
        wfd_sink_debug_fenter();
 
-       if (g_stat(MM_WFD_SINK_INI_DEFAULT_PATH, &ini_buff) < 0) {
-               wfd_sink_error("failed to get mmfw_wfd_sink ini status\n");
+       if (g_stat(path, &ini_buff) < 0) {
+               wfd_sink_error("failed to get [%s] ini status", path);
        } else {
                if (ini_buff.st_size < 5) {
-                       wfd_sink_error("mmfw_wfd_sink.ini file size=%d, Corrupted! So, Removed\n", (int)ini_buff.st_size);
-                       g_remove(MM_WFD_SINK_INI_DEFAULT_PATH);
+                       wfd_sink_error("%s file size=%d, Corrupted! So, Removed", path, (int)ini_buff.st_size);
+                       g_remove(path);
                }
        }
 

diff --git a/src/mm_wfd_sink_priv.c b/src/mm_wfd_sink_priv.c
old mode 100755 (executable)
new mode 100644 (file)
index dc17608..a2e2b88
--- a/src/mm_wfd_sink_priv.c
+++ b/src/mm_wfd_sink_priv.c
@@ -52,13 +52,17 @@ static int __mm_wfd_sink_set_state(mm_wfd_sink_t *wfd_sink, MMWFDSinkStateType s
 static void __mm_wfd_sink_dump_pipeline_state(mm_wfd_sink_t *wfd_sink);
 static void __mm_wfd_sink_prepare_video_resolution(gint resolution, guint *CEA_resolution, guint *VESA_resolution, guint *HH_resolution);
 
-int _mm_wfd_sink_create(mm_wfd_sink_t **wfd_sink)
+int _mm_wfd_sink_create(mm_wfd_sink_t **wfd_sink, const char *ini_path)
 {
        int result = MM_ERROR_NONE;
 
        wfd_sink_debug_fenter();
 
        wfd_sink_return_val_if_fail(wfd_sink, MM_ERROR_WFD_NOT_INITIALIZED);
+       if (ini_path == NULL) {
+               ini_path = MM_WFD_SINK_INI_DEFAULT_PATH;
+               wfd_sink_debug("The wfd ini file path is set as defalut[%s]", ini_path);
+       }
 
        mm_wfd_sink_t *new_wfd_sink = NULL;
 
@@ -123,9 +127,9 @@ int _mm_wfd_sink_create(mm_wfd_sink_t **wfd_sink)
        }
 
        /* load ini for initialize */
-       result = mm_wfd_sink_ini_load(&new_wfd_sink->ini);
+       result = mm_wfd_sink_ini_load(&new_wfd_sink->ini, ini_path);
        if (result != MM_ERROR_NONE) {
-               wfd_sink_error("failed to load ini file");
+               wfd_sink_error("failed to load ini file[%s]", ini_path);
                goto fail_to_load_ini;
        }
        new_wfd_sink->need_to_reset_basetime = new_wfd_sink->ini.enable_reset_basetime;