Fix buxton key layer

[platform/core/uifw/stt.git] / server / sttd_main.c

diff --git a/server/sttd_main.c b/server/sttd_main.c
old mode 100755 (executable)
new mode 100644 (file)
index 2153545..6160f9f
--- a/server/sttd_main.c
+++ b/server/sttd_main.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd All Rights Reserved 
+*  Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
@@ -11,25 +11,27 @@
 *  limitations under the License.
 */
 
+#include <Ecore.h>
 
+#include "stt_defs.h"
+#include "stt_network.h"
+#include "sttd_dbus.h"
 #include "sttd_main.h"
 #include "sttd_server.h"
-#include "sttd_network.h"
-#include "sttd_dbus.h"
 
-#include <Ecore.h>
-#include "sttd_server.h"
 
 #define CLIENT_CLEAN_UP_TIME 500
 
+static Ecore_Timer* g_check_client_timer = NULL;
+
 int main(int argc, char** argv)
 {
        SLOG(LOG_DEBUG, TAG_STTD, "  ");
        SLOG(LOG_DEBUG, TAG_STTD, "  ");
        SLOG(LOG_DEBUG, TAG_STTD, "===== STT Daemon Initialize");
 
-       if (0 != sttd_initialize()) {
-               SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to initialize stt-daemon"); 
+       if (!ecore_init()) {
+               SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to initialize Ecore");
                return EXIT_FAILURE;
        }
 
@@ -38,13 +40,19 @@ int main(int argc, char** argv)
                return EXIT_FAILURE;
        }
 
-       sttd_network_initialize();
+       if (0 != sttd_initialize()) {
+               SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to initialize stt-daemon");
+               return EXIT_FAILURE;
+       }
 
-       ecore_timer_add(CLIENT_CLEAN_UP_TIME, sttd_cleanup_client, NULL);
+       stt_network_initialize();
 
-       printf("stt-daemon start...\n");
+       g_check_client_timer = ecore_timer_add(CLIENT_CLEAN_UP_TIME, sttd_cleanup_client, NULL);
+       if (NULL == g_check_client_timer) {
+               SLOG(LOG_WARN, TAG_STTD, "[Main Warning] Fail to create timer of client check");
+       }
 
-       SLOG(LOG_DEBUG, TAG_STTD, "[Main] stt-daemon start..."); 
+       SLOG(LOG_DEBUG, TAG_STTD, "[Main] stt-daemon start...");
 
        SLOG(LOG_DEBUG, TAG_STTD, "=====");
        SLOG(LOG_DEBUG, TAG_STTD, "  ");
@@ -52,11 +60,23 @@ int main(int argc, char** argv)
 
        ecore_main_loop_begin();
 
-       ecore_shutdown();
+       SLOG(LOG_DEBUG, TAG_STTD, "===== STT Daemon Finalize");
+
+       if (NULL != g_check_client_timer) {
+               ecore_timer_del(g_check_client_timer);
+       }
 
        sttd_dbus_close_connection();
 
-       sttd_network_finalize();
+       stt_network_finalize();
+
+       sttd_finalize();
+
+       ecore_shutdown();
+
+       SLOG(LOG_DEBUG, TAG_STTD, "=====");
+       SLOG(LOG_DEBUG, TAG_STTD, "  ");
+       SLOG(LOG_DEBUG, TAG_STTD, "  ");
 
        return 0;
 }