Fix bugs

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 380dc6d..b5eeead 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/tts.c b/client/tts.c
index 6fdc4eb..4bd0740 100644 (file)
--- a/client/tts.c
+++ b/client/tts.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
@@ -82,6 +82,7 @@ static const char* __tts_get_error_code(tts_error_e err)
        case TTS_ERROR_ENGINE_NOT_FOUND:        return "TTS_ERROR_ENGINE_NOT_FOUND";
        case TTS_ERROR_OPERATION_FAILED:        return "TTS_ERROR_OPERATION_FAILED";
        case TTS_ERROR_AUDIO_POLICY_BLOCKED:    return "TTS_ERROR_AUDIO_POLICY_BLOCKED";
+       case TTS_ERROR_NOT_SUPPORTED_FEATURE:   return "TTS_ERROR_NOT_SUPPORTED_FEATURE";
        default:
                return "Invalid error code";
        }
@@ -98,7 +99,7 @@ static int __tts_convert_config_error_code(tts_config_error_e code)
        if (code == TTS_CONFIG_ERROR_INVALID_VOICE)             return TTS_ERROR_INVALID_VOICE;
        if (code == TTS_CONFIG_ERROR_ENGINE_NOT_FOUND)          return TTS_ERROR_ENGINE_NOT_FOUND;
        if (code == TTS_CONFIG_ERROR_OPERATION_FAILED)          return TTS_ERROR_OPERATION_FAILED;
-       if (code == TTS_CONFIG_ERROR_NOT_SUPPORTED_FEATURE)     return TTS_ERROR_OPERATION_FAILED;
+       if (code == TTS_CONFIG_ERROR_NOT_SUPPORTED_FEATURE)     return TTS_ERROR_NOT_SUPPORTED_FEATURE;
 
        return code;
 }
@@ -1477,7 +1478,7 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data)
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null");
                return TTS_ERROR_INVALID_PARAMETER;
        }
-       
+
        if (NULL == key || NULL == data) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Invalid parameter");
                return TTS_ERROR_INVALID_PARAMETER;
@@ -1495,11 +1496,6 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data)
                return TTS_ERROR_INVALID_STATE;
        }
 
-       if (false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode) {
-               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Screen reader option is NOT available. Ignore this request");
-               return TTS_ERROR_INVALID_STATE;
-       }
-
        int ret = -1;
        int count = 0;
        while (0 != ret) {
@@ -1538,7 +1534,7 @@ int tts_get_private_data(tts_h tts, const char* key, char** data)
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null");
                return TTS_ERROR_INVALID_PARAMETER;
        }
-       
+
        if (NULL == key || NULL == data) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Invalid parameter");
                return TTS_ERROR_INVALID_PARAMETER;
@@ -1556,11 +1552,6 @@ int tts_get_private_data(tts_h tts, const char* key, char** data)
                return TTS_ERROR_INVALID_STATE;
        }
 
-       if (false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode) {
-               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Screen reader option is NOT available. Ignore this request");
-               return TTS_ERROR_INVALID_STATE;
-       }
-
        int ret = -1;
        int count = 0;
        while (0 != ret) {

diff --git a/client/tts_client.c b/client/tts_client.c
index 77efdef..0a76de5 100644 (file)
--- a/client/tts_client.c
+++ b/client/tts_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/tts_client.h b/client/tts_client.h
index 388d99a..6d68d23 100644 (file)
--- a/client/tts_client.h
+++ b/client/tts_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/tts_dbus.c b/client/tts_dbus.c
index dc7c755..b8725c6 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_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

diff --git a/client/tts_dbus.h b/client/tts_dbus.h
index e9d0a7c..429d8aa 100644 (file)
--- a/client/tts_dbus.h
+++ b/client/tts_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/tts_main.h b/client/tts_main.h
old mode 100755 (executable)
new mode 100644 (file)
index e270fe6..8f0885d
--- a/client/tts_main.h
+++ b/client/tts_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/tts_setting.c b/client/tts_setting.c
index 4dc9b14..fa11422 100644 (file)
--- a/client/tts_setting.c
+++ b/client/tts_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/tts_config_mgr.c b/common/tts_config_mgr.c
old mode 100755 (executable)
new mode 100644 (file)
index c323f4f..fffeee7
--- a/common/tts_config_mgr.c
+++ b/common/tts_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

diff --git a/common/tts_config_mgr.h b/common/tts_config_mgr.h
old mode 100755 (executable)
new mode 100644 (file)
index 9963c06..1f6a509
--- a/common/tts_config_mgr.h
+++ b/common/tts_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/tts_config_parser.c b/common/tts_config_parser.c
index e115b0b..c29a595 100644 (file)
--- a/common/tts_config_parser.c
+++ b/common/tts_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/tts_config_parser.h b/common/tts_config_parser.h
old mode 100755 (executable)
new mode 100644 (file)
index ab662b4..42a1f0a
--- a/common/tts_config_parser.h
+++ b/common/tts_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/tts_defs.h b/common/tts_defs.h
index 5f97674..c9493b7 100644 (file)
--- a/common/tts_defs.h
+++ b/common/tts_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/doc/uix_tts_doc.h b/doc/uix_tts_doc.h
index 03446f6..07ce89a 100644 (file)
--- a/doc/uix_tts_doc.h
+++ b/doc/uix_tts_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/tts.h b/include/tts.h
index 6d0dc9f..c49acab 100644 (file)
--- a/include/tts.h
+++ b/include/tts.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.
@@ -50,7 +50,8 @@ typedef enum {
        TTS_ERROR_INVALID_VOICE         = TIZEN_ERROR_TTS | 0x02,       /**< Invalid voice */
        TTS_ERROR_ENGINE_NOT_FOUND      = TIZEN_ERROR_TTS | 0x03,       /**< No available engine */
        TTS_ERROR_OPERATION_FAILED      = TIZEN_ERROR_TTS | 0x04,       /**< Operation failed */
-       TTS_ERROR_AUDIO_POLICY_BLOCKED  = TIZEN_ERROR_TTS | 0x05        /**< Audio policy blocked */
+       TTS_ERROR_AUDIO_POLICY_BLOCKED  = TIZEN_ERROR_TTS | 0x05,       /**< Audio policy blocked */
+       TTS_ERROR_NOT_SUPPORTED_FEATURE = TIZEN_ERROR_TTS | 0x06        /**< Not supported feature of current engine*/
 } tts_error_e;
 
 /** 
@@ -537,7 +538,7 @@ int tts_get_error_message(tts_h tts, char** err_msg);
  * @retval #TTS_ERROR_INVALID_VOICE Invalid voice about language, voice type
  * @retval #TTS_ERROR_OPERATION_FAILED Operation failure
  * @retval #TTS_ERROR_NOT_SUPPORTED TTS NOT supported
- * @retval #TTS_ERROR_PERMISSION_DENIED Permission denied 
+ * @retval #TTS_ERROR_PERMISSION_DENIED Permission denied
  *
  * @pre The state should be #TTS_STATE_READY, #TTS_STATE_PLAYING or #TTS_STATE_PAUSED.
  * @see tts_get_max_text_size()
@@ -558,7 +559,7 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
  * @retval #TTS_ERROR_INVALID_STATE Invalid state
  * @retval #TTS_ERROR_OPERATION_FAILED Operation failure
  * @retval #TTS_ERROR_NOT_SUPPORTED TTS NOT supported
- * @retval #TTS_ERROR_PERMISSION_DENIED Permission denied 
+ * @retval #TTS_ERROR_PERMISSION_DENIED Permission denied
  *
  * @pre The current state should be #TTS_STATE_READY or #TTS_STATE_PAUSED.
  * @post If this function succeeds, the TTS state will be #TTS_STATE_PLAYING.

diff --git a/include/tts_setting.h b/include/tts_setting.h
index 2c60c77..34d4a32 100644 (file)
--- a/include/tts_setting.h
+++ b/include/tts_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/ttsd_config.c b/server/ttsd_config.c
old mode 100755 (executable)
new mode 100644 (file)
index af29e5b..e8878b5
--- a/server/ttsd_config.c
+++ b/server/ttsd_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/ttsd_config.h b/server/ttsd_config.h
old mode 100755 (executable)
new mode 100644 (file)
index 5a627f8..26ad74f
--- a/server/ttsd_config.h
+++ b/server/ttsd_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/ttsd_data.cpp b/server/ttsd_data.cpp
old mode 100755 (executable)
new mode 100644 (file)
index e194243..f2c0c4e
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -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/ttsd_data.h b/server/ttsd_data.h
old mode 100755 (executable)
new mode 100644 (file)
index 8de7cde..2e2e187
--- a/server/ttsd_data.h
+++ b/server/ttsd_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/ttsd_dbus.c b/server/ttsd_dbus.c
index 630138b..a089213 100644 (file)
--- a/server/ttsd_dbus.c
+++ b/server/ttsd_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
@@ -47,6 +47,7 @@ const char* __ttsd_get_error_code(ttsd_error_e err)
        case TTSD_ERROR_TIMED_OUT:              return "TTS_ERROR_TIMED_OUT";
        case TTSD_ERROR_OPERATION_FAILED:       return "TTS_ERROR_OPERATION_FAILED";
        case TTSD_ERROR_AUDIO_POLICY_BLOCKED:   return "TTS_ERROR_AUDIO_POLICY_BLOCKED";
+       case TTSD_ERROR_NOT_SUPPORTED_FEATURE:  return "TTSD_ERROR_NOT_SUPPORTED_FEATURE";
        default:
                return "Invalid error code";
        }

diff --git a/server/ttsd_dbus.h b/server/ttsd_dbus.h
index 4e95e17..f4772c5 100644 (file)
--- a/server/ttsd_dbus.h
+++ b/server/ttsd_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/ttsd_dbus_server.c b/server/ttsd_dbus_server.c
index c774b5a..3651fb3 100644 (file)
--- a/server/ttsd_dbus_server.c
+++ b/server/ttsd_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

diff --git a/server/ttsd_dbus_server.h b/server/ttsd_dbus_server.h
index c316820..47930c0 100644 (file)
--- a/server/ttsd_dbus_server.h
+++ b/server/ttsd_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/ttsd_engine_agent.c b/server/ttsd_engine_agent.c
index 8af7964..8074660 100644 (file)
--- a/server/ttsd_engine_agent.c
+++ b/server/ttsd_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
@@ -107,7 +107,7 @@ static bool __supported_voice_cb(const char* language, int type, void* user_data
 static void __free_voice_list(GList* voice_list);
 
 /** Callback function for engine info */
-static void __engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name, 
+static void __engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name,
                      bool use_network, void* user_data);
 
 
@@ -149,7 +149,18 @@ int ttsd_engine_agent_init(synth_result_callback result_cb)
        g_cur_engine.is_set = false;
        g_cur_engine.handle = NULL;
        g_cur_engine.pefuncs = (ttspe_funcs_s*)calloc(1, sizeof(ttspe_funcs_s));
+       if (NULL == g_cur_engine.pefuncs) {
+               SLOG(LOG_ERROR, get_tag(), "[Engine Agent ERROR] Fail to allocate memory");
+               return TTSP_ERROR_OUT_OF_MEMORY;
+       }
+
        g_cur_engine.pdfuncs = (ttspd_funcs_s*)calloc(1, sizeof(ttspd_funcs_s));
+       if (NULL == g_cur_engine.pdfuncs) {
+               SLOG(LOG_ERROR, get_tag(), "[Engine Agent ERROR] Fail to allocate memory");
+               free(g_cur_engine.pefuncs);
+               g_cur_engine.pefuncs = NULL;
+               return TTSP_ERROR_OUT_OF_MEMORY;
+       }
 
        g_agent_init = true;
 
@@ -787,64 +798,13 @@ int ttsd_engine_agent_load_current_engine()
        if (NULL != g_cur_engine.pefuncs->set_pitch) {
                ret = g_cur_engine.pefuncs->set_pitch(g_cur_engine.default_pitch);
                if (0 != ret) {
-                       SLOG(LOG_ERROR, get_tag(), "[Engine Agent ERROR] Fail to set pitch : pitch(%d), result(%s)", 
+                       SLOG(LOG_ERROR, get_tag(), "[Engine Agent ERROR] Fail to set pitch : pitch(%d), result(%s)",
                                g_cur_engine.default_pitch, __ttsd_get_engine_error_code(ret));
                        return TTSD_ERROR_OPERATION_FAILED;
                }
                SLOG(LOG_DEBUG, get_tag(), "[Engine Agent SUCCESS] Set default pitch : pitch(%d)", g_cur_engine.default_pitch);
        }
 
-#if 0
-       if (false == set_voice) {
-               /* get language list */
-               int ret;
-               GList* voice_list = NULL;
-
-               ret = g_cur_engine.pefuncs->foreach_voices(__supported_voice_cb, &voice_list);
-
-               if (0 == ret && 0 < g_list_length(voice_list)) {
-                       GList *iter = NULL;
-                       voice_s* voice = NULL;
-
-                       iter = g_list_first(voice_list);
-
-                       /* check english */
-                       while (NULL != iter) {
-                               voice = iter->data;
-
-                               if (NULL != voice) {
-                                       if (0 == strcmp("en_US", voice->language))
-                                               break;
-                               }
-
-                               iter = g_list_next(iter);
-                       }
-                       if (NULL == voice) {
-                               SLOG(LOG_ERROR, get_tag(), "[Engine ERROR] Fail to find voice in list");
-                               return TTSD_ERROR_OPERATION_FAILED;
-                       }
-
-                       /* Set selected language and type */
-                       if (true != g_cur_engine.pefuncs->is_valid_voice(voice->language, voice->type)) {
-                               SLOG(LOG_ERROR, get_tag(), "[Engine ERROR] Fail voice is NOT valid");
-                               return TTSD_ERROR_OPERATION_FAILED;
-                       }
-
-                       ttsd_config_set_default_voice(voice->language, (int)voice->type);
-
-                       g_cur_engine.default_lang = strdup(voice->language);
-                       g_cur_engine.default_vctype = voice->type;
-
-                       SLOG(LOG_DEBUG, get_tag(), "[Engine Agent SUCCESS] Select default voice : lang(%s), type(%d)",
-                                voice->language,  voice->type);
-
-                       __free_voice_list(voice_list);
-               } else {
-                       SLOG(LOG_ERROR, get_tag(), "[Engine ERROR] Fail to get language list : result(%d)", ret);
-                       return TTSD_ERROR_OPERATION_FAILED;
-               }
-       }
-#endif
        g_cur_engine.is_loaded = true;
 
        return 0;
@@ -1300,7 +1260,7 @@ int ttsd_engine_agent_is_credential_needed(int uid, bool* credential_needed)
 
        if (NULL == g_cur_engine.pefuncs->need_app_credential) {
                SLOG(LOG_ERROR, get_tag(), "[Engine Agent ERROR] Not support to check app credential");
-               return TTSD_ERROR_OPERATION_FAILED;
+               return TTSD_ERROR_NOT_SUPPORTED_FEATURE;
        }
 
        bool result = false;

diff --git a/server/ttsd_engine_agent.h b/server/ttsd_engine_agent.h
index abb72a5..4434c44 100644 (file)
--- a/server/ttsd_engine_agent.h
+++ b/server/ttsd_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/ttsd_main.c b/server/ttsd_main.c
index cb1fb14..4565cfb 100644 (file)
--- a/server/ttsd_main.c
+++ b/server/ttsd_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/ttsd_main.h b/server/ttsd_main.h
index 03df745..d5c6291 100644 (file)
--- a/server/ttsd_main.h
+++ b/server/ttsd_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
@@ -50,7 +50,7 @@ typedef enum {
        TTSD_ERROR_ENGINE_NOT_FOUND             = TIZEN_ERROR_TTS | 0x03,       /**< No available engine */
        TTSD_ERROR_OPERATION_FAILED             = TIZEN_ERROR_TTS | 0x04,       /**< Operation failed */
        TTSD_ERROR_AUDIO_POLICY_BLOCKED         = TIZEN_ERROR_TTS | 0x05,       /**< Audio policy blocked */
-       TTSD_ERROR_NOT_SUPPORTED_FEATURE        = TIZEN_ERROR_TTS | 0x06        /**< Not supported feature */
+       TTSD_ERROR_NOT_SUPPORTED_FEATURE        = TIZEN_ERROR_TTS | 0x06        /**< Not supported feature of current engine*/
 } ttsd_error_e;
 
 typedef enum {

diff --git a/server/ttsd_main_noti.c b/server/ttsd_main_noti.c
index d9082dd..c517503 100644 (file)
--- a/server/ttsd_main_noti.c
+++ b/server/ttsd_main_noti.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/ttsd_main_sr.c b/server/ttsd_main_sr.c
index 84b716e..97e2461 100644 (file)
--- a/server/ttsd_main_sr.c
+++ b/server/ttsd_main_sr.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/ttsd_network.c b/server/ttsd_network.c
index dfc8263..9ee3cf5 100644 (file)
--- a/server/ttsd_network.c
+++ b/server/ttsd_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/server/ttsd_network.h b/server/ttsd_network.h
index 51aaf71..ca17854 100644 (file)
--- a/server/ttsd_network.h
+++ b/server/ttsd_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/server/ttsd_player.c b/server/ttsd_player.c
old mode 100755 (executable)
new mode 100644 (file)
index 502da43..6f41654
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.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/ttsd_player.h b/server/ttsd_player.h
old mode 100755 (executable)
new mode 100644 (file)
index e3b6594..a59214b
--- a/server/ttsd_player.h
+++ b/server/ttsd_player.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/ttsd_server.c b/server/ttsd_server.c
index 24a33a2..f3343cc 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_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/ttsd_server.h b/server/ttsd_server.h
index 642d509..d044f64 100644 (file)
--- a/server/ttsd_server.h
+++ b/server/ttsd_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/ttsp.h b/server/ttsp.h
index c3c55f7..5bd6e7e 100644 (file)
--- a/server/ttsp.h
+++ b/server/ttsp.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
@@ -32,19 +32,20 @@ extern "C" {
  * @brief Enumeration for error code.
 */
 typedef enum {
-       TTSP_ERROR_NONE                 = TIZEN_ERROR_NONE,             /**< Successful */
-       TTSP_ERROR_OUT_OF_MEMORY        = TIZEN_ERROR_OUT_OF_MEMORY,    /**< Out of Memory */
-       TTSP_ERROR_IO_ERROR             = TIZEN_ERROR_IO_ERROR,         /**< I/O error */
-       TTSP_ERROR_INVALID_PARAMETER    = TIZEN_ERROR_INVALID_PARAMETER,/**< Invalid parameter */
-       TTSP_ERROR_OUT_OF_NETWORK       = TIZEN_ERROR_NETWORK_DOWN,     /**< Network is down */
-       TTSP_ERROR_TIMED_OUT            = TIZEN_ERROR_TIMED_OUT,        /**< No answer from the daemon */
-       TTSP_ERROR_PERMISSION_DENIED    = TIZEN_ERROR_PERMISSION_DENIED,/**< Permission denied */
-       TTSP_ERROR_NOT_SUPPORTED        = TIZEN_ERROR_NOT_SUPPORTED,    /**< TTS NOT supported */
-       TTSP_ERROR_INVALID_STATE        = TIZEN_ERROR_TTS | 0x01,       /**< Invalid state */
-       TTSP_ERROR_INVALID_VOICE        = TIZEN_ERROR_TTS | 0x02,       /**< Invalid voice */
-       TTSP_ERROR_ENGINE_NOT_FOUND     = TIZEN_ERROR_TTS | 0x03,       /**< No available engine */
-       TTSP_ERROR_OPERATION_FAILED     = TIZEN_ERROR_TTS | 0x04,       /**< Operation failed */
-       TTSP_ERROR_AUDIO_POLICY_BLOCKED = TIZEN_ERROR_TTS | 0x05        /**< Audio policy blocked */
+       TTSP_ERROR_NONE                         = TIZEN_ERROR_NONE,             /**< Successful */
+       TTSP_ERROR_OUT_OF_MEMORY                = TIZEN_ERROR_OUT_OF_MEMORY,    /**< Out of Memory */
+       TTSP_ERROR_IO_ERROR                     = TIZEN_ERROR_IO_ERROR,         /**< I/O error */
+       TTSP_ERROR_INVALID_PARAMETER            = TIZEN_ERROR_INVALID_PARAMETER,/**< Invalid parameter */
+       TTSP_ERROR_OUT_OF_NETWORK               = TIZEN_ERROR_NETWORK_DOWN,     /**< Network is down */
+       TTSP_ERROR_TIMED_OUT                    = TIZEN_ERROR_TIMED_OUT,        /**< No answer from the daemon */
+       TTSP_ERROR_PERMISSION_DENIED            = TIZEN_ERROR_PERMISSION_DENIED,/**< Permission denied */
+       TTSP_ERROR_NOT_SUPPORTED                = TIZEN_ERROR_NOT_SUPPORTED,    /**< TTS NOT supported */
+       TTSP_ERROR_INVALID_STATE                = TIZEN_ERROR_TTS | 0x01,       /**< Invalid state */
+       TTSP_ERROR_INVALID_VOICE                = TIZEN_ERROR_TTS | 0x02,       /**< Invalid voice */
+       TTSP_ERROR_ENGINE_NOT_FOUND             = TIZEN_ERROR_TTS | 0x03,       /**< No available engine */
+       TTSP_ERROR_OPERATION_FAILED             = TIZEN_ERROR_TTS | 0x04,       /**< Operation failed */
+       TTSP_ERROR_AUDIO_POLICY_BLOCKED         = TIZEN_ERROR_TTS | 0x05,       /**< Audio policy blocked */
+       TTSP_ERROR_NOT_SUPPORTED_FEATURE        = TIZEN_ERROR_TTS | 0x06        /**< Not supported feature of current engine*/
 } ttsp_error_e;
 
 /**

diff --git a/test/test_main.c b/test/test_main.c
old mode 100755 (executable)
new mode 100644 (file)
index 835e98b..428a356
--- 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
@@ -56,7 +56,7 @@ static bool __tts_test_get_text_from_file(const char* path, char** text)
        temp = (char*)calloc(1, text_len+1);
 
        if (temp == NULL) {
-               SLOG(LOG_ERROR, tts_tag(), "Fail to memory allocation");                
+               SLOG(LOG_ERROR, tts_tag(), "Fail to memory allocation");
                fclose(fp);
                return 0;
        }