Update muse config because of build issue

Change-Id: Ib8c401e4c527e6988c94092e293831980e0274ef

diff --git a/include/muse_core_config.h b/include/muse_core_config.h
index 42e7538..64f5535 100644 (file)
--- a/include/muse_core_config.h
+++ b/include/muse_core_config.h
@@ -33,7 +33,6 @@ extern "C" {
 #define MUSEHOST "muse:hosts"
 #define MUSELOG "muse:logfile"
 #define MUSELOCK "muse:lockfile"
-#define MUSEREADY "muse:muse_server_ready"
 #define MUSEMINTIMEOUT "muse:min_timeout"
 #define MUSEMAXTIMEOUT "muse:max_timeout"
 #define MUSEGST "muse:gstparam"
@@ -57,7 +56,6 @@ typedef struct muse_core_config
        int host_cnt;
        char *logfile;
        char *lockfile;
-       char *muse_server_ready;
        int min_timeout;
        int max_timeout;
 

diff --git a/include/muse_core_internal.h b/include/muse_core_internal.h
index 79de47e..e75cb3e 100644 (file)
--- a/include/muse_core_internal.h
+++ b/include/muse_core_internal.h
@@ -77,6 +77,7 @@ extern "C" {
 #define LOG_TAG "TIZEN_N_MUSED"
 #define MUSE_DATA_ROOT_PATH TZ_SYS_DATA_PATH"/mused/"
 #define MUSE_DEFAULT_PIDFILE "/tmp/.muse-server.pid"
+#define MUSE_SERVER_READY "/tmp/.muse_server_ready"
 #define MUSE_SOCK_FILE0 "/tmp/.muse_core_socket"
 #define MUSE_SOCK_FILE1 "/tmp/.muse_core_data_socket"
 

diff --git a/src/muse_core.c b/src/muse_core.c
index 8601254..c9659f8 100644 (file)
--- a/src/muse_core.c
+++ b/src/muse_core.c
@@ -445,14 +445,14 @@ int muse_core_run()
 #ifdef MUSE_USE_LWIPC
        _muse_core_wait_event();
 
-       if (LwipcEventDone(muse_core_config_get_instance()->muse_server_ready) < 0)
+       if (LwipcEventDone(MUSE_SERVER_READY) < 0)
                LOGE("Fail to send server ready done event");
 #else
-       if ((ready_fd = creat(muse_core_config_get_instance()->muse_server_ready, 0644)) != -1) {
-               LOGD("MUSE_SERVER_READY(%s) file was created", muse_core_config_get_instance()->muse_server_ready);
+       if ((ready_fd = creat(MUSE_SERVER_READY, 0644)) != -1) {
+               LOGD("MUSE_SERVER_READY(%s) file was created", MUSE_SERVER_READY);
                close(ready_fd);
        } else {
-               LOGE("Fail to create MUSE_SERVER_READY(%s)", muse_core_config_get_instance()->muse_server_ready);
+               LOGE("Fail to create MUSE_SERVER_READY(%s)", MUSE_SERVER_READY);
        }
 #endif
 

diff --git a/src/muse_core_config.c b/src/muse_core_config.c
index d11dba6..82fdff6 100644 (file)
--- a/src/muse_core_config.c
+++ b/src/muse_core_config.c
@@ -90,20 +90,6 @@ static int _muse_core_config_parser(void)
                return PARSE_ERROR;
        }
 
-       str = iniparser_getstring(g_muse_core_conf->muse_dict, MUSEREADY, NULL);
-       if (!str) {
-               LOGE("Error - iniparser_getstring (%s)", MUSEREADY);
-               _muse_core_config_free();
-               return PARSE_ERROR;
-       }
-
-       g_muse_core_conf->muse_server_ready = strdup(str);
-       if (!g_muse_core_conf->muse_server_ready) {
-               LOGE("Error - muse_server_ready allocation");
-               _muse_core_config_free();
-               return PARSE_ERROR;
-       }
-
        str = iniparser_getstring(g_muse_core_conf->muse_dict, MUSEMINTIMEOUT, NULL);
        if (!str) {
                LOGE("Error - iniparser_getstring (%s)", MUSEMINTIMEOUT);
@@ -263,7 +249,6 @@ static void _muse_core_config_free(void)
 
        MUSE_FREE(g_muse_core_conf->logfile);
        MUSE_FREE(g_muse_core_conf->lockfile);
-       MUSE_FREE(g_muse_core_conf->muse_server_ready);
 
        for (i = 0; i <= g_muse_core_conf->gst_param_cnt; i++)
                MUSE_FREE(g_muse_core_conf->gst_param_str[i]);

diff --git a/src/muse_core_ipc.c b/src/muse_core_ipc.c
index a8b89e8..d25ff0d 100644 (file)
--- a/src/muse_core_ipc.c
+++ b/src/muse_core_ipc.c
@@ -136,7 +136,7 @@ static gpointer _muse_core_ipc_dispatch_worker(gpointer data)
                                                        module->is_create_api_called = true;
                                                        module->ch[MUSE_CHANNEL_MSG].dll_handle = muse_core_module_get_instance()->load(api_module);
 #ifndef MUSE_USE_LWIPC
-                                                       if (access(muse_core_config_get_instance()->muse_server_ready, F_OK) == 0)
+                                                       if (access(MUSE_SERVER_READY, F_OK) == 0)
 #endif
                                                                muse_core_cmd_dispatch(module, MUSE_MODULE_COMMAND_CREATE_SERVER_ACK);
                                                        module->ch[MUSE_CHANNEL_DATA].queue = g_queue_new();

diff --git a/src/muse_core_signal.c b/src/muse_core_signal.c
index 28f057f..b45a36b 100644 (file)
--- a/src/muse_core_signal.c
+++ b/src/muse_core_signal.c
@@ -123,10 +123,10 @@ static void _muse_core_signal_sigaction(int signo, siginfo_t *si, void *arg)
        g_return_if_fail(arg);
 
 #ifdef MUSE_USE_LWIPC
-       if (LwipcResetEvent(muse_core_config_get_instance()->muse_server_ready) < 0)
+       if (LwipcResetEvent(MUSE_SERVER_READY) < 0)
                LOGE("Fail to reset light weight IPC");
 #else
-       remove(muse_core_config_get_instance()->muse_server_ready);
+       remove(MUSE_SERVER_READY);
 #endif
 
        _muse_core_signal_backtrace(arg);