Remove ini parser

Change-Id: Iec6e04b816dbdd0befebeff81abe8eaceaeac8ee
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/server/include/media-server-thumb.h b/src/server/include/media-server-thumb.h
index 62d5588..40045b6 100755 (executable)
--- a/src/server/include/media-server-thumb.h
+++ b/src/server/include/media-server-thumb.h
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <sys/un.h>
 #include <arpa/inet.h>
-#include <iniparser.h>
 #include "media-common-types.h"
 #include "media-server-ipc.h"
 
@@ -35,7 +34,6 @@ GMainLoop * ms_get_thumb_thread_mainloop(void);
 int ms_thumb_get_server_pid();
 void ms_thumb_reset_server_status();
 gpointer ms_thumb_agent_start_thread(gpointer data);
-int ms_thumb_get_config();
 
 #endif /*_MEDIA_SERVER_THUMB_H_*/
 

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 648fc36..31c6091 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -408,9 +408,6 @@ int main(int argc, char **argv)
        /*Active flush */
        malloc_trim(0);
 
-       /*Read ini file */
-       ms_thumb_get_config();
-
        MS_DBG_ERR("*** Media Server is running ***");
 
        ms_write_media_server_status();

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index ef01dd6..fc9c79c 100644 (file)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -37,11 +37,6 @@
 
 #define THUMB_SERVER_NAME "media-thumbnail"
 #define MS_SOCK_BLOCK_SIZE 512
-#define MS_INI_GET_INT(dict, key, value, default) \
-       do { \
-               value = iniparser_getint(dict, key, default); \
-               MS_DBG("get %s = %d", key, value); \
-       } while (0)
 #define THUMB_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-thumbnail-server")
 
 gboolean _ms_thumb_agent_timer();
@@ -55,7 +50,6 @@ static gboolean g_thumb_server_queued_all_extracting_request = FALSE;
 static int g_communicate_sock = 0;
 static int g_timer_id = 0;
 static int g_server_pid = 0;
-static int g_thumb_server_active = -1;
 
 static GQueue *g_request_queue = NULL;
 static int g_queue_work = 0;
@@ -70,21 +64,6 @@ extern char MEDIA_IPC_PATH[][70];
 gboolean _ms_thumb_check_queued_request(gpointer data);
 gboolean _ms_thumb_agent_prepare_tcp_socket(int *sock_fd, unsigned short serv_port);
 
-
-gboolean _ms_thumb_agent_start_jobs(gpointer data)
-{
-       MS_DBG("");
-
-       return FALSE;
-}
-
-void _ms_thumb_agent_finish_jobs()
-{
-       MS_DBG("");
-
-       return;
-}
-
 GMainLoop* ms_get_thumb_thread_mainloop(void)
 {
        return g_thumb_agent_loop;
@@ -858,23 +837,6 @@ gboolean _ms_thumb_agent_prepare_tcp_socket(int *sock_fd, unsigned short serv_po
        return TRUE;
 }
 
-int ms_thumb_get_config()
-{
-       dictionary *dict = NULL;
-
-       dict = iniparser_load(MS_INI_DEFAULT_PATH);
-       if (!dict) {
-               MS_DBG_ERR("%s load failed", MS_INI_DEFAULT_PATH);
-               return -1;
-       }
-
-       MS_INI_GET_INT(dict, "media-content-config:thumbnail_activation", g_thumb_server_active, 0);
-       MS_DBG("Thumb-server activation level = %d", g_thumb_server_active);
-
-       iniparser_freedict(dict);
-       return 0;
-}
-
 gpointer ms_thumb_agent_start_thread(gpointer data)
 {
        int sockfd = -1;
@@ -916,7 +878,6 @@ gpointer ms_thumb_agent_start_thread(gpointer data)
        g_main_loop_run(g_thumb_agent_loop);
 
        MS_DBG("Thumbnail Agent thread is shutting down...");
-       _ms_thumb_agent_finish_jobs();
 
        /*close an IO channel*/
        g_io_channel_shutdown(channel, FALSE, NULL);