Fix bugs

Change-Id: I368b9088435a6a44a450a97e1eec25e6bea51d08
Signed-off-by: Wonnam Jang <wn.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bf936a5eab4aead81da751d3f2ac37d30e4f889..42a1c7d9c654475c3442cd3a03254705423615e0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2014 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.

diff --git a/client/stt.c b/client/stt.c
index d69e7f0d65361d72353c237a847b9a7174416a43..fa4dd9cff6ee1a8783ddc2d55d01a149956c9591 100644 (file)
--- a/client/stt.c
+++ b/client/stt.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -555,7 +555,7 @@ int stt_set_credential(stt_h stt, const char* credential)
        SLOG(LOG_DEBUG, TAG_STTC, "===== Set credential");
 
        if (NULL == credential) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL, stt(%s), credential(%a)", stt, credential);
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
                return STT_ERROR_INVALID_PARAMETER;
        }
 
@@ -1427,8 +1427,14 @@ int stt_stop(stt_h stt)
                return STT_ERROR_INVALID_STATE;
        }
 
-       if (STT_INTERNAL_STATE_NONE != client->internal_state) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
+       if (STT_INTERNAL_STATE_STARTING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STARTING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_RECORDING;
+       } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is CANCELING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_READY;
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STOPPING : %d", client->internal_state);
                return STT_ERROR_IN_PROGRESS_TO_PROCESSING;
        }
 
@@ -1438,7 +1444,7 @@ int stt_stop(stt_h stt)
                SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to stop : %s", __stt_get_error_code(ret));
        } else {
                SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is successful but not done");
-               client->internal_state = STT_INTERNAL_STATE_STOPING;
+               client->internal_state = STT_INTERNAL_STATE_STOPPING;
        }
 
        SLOG(LOG_DEBUG, TAG_STTC, "=====");
@@ -1469,8 +1475,14 @@ int stt_cancel(stt_h stt)
                return STT_ERROR_INVALID_STATE;
        }
 
-       if (STT_INTERNAL_STATE_NONE != client->internal_state) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
+       if (STT_INTERNAL_STATE_STARTING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STARTING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_RECORDING;
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is STOPPING : %d", client->internal_state);
+               return STT_ERROR_IN_PROGRESS_TO_PROCESSING;
+       } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state) {
+               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is CANCELING : %d", client->internal_state);
                return STT_ERROR_IN_PROGRESS_TO_READY;
        }
 
@@ -1672,7 +1684,7 @@ static void __stt_notify_state_changed(void *data)
        if (STT_INTERNAL_STATE_STARTING == client->internal_state && STT_STATE_RECORDING == client->current_state) {
                client->internal_state = STT_INTERNAL_STATE_NONE;
                SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
-       } else if (STT_INTERNAL_STATE_STOPING == client->internal_state && STT_STATE_PROCESSING == client->current_state) {
+       } else if (STT_INTERNAL_STATE_STOPPING == client->internal_state && STT_STATE_PROCESSING == client->current_state) {
                client->internal_state = STT_INTERNAL_STATE_NONE;
                SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
        } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state && STT_STATE_READY == client->current_state) {

diff --git a/client/stt_client.c b/client/stt_client.c
index d5a45b4ca2e0427bc669dc64293619bf9c6dac17..c925151ee50dbd189ecdfe8c5021a457638961bc 100644 (file)
--- a/client/stt_client.c
+++ b/client/stt_client.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_client.h b/client/stt_client.h
index ed9803d6db32cced7df7f8b3f9dfb7222d4f399f..43cf60e24ddc38b956cc52fea488c9bb080ca12b 100644 (file)
--- a/client/stt_client.h
+++ b/client/stt_client.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -26,7 +26,7 @@ extern "C" {
 typedef enum {
        STT_INTERNAL_STATE_NONE         = 0,
        STT_INTERNAL_STATE_STARTING     = 1,
-       STT_INTERNAL_STATE_STOPING      = 2,
+       STT_INTERNAL_STATE_STOPPING     = 2,
        STT_INTERNAL_STATE_CANCELING    = 3
 } stt_internal_state_e;
 

diff --git a/client/stt_dbus.c b/client/stt_dbus.c
index ee14cd8bb648f47c0b4a3b773959a2a6c63f7e47..1c5682bcda46d7309aae0218cb6dd89b9e988501 100644 (file)
--- a/client/stt_dbus.c
+++ b/client/stt_dbus.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -293,10 +293,12 @@ int stt_dbus_open_connection()
        dbus_error_init(&err);
 
        /* connect to the DBUS system bus, and check for errors */
-       g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
-       if (dbus_error_is_set(&err)) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Dbus Connection Error (%s)", err.message);
-               dbus_error_free(&err);
+       if (NULL == g_conn_sender) {
+               g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+               if (dbus_error_is_set(&err)) {
+                       SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Dbus Connection Error (%s)", err.message);
+                       dbus_error_free(&err);
+               }
        }
 
        if (NULL == g_conn_sender) {
@@ -307,11 +309,12 @@ int stt_dbus_open_connection()
        dbus_connection_set_exit_on_disconnect(g_conn_sender, false);
 
        /* connect to the DBUS system bus, and check for errors */
-       g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
-
-       if (dbus_error_is_set(&err)) { 
-               SLOG(LOG_ERROR, TAG_STTC, "Dbus Connection Error (%s)", err.message); 
-               dbus_error_free(&err);
+       if (NULL == g_conn_listener) {
+               g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+               if (dbus_error_is_set(&err)) {
+                       SLOG(LOG_ERROR, TAG_STTC, "Dbus Connection Error (%s)", err.message);
+                       dbus_error_free(&err);
+               }
        }
 
        if (NULL == g_conn_listener) {
@@ -390,6 +393,9 @@ int stt_dbus_close_connection()
        dbus_connection_close(g_conn_sender);
        dbus_connection_close(g_conn_listener);
 
+       dbus_connection_unref(g_conn_sender);
+       dbus_connection_unref(g_conn_listener);
+
        g_conn_sender = NULL;
        g_conn_listener = NULL;
 
@@ -899,9 +905,9 @@ int stt_dbus_request_set_private_data(int uid, const char* key, const char* data
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               STT_SERVER_SERVICE_NAME, 
-               STT_SERVER_SERVICE_OBJECT_PATH, 
-               STT_SERVER_SERVICE_INTERFACE, 
+               STT_SERVER_SERVICE_NAME,
+               STT_SERVER_SERVICE_OBJECT_PATH,
+               STT_SERVER_SERVICE_INTERFACE,
                STT_METHOD_SET_PRIVATE_DATA);
 
        if (NULL == msg) {
@@ -969,9 +975,9 @@ int stt_dbus_request_get_private_data(int uid, const char* key, char** data)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-               STT_SERVER_SERVICE_NAME, 
-               STT_SERVER_SERVICE_OBJECT_PATH, 
-               STT_SERVER_SERVICE_INTERFACE, 
+               STT_SERVER_SERVICE_NAME,
+               STT_SERVER_SERVICE_OBJECT_PATH,
+               STT_SERVER_SERVICE_INTERFACE,
                STT_METHOD_GET_PRIVATE_DATA);
 
        if (NULL == msg) {
@@ -1020,8 +1026,6 @@ int stt_dbus_request_get_private_data(int uid, const char* key, char** data)
                        SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get private data : result = %d", result);
                        if (NULL != temp) {
                                *data = strdup(temp);
-                               free(temp);
-                               temp = NULL;
                        }
                } else {
                        SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get private data : result = %d", result);

diff --git a/client/stt_dbus.h b/client/stt_dbus.h
index 8485e95c6ea34c8948a460c58edfc99865f35c9d..5330b99b4129a7d1d7b1bd4916d5b4b25ba59151 100644 (file)
--- a/client/stt_dbus.h
+++ b/client/stt_dbus.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_file.c b/client/stt_file.c
old mode 100755 (executable)
new mode 100644 (file)
index 423eaaa..fcfb863
--- a/client/stt_file.c
+++ b/client/stt_file.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_file_client.c b/client/stt_file_client.c
index 893c920e127bb38eecb76f8d9c80a4de9c83291a..c194bd8777c7fb2174c4b2f66d3c5e7609c5cdbd 100644 (file)
--- a/client/stt_file_client.c
+++ b/client/stt_file_client.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_file_client.h b/client/stt_file_client.h
old mode 100755 (executable)
new mode 100644 (file)
index 2991e4f..fb1ed34
--- a/client/stt_file_client.h
+++ b/client/stt_file_client.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_main.h b/client/stt_main.h
old mode 100755 (executable)
new mode 100644 (file)
index 564c3f6..79044bf
--- a/client/stt_main.h
+++ b/client/stt_main.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/client/stt_setting.c b/client/stt_setting.c
index 118b74aa657ac56923ae06c4760aad352a0223ab..9609c7261196eadf3be9a70d7f6e40321b1d301c 100644 (file)
--- a/client/stt_setting.c
+++ b/client/stt_setting.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_config_mgr.c b/common/stt_config_mgr.c
index 1cf7c50982ffb29a0a697a6f18bdaca8664cf6d9..a44f27e9aa53e60dd263bdc7c2116249e0757846 100644 (file)
--- a/common/stt_config_mgr.c
+++ b/common/stt_config_mgr.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -150,7 +150,7 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
                                        /* Default language is STT_BASE_LANGUAGE */
                                        if (0 == strcmp(STT_BASE_LANGUAGE, engine_lang)) {
                                                *language = strdup(engine_lang);
-                                               SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", *language);
+                                               SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", (NULL == *language) ? "NULL" : *language);
                                                return 0;
                                        }
                                }
@@ -161,7 +161,7 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
                        /* Not support STT_BASE_LANGUAGE */
                        if (NULL != engine_lang) {
                                *language = strdup(engine_lang);
-                               SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", *language);
+                               SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", (NULL == *language) ? "NULL" : *language);
                                return 0;
                        }
                }
@@ -1230,8 +1230,8 @@ int stt_config_mgr_get_language_list(const char* engine_id, stt_config_supported
                        /*Get handle data from list*/
                        lang = iter_lang->data;
 
-                       SLOG(LOG_DEBUG, stt_tag(), " %s", lang);
                        if (NULL != lang) {
+                               SLOG(LOG_DEBUG, stt_tag(), " %s", lang);
                                if (false == callback(engine_info->uuid, lang, user_data))
                                        break;
                        }

diff --git a/common/stt_config_mgr.h b/common/stt_config_mgr.h
index 758662b8589f968672c0caf370f2d8995539c261..9f430444e99de2870bd8a483d7db63fee15d7768 100644 (file)
--- a/common/stt_config_mgr.h
+++ b/common/stt_config_mgr.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_config_parser.c b/common/stt_config_parser.c
index 8116ba4ec92b33a591c0045d6d8650f04f61e5c2..a8811745977d4a5c0238c5389f22ba3b6c3bebcb 100644 (file)
--- a/common/stt_config_parser.c
+++ b/common/stt_config_parser.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_config_parser.h b/common/stt_config_parser.h
index edd7b235fbf4ee6f786090e7b9c142d600bea76d..29876614f60dea6ec8cbdb82478fa697edfecd40 100644 (file)
--- a/common/stt_config_parser.h
+++ b/common/stt_config_parser.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_defs.h b/common/stt_defs.h
index d37769cc2561f70afa5efa76624c778bee17622a..6ea59f37af91cf9f91b9c4e8aa218ac87006bd28 100644 (file)
--- a/common/stt_defs.h
+++ b/common/stt_defs.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_engine.c b/common/stt_engine.c
index e644512c43a86bb88b2bd4018c901eedb693d025..0311c514a27c2d8fde2b8d7c9637f9ff3adad7fc 100644 (file)
--- a/common/stt_engine.c
+++ b/common/stt_engine.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -263,10 +263,9 @@ int stt_engine_initialize(int engine_id, sttpe_result_cb result_cb, sttpe_silenc
        ret = engine->pefuncs->initialize(result_cb, silence_cb);
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to initialize : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_deinitialize(int engine_id)
@@ -284,7 +283,7 @@ int stt_engine_deinitialize(int engine_id)
                SLOG(LOG_WARN, stt_tag(), "[Engine WARNING] Fail to deinitialize : %s", __stt_get_engine_error_code(ret));
        }
 
-       return 0;
+       return ret;
 }
 
 static bool __supported_language_cb(const char* language, void* user_data)
@@ -322,10 +321,9 @@ int stt_engine_get_supported_langs(int engine_id, GSList** lang_list)
        ret = engine->pefuncs->foreach_langs(__supported_language_cb, (void*)lang_list);
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] get language list error : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_is_valid_language(int engine_id, const char* language, bool *is_valid)
@@ -368,7 +366,7 @@ int stt_engine_set_private_data(int engine_id, const char* key, const char* data
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to set private data(%d)", ret);
        }
-       return STTP_ERROR_NONE;
+       return ret;
 }
 
 int stt_engine_get_private_data(int engine_id, const char* key, char** data)
@@ -388,7 +386,8 @@ int stt_engine_get_private_data(int engine_id, const char* key, char** data)
        char* temp = NULL;
        int ret = engine->pefuncs->get_private_data(key, &temp);
        if (0 != ret) {
-               SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to set private data(%d)", ret);
+               SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to get private data(%d)", ret);
+               return ret;
        }
 
        *data = strdup(temp);
@@ -540,10 +539,9 @@ int stt_engine_get_audio_type(int engine_id, sttp_audio_type_e* types, int* rate
        ret = engine->pefuncs->get_audio_format(types, rate, channels);
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to get audio format : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 /* Set option */
@@ -562,10 +560,9 @@ int stt_engine_set_silence_detection(int engine_id, bool value)
                return STTP_ERROR_NOT_SUPPORTED_FEATURE;
        } else if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to set silence detection : %d", ret);
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_check_app_agreed(int engine_id, const char* appid, bool* value)
@@ -587,10 +584,9 @@ int stt_engine_check_app_agreed(int engine_id, const char* appid, bool* value)
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to get app agreement : %s", __stt_get_engine_error_code(ret));
                *value = false;
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 /* Recognition */
@@ -612,10 +608,9 @@ int stt_engine_recognize_start(int engine_id, const char* lang, const char* reco
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to start recognition : %s", __stt_get_engine_error_code(ret));
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to start recognition : lang(%s), recognition_type(%s), credential(%s)", lang, recognition_type, credential);
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_set_recording_data(int engine_id, const void* data, unsigned int length)
@@ -635,10 +630,9 @@ int stt_engine_set_recording_data(int engine_id, const void* data, unsigned int
        int ret = engine->pefuncs->set_recording(data, length);
        if (0 != ret) {
                SLOG(LOG_WARN, stt_tag(), "[Engine WARNING] Fail to set recording : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_recognize_stop(int engine_id)
@@ -653,10 +647,9 @@ int stt_engine_recognize_stop(int engine_id)
        int ret = engine->pefuncs->stop();
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to stop : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_recognize_cancel(int engine_id)
@@ -671,10 +664,9 @@ int stt_engine_recognize_cancel(int engine_id)
        int ret = engine->pefuncs->cancel();
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to cancel : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_foreach_result_time(int engine_id, void* time_info, sttpe_result_time_cb callback, void* user_data)
@@ -689,10 +681,9 @@ int stt_engine_foreach_result_time(int engine_id, void* time_info, sttpe_result_
        int ret = engine->pefuncs->foreach_result_time(time_info, callback, user_data);
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to foreach result time : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_recognize_start_file(int engine_id, const char* lang, const char* recognition_type, 
@@ -718,10 +709,9 @@ int stt_engine_recognize_start_file(int engine_id, const char* lang, const char*
        int ret = engine->pefuncs->start_file(lang, recognition_type, filepath, audio_type, sample_rate, user_param);
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to start file recognition : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int stt_engine_recognize_cancel_file(int engine_id)
@@ -741,8 +731,7 @@ int stt_engine_recognize_cancel_file(int engine_id)
        int ret = engine->pefuncs->cancel_file();
        if (0 != ret) {
                SLOG(LOG_ERROR, stt_tag(), "[Engine ERROR] Fail to start file recognition : %s", __stt_get_engine_error_code(ret));
-               return ret;
        }
 
-       return 0;
+       return ret;
 }

diff --git a/common/stt_engine.h b/common/stt_engine.h
index 3b47936842d35a6dcdd847e322e074654c5077b3..a2c9e7482537c0bf74e6ee310d9533f5bf85a64e 100644 (file)
--- a/common/stt_engine.h
+++ b/common/stt_engine.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_network.c b/common/stt_network.c
index dcecd944862878e67109bb17b6d05e7f0bf3e95f..8538e80bfc6fad9e89d9cf1ba1bb85f435e9b50d 100644 (file)
--- a/common/stt_network.c
+++ b/common/stt_network.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/common/stt_network.h b/common/stt_network.h
index fbda52dc612c2542db18775111da44d635d36b4a..612ff389f12e17b71155264e0e40f2e8c960d29d 100644 (file)
--- a/common/stt_network.h
+++ b/common/stt_network.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/doc/uix_stt_doc.h b/doc/uix_stt_doc.h
index 25bc85b8ffc930259d875b2cbff1626061a1e98c..6c5b97cb497e28700e6542ee63b18ca057140f52 100644 (file)
--- a/doc/uix_stt_doc.h
+++ b/doc/uix_stt_doc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 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.

diff --git a/include/stt.h b/include/stt.h
index 113cb1cf636bb77c33410f1616837f948fc4e4a3..9fecdaae141e3ee1226da643674acf008a0e1da5 100644 (file)
--- a/include/stt.h
+++ b/include/stt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 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.
@@ -55,7 +55,8 @@ typedef enum {
        STT_ERROR_NO_SPEECH                     = TIZEN_ERROR_STT | 0x06,       /**< No speech while recording */
        STT_ERROR_IN_PROGRESS_TO_READY          = TIZEN_ERROR_STT | 0x07,       /**< Progress to ready is not finished */
        STT_ERROR_IN_PROGRESS_TO_RECORDING      = TIZEN_ERROR_STT | 0x08,       /**< Progress to recording is not finished */
-       STT_ERROR_IN_PROGRESS_TO_PROCESSING     = TIZEN_ERROR_STT | 0x09        /**< Progress to processing is not finished */
+       STT_ERROR_IN_PROGRESS_TO_PROCESSING     = TIZEN_ERROR_STT | 0x09,       /**< Progress to processing is not finished */
+       STT_ERROR_RECORDING_TIMED_OUT           = TIZEN_ERROR_STT | 0x10        /**< Recording timed out */
 } stt_error_e;
 
 /**
@@ -794,6 +795,8 @@ int stt_start(stt_h stt, const char* language, const char* type);
  * @retval #STT_ERROR_INVALID_STATE Invalid state
  * @retval #STT_ERROR_OPERATION_FAILED Operation failure
  * @retval #STT_ERROR_NOT_SUPPORTED STT NOT supported
+ * @retval #STT_ERROR_IN_PROGRESS_TO_READY Progress to ready is not finished
+ * @retval #STT_ERROR_IN_PROGRESS_TO_RECORDING Progress to recording is not finished
  * @retval #STT_ERROR_IN_PROGRESS_TO_PROCESSING Progress to processing is not finished
  *
  * @pre The state should be #STT_STATE_RECORDING.
@@ -826,6 +829,8 @@ int stt_stop(stt_h stt);
  * @retval #STT_ERROR_OPERATION_FAILED Operation failure
  * @retval #STT_ERROR_NOT_SUPPORTED STT NOT supported
  * @retval #STT_ERROR_IN_PROGRESS_TO_READY Progress to ready is not finished
+ * @retval #STT_ERROR_IN_PROGRESS_TO_RECORDING Progress to recording is not finished
+ * @retval #STT_ERROR_IN_PROGRESS_TO_PROCESSING Progress to processing is not finished
  *
  * @pre The state should be #STT_STATE_RECORDING or #STT_STATE_PROCESSING.
  * @post It will invoke stt_state_changed_cb(), if you register a callback with stt_state_changed_cb(). \n

diff --git a/include/stt_file.h b/include/stt_file.h
old mode 100755 (executable)
new mode 100644 (file)
index eb06246..01a6a73
--- a/include/stt_file.h
+++ b/include/stt_file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 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.

diff --git a/include/stt_setting.h b/include/stt_setting.h
old mode 100755 (executable)
new mode 100644 (file)
index 352a43a..13f90f0
--- a/include/stt_setting.h
+++ b/include/stt_setting.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_client_data.c b/server/sttd_client_data.c
index 8da0df2ee7120b7d3c111cdd746d8bdfa7b22c17..fafb50da5df54442f0491a10ec19c98242fcde14 100644 (file)
--- a/server/sttd_client_data.c
+++ b/server/sttd_client_data.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_client_data.h b/server/sttd_client_data.h
old mode 100755 (executable)
new mode 100644 (file)
index c5115d9..a1bc732
--- a/server/sttd_client_data.h
+++ b/server/sttd_client_data.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_config.c b/server/sttd_config.c
index 71af39da8fe2f5eb056b90cdeaa14745eba20ad9..cedd5d754ea51e321e60f14c00c834c5826b73f6 100644 (file)
--- a/server/sttd_config.c
+++ b/server/sttd_config.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_config.h b/server/sttd_config.h
index 1f5853417a87ace0012941634ae66d60c756b6c0..f6d4c99f8357ed9f6386b5bbed95097932d9ac4a 100644 (file)
--- a/server/sttd_config.h
+++ b/server/sttd_config.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c
index 73646d8a2ede90b14c3a609ef24cc35fd0388148..b30a35ae3ca0516ed1ef27716012b8e9fcedfc76 100644 (file)
--- a/server/sttd_dbus.c
+++ b/server/sttd_dbus.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011-2014 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
@@ -515,6 +515,9 @@ int sttd_dbus_close_connection()
        dbus_connection_close(g_conn_listener);
        dbus_connection_close(g_conn_sender);
 
+       dbus_connection_unref(g_conn_sender);
+       dbus_connection_unref(g_conn_listener);
+
        g_conn_listener = NULL;
        g_conn_sender = NULL;
 

diff --git a/server/sttd_dbus.h b/server/sttd_dbus.h
index 9311eca6bd86f49434a2c22912dc4024e8c80dbe..91d81af5716cefe8abc88669cd4d8345af13c1dc 100644 (file)
--- a/server/sttd_dbus.h
+++ b/server/sttd_dbus.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_dbus_server.c b/server/sttd_dbus_server.c
index 47aa97b195067da54fb1d441d67db52eddd0346e..e2266b881f9806772feaa6fabf271b1f976e1b55 100644 (file)
--- a/server/sttd_dbus_server.c
+++ b/server/sttd_dbus_server.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011-2014 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
@@ -640,7 +640,7 @@ int sttd_dbus_server_get_private_data(DBusConnection* conn, DBusMessage* msg)
                dbus_error_free(&err);
                ret = STTD_ERROR_OPERATION_FAILED;
        } else {
-               SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get private data : uid(%d)", uid);
+               SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get private data : uid(%d), key(%s)", uid, (NULL == key) ? "NULL" : key);
                ret = sttd_server_get_private_data(uid, key, &data);
        }
 
@@ -655,7 +655,7 @@ int sttd_dbus_server_get_private_data(DBusConnection* conn, DBusMessage* msg)
                        DBUS_TYPE_INVALID);
 
                if (0 == ret) {
-                       SLOG(LOG_DEBUG, TAG_STTD, "[OUT SUCCESS] Result(%d)", ret);
+                       SLOG(LOG_DEBUG, TAG_STTD, "[OUT SUCCESS] Result(%d), data(%s)", ret, (NULL == data) ? "NULL" : data);
                } else {
                        SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret);
                }

diff --git a/server/sttd_dbus_server.h b/server/sttd_dbus_server.h
index 34210f7487376e0bce6f732f8df4bc6af4f4291f..bb629c199a1e98d7697caa102cf205852d958466 100644 (file)
--- a/server/sttd_dbus_server.h
+++ b/server/sttd_dbus_server.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011-2014 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

diff --git a/server/sttd_engine_agent.c b/server/sttd_engine_agent.c
index b31699314e291d3ddaa3bb09c888d5e7341ee3ea..a00e33edffb483c73d02c3000a671ff8d08396b7 100644 (file)
--- a/server/sttd_engine_agent.c
+++ b/server/sttd_engine_agent.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -875,10 +875,9 @@ int sttd_engine_agent_supported_langs(int uid, GSList** lang_list)
        int ret = stt_engine_get_supported_langs(engine->engine_id, lang_list);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_STTD, "[Engine Agent ERROR] get language list error(%d)", ret);
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int sttd_engine_agent_get_default_lang(int uid, char** lang)
@@ -953,10 +952,9 @@ int sttd_engine_agent_set_private_data(int uid, const char* key, const char* dat
        ret = stt_engine_set_private_data(engine->engine_id, key, data);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_STTD, "[Engine Agent ERROR] Fail to set private data");
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int sttd_engine_agent_get_private_data(int uid, const char* key, char** data)
@@ -989,10 +987,9 @@ int sttd_engine_agent_get_private_data(int uid, const char* key, char** data)
        ret = stt_engine_get_private_data(engine->engine_id, key, data);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_STTD, "[Engine Agent ERROR] Fail to get private data");
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int sttd_engine_agent_get_option_supported(int uid, bool* silence)
@@ -1299,10 +1296,9 @@ int sttd_engine_agent_set_recording_data(int uid, const void* data, unsigned int
        int ret = stt_engine_set_recording_data(engine->engine_id, data, length);
        if (0 != ret) {
                SLOG(LOG_WARN, TAG_STTD, "[Engine Agent WARNING] set recording error(%d)", ret);
-               return ret;
        }
 
-       return 0;
+       return ret;
 }
 
 int sttd_engine_agent_recognize_stop_recorder(int uid)

diff --git a/server/sttd_engine_agent.h b/server/sttd_engine_agent.h
index 35e93ccccbf0fb694f29d4974eeb0da7da2a67ec..e0ba8144b12a45c55a339e376efe5c96fad029dc 100644 (file)
--- a/server/sttd_engine_agent.h
+++ b/server/sttd_engine_agent.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_main.c b/server/sttd_main.c
index 7fd2cd2fbec73939e68debd9dbfc6603cf3d2227..1d6472006d382907411be9fa42c598e072e41557 100644 (file)
--- a/server/sttd_main.c
+++ b/server/sttd_main.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_main.h b/server/sttd_main.h
index b75ade7dc5c407b4530dd2b886bb814c43ff9a3c..31655dcb67531e648b50b1bfafc7f001632e0d9d 100644 (file)
--- a/server/sttd_main.h
+++ b/server/sttd_main.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -53,7 +53,8 @@ typedef enum {
        STTD_ERROR_ENGINE_NOT_FOUND             = TIZEN_ERROR_STT | 0x03,       /**< No available engine  */    
        STTD_ERROR_OPERATION_FAILED             = TIZEN_ERROR_STT | 0x04,       /**< Operation failed  */
        STTD_ERROR_NOT_SUPPORTED_FEATURE        = TIZEN_ERROR_STT | 0x05,       /**< Not supported feature of current engine */
-       STTD_ERROR_NO_SPEECH                    = TIZEN_ERROR_STT | 0x06        /**< No speech while recording */
+       STTD_ERROR_NO_SPEECH                    = TIZEN_ERROR_STT | 0x06,       /**< No speech while recording */
+       STTD_ERROR_RECORDING_TIMED_OUT          = TIZEN_ERROR_STT | 0x10        /**< Recording timed out */
 } stt_error_e;
 
 typedef enum {

diff --git a/server/sttd_recorder.c b/server/sttd_recorder.c
index 629fb359991fd19a70ae1506c0369240d75f10a5..a1136c97a7500e7e5eb47eb332aff6095ec24bb0 100644 (file)
--- a/server/sttd_recorder.c
+++ b/server/sttd_recorder.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_recorder.h b/server/sttd_recorder.h
index 38cc0c48185641bc2c4ad3d0a9169b4eb8899fa3..7cf6946b41a469558cf58def7d0b22216d5abb61 100644 (file)
--- a/server/sttd_recorder.h
+++ b/server/sttd_recorder.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_server.c b/server/sttd_server.c
index 8ea0fd2200e7f356c145c7b44be2d907c3782848..47bea9337b4e7b5db0825f7e7dc08a4ec35e12ab 100644 (file)
--- a/server/sttd_server.c
+++ b/server/sttd_server.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttd_server.h b/server/sttd_server.h
index 91a389970602417278cb6e972692473e6da5b7ce..ec77117ef0db183a1f681f947f4c460cc0809c0a 100644 (file)
--- a/server/sttd_server.h
+++ b/server/sttd_server.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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

diff --git a/server/sttp.h b/server/sttp.h
index e1f7032c98473a7b11f38b5d217a35121c8f5183..72366b18ae6ba1f60aafe849a8c45240ad1f29a3 100644 (file)
--- a/server/sttp.h
+++ b/server/sttp.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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
@@ -44,7 +44,8 @@ typedef enum {
        STTP_ERROR_ENGINE_NOT_FOUND             = TIZEN_ERROR_STT | 0x03,       /**< No available engine  */
        STTP_ERROR_OPERATION_FAILED             = TIZEN_ERROR_STT | 0x04,       /**< Operation failed  */
        STTP_ERROR_NOT_SUPPORTED_FEATURE        = TIZEN_ERROR_STT | 0x05,       /**< Not supported feature of current engine */
-       STTP_ERROR_NO_SPEECH                    = TIZEN_ERROR_STT | 0x06        /**< No speech while recording */
+       STTP_ERROR_NO_SPEECH                    = TIZEN_ERROR_STT | 0x06,       /**< No speech while recording */
+       STTP_ERROR_RECORDING_TIMED_OUT          = TIZEN_ERROR_STT | 0x10        /**< Recording timed out */
 }sttp_error_e;
 
 /**
@@ -357,6 +358,7 @@ typedef int (*sttpe_foreach_result_time)(void* time_info, sttpe_result_time_cb c
 * @retval #STTP_ERROR_INVALID_LANGUAGE Invalid language
 * @retval #STTP_ERROR_OPERATION_FAILED Operation failed
 * @retval #STTP_ERROR_OUT_OF_NETWORK Out of network
+* @retval #STTP_ERROR_PERMISSION_DENIED Permission denied
 *
 * @pre The engine is not in recognition processing.
 *

diff --git a/test/test_main.c b/test/test_main.c
old mode 100755 (executable)
new mode 100644 (file)
index 03a99c8..5d98a06
--- a/test/test_main.c
+++ b/test/test_main.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 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