migration /usr/etc directory to sysconfdir(/etc)/multimedia

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

diff --git a/packaging/libmm-streamrecorder.spec b/packaging/libmm-streamrecorder.spec
index 2bb8a53..cbbfafb 100644 (file)
--- a/packaging/libmm-streamrecorder.spec
+++ b/packaging/libmm-streamrecorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-streamrecorder
 Summary:    Media Stream Recorder library
-Version:    0.0.4
+Version:    0.0.5
 Release:    0
 Group:      Multimedia/Other
 License:    Apache-2.0
@@ -35,6 +35,7 @@ Media Stream Recorder development library
 %build
 #export CFLAGS+=" -DGST_EXT_TIME_ANALYSIS"
 export CFLAGS+=" -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable"
+export CFLAGS+=" -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
 ./autogen.sh
 %configure --disable-static
 make %{?jobs:-j%jobs}

diff --git a/src/include/mm_streamrecorder_ini.h b/src/include/mm_streamrecorder_ini.h
index a65453e..09fcfcd 100644 (file)
--- a/src/include/mm_streamrecorder_ini.h
+++ b/src/include/mm_streamrecorder_ini.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#define MM_STREAMRECORDER_INI_DEFAULT_PATH     "/usr/etc/mmfw_streamrecorder.ini"
+#define MM_STREAMRECORDER_INI_DEFAULT_PATH     SYSCONFDIR"/multimedia/mmfw_streamrecorder.ini"
 
 #define STREAMRECORDER_INI_MAX_STRLEN  256
 #define STREAMRECORDER_INI_MAX_ELEMENT 10

diff --git a/src/include/mm_streamrecorder_util.h b/src/include/mm_streamrecorder_util.h
index f0806eb..387badc 100644 (file)
--- a/src/include/mm_streamrecorder_util.h
+++ b/src/include/mm_streamrecorder_util.h
@@ -127,10 +127,6 @@ enum {
        }\
 }
 
-#if 0
-#define MM_STREAMRECORDER_INI_DEFAULT_PATH     "/usr/etc/mmfw_transcode.ini"
-#define STREAMRECORDER_INI_MAX_STRLEN  100
-#endif
 /*=======================================================================================
 | ENUM DEFINITIONS                                                                     |
 ========================================================================================*/

diff --git a/src/mm_streamrecorder_ini.c b/src/mm_streamrecorder_ini.c
index 7160ec1..3a67847 100644 (file)
--- a/src/mm_streamrecorder_ini.c
+++ b/src/mm_streamrecorder_ini.c
@@ -316,10 +316,10 @@ void __mm_streamrecorder_ini_check_status(void)
        debug_fenter();
 
        if (g_stat(MM_STREAMRECORDER_INI_DEFAULT_PATH, &ini_buff) < 0) {
-               _mmstreamrec_dbg_err("failed to get mmfw_wfd_sink ini status\n");
+               _mmstreamrec_dbg_err("failed to get mmfw_streamrecorder.ini status\n");
        } else {
                if (ini_buff.st_size < 5) {
-                       _mmstreamrec_dbg_err("mmfw_wfd_sink.ini file size=%d, Corrupted! So, Removed\n", (int)ini_buff.st_size);
+                       _mmstreamrec_dbg_err("mmfw_streamrecorder.ini file size=%d, Corrupted! So, Removed\n", (int)ini_buff.st_size);
                        g_remove(MM_STREAMRECORDER_INI_DEFAULT_PATH);
                }
        }