From fee4d1885d26f52f9f84cb31d649757a921a821e Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Fri, 1 Jul 2016 10:29:36 +0900 Subject: [PATCH] Fix to handle the null private data Change-Id: Iba7658bb161aae1fe07b10785b33d4e97bf063ff Signed-off-by: sooyeon.kim --- client/CMakeLists.txt | 2 +- client/stt.c | 13 +++++- client/stt_client.h | 4 +- client/stt_dbus.c | 100 ++++++++++++++++++++++----------------------- client/stt_file.c | 2 +- client/stt_file_client.c | 6 +-- client/stt_main.h | 4 +- common/stt_config_mgr.c | 10 ++--- common/stt_config_mgr.h | 2 +- common/stt_engine.c | 7 +++- common/stt_engine.h | 2 +- doc/uix_stt_doc.h | 18 ++++---- include/stt_setting.h | 44 ++++++++++---------- packaging/stt.spec | 2 +- server/sttd_config.c | 10 ++--- server/sttd_config.h | 6 +-- server/sttd_dbus_server.c | 37 +++++++++-------- server/sttd_dbus_server.h | 2 +- server/sttd_engine_agent.c | 4 +- server/sttd_engine_agent.h | 2 +- server/sttd_main.c | 4 +- server/sttd_main.h | 2 +- server/sttd_recorder.c | 12 +++--- server/sttd_server.c | 2 +- stt-server.conf | 4 +- 25 files changed, 157 insertions(+), 144 deletions(-) mode change 100644 => 100755 client/stt.c diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 1c2662c..9f4a756 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(SRCS +SET(SRCS stt.c stt_client.c stt_dbus.c diff --git a/client/stt.c b/client/stt.c old mode 100644 new mode 100755 index 3211123..134596b --- a/client/stt.c +++ b/client/stt.c @@ -85,7 +85,7 @@ static int __check_privilege_initialize() int ret = cynara_initialize(&p_cynara, NULL); if (CYNARA_API_SUCCESS != ret) SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to initialize"); - + return ret == CYNARA_API_SUCCESS; } @@ -148,7 +148,7 @@ static int __stt_check_privilege() } g_privilege_allowed = 1; - return STT_ERROR_NONE; + return STT_ERROR_NONE; } static const char* __stt_get_error_code(stt_error_e err) @@ -532,6 +532,8 @@ int stt_set_engine(stt_h stt, const char* engine_id) free(client->current_engine_id); } + SLOG(LOG_DEBUG, TAG_STTC, "===== engined_id(%s)", engine_id); + client->current_engine_id = strdup(engine_id); SLOG(LOG_DEBUG, TAG_STTC, "====="); @@ -672,6 +674,11 @@ int stt_get_private_data(stt_h stt, const char* key, char** data) } } + if (0 == strncmp(*data, "NULL", strlen(*data))) { + free(*data); + *data = NULL; + } + SLOG(LOG_DEBUG, TAG_STTC, "====="); SLOG(LOG_DEBUG, TAG_STTC, ""); @@ -731,6 +738,8 @@ static Eina_Bool __stt_connect_daemon(void *data) int count = 0; silence_supported = false; credential_needed = false; + SLOG(LOG_DEBUG, TAG_STTC, "[WARNING] current_engine_id(%s)", client->current_engine_id); + while (0 != ret) { ret = stt_dbus_request_set_current_engine(client->uid, client->current_engine_id, &silence_supported, &credential_needed); if (0 != ret) { diff --git a/client/stt_client.h b/client/stt_client.h index 43cf60e..ed77143 100644 --- a/client/stt_client.h +++ b/client/stt_client.h @@ -33,7 +33,7 @@ typedef enum { typedef struct { /* base info */ stt_h stt; - int pid; + int pid; int uid; /*<< unique id = pid + handle */ stt_recognition_result_cb recognition_result_cb; @@ -77,7 +77,7 @@ typedef struct { char** data_list; int data_count; char* msg; - + /* error data */ int reason; char* err_msg; diff --git a/client/stt_dbus.c b/client/stt_dbus.c index 1c5682b..3728b02 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -150,7 +150,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set volume : uid(%d), volume(%f)", uid, volume); + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set volume : uid(%d), volume(%f)", uid, volume); __stt_cb_set_volume(uid, volume); /* SLOG(LOG_DEBUG, TAG_STTC, "====="); */ @@ -334,8 +334,8 @@ int stt_dbus_open_connection() dbus_bus_request_name(g_conn_listener, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING , &err); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "Name Error (%s)", err.message); - dbus_error_free(&err); + SLOG(LOG_ERROR, TAG_STTC, "Name Error (%s)", err.message); + dbus_error_free(&err); } char rule[128] = {0, }; @@ -428,9 +428,9 @@ int stt_dbus_request_hello() 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_HELLO); if (NULL == msg) { @@ -483,9 +483,9 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti 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_INITIALIZE); if (NULL == msg) { @@ -554,9 +554,9 @@ int stt_dbus_request_finalize(int uid) 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_FINALIZE); if (NULL == msg) { @@ -582,7 +582,7 @@ int stt_dbus_request_finalize(int uid) } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, + dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); @@ -613,16 +613,16 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si 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_CURRENT_ENGINE); if (NULL == msg) { SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set engine : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set engine : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set engine : uid(%d), engine_id(%s)", uid, (NULL == engine_id) ? "NULL" : engine_id); } dbus_message_append_args(msg, @@ -644,15 +644,15 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, DBUS_TYPE_INT32, silence_supported, DBUS_TYPE_INT32, credential_needed, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); - dbus_error_free(&err); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } @@ -683,9 +683,9 @@ int stt_dbus_request_check_app_agreed(int uid, const char* appid, bool* value) 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_CHECK_APP_AGREED); if (NULL == msg) { @@ -752,9 +752,9 @@ int stt_dbus_request_get_support_langs(int uid, stt_h stt, stt_supported_languag 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_SUPPORT_LANGS); if (NULL == msg) { @@ -837,9 +837,9 @@ int stt_dbus_request_get_default_lang(int uid, char** language) 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_CURRENT_LANG); if (NULL == msg) { @@ -1051,9 +1051,9 @@ int stt_dbus_request_is_recognition_type_supported(int uid, const char* type, bo 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_IS_TYPE_SUPPORTED); if (NULL == msg) { @@ -1120,9 +1120,9 @@ int stt_dbus_request_set_start_sound(int uid, const char* file) 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_START_SOUND); if (NULL == msg) { @@ -1181,9 +1181,9 @@ int stt_dbus_request_unset_start_sound(int uid) 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_UNSET_START_SOUND); if (NULL == msg) { @@ -1246,9 +1246,9 @@ int stt_dbus_request_set_stop_sound(int uid, const char* file) 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_STOP_SOUND); if (NULL == msg) { @@ -1307,9 +1307,9 @@ int stt_dbus_request_unset_stop_sound(int uid) 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_UNSET_STOP_SOUND); if (NULL == msg) { @@ -1479,8 +1479,8 @@ int stt_dbus_request_stop(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, + STT_SERVER_SERVICE_OBJECT_PATH, + STT_SERVER_SERVICE_INTERFACE, STT_METHOD_STOP); if (NULL == msg) { @@ -1490,8 +1490,8 @@ int stt_dbus_request_stop(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt stop : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) { @@ -1570,8 +1570,8 @@ int stt_dbus_request_cancel(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) { diff --git a/client/stt_file.c b/client/stt_file.c index fcfb863..d8bda45 100644 --- a/client/stt_file.c +++ b/client/stt_file.c @@ -75,7 +75,7 @@ static const char* __stt_file_get_error_code(stt_file_error_e err) } } -void __stt_file_engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name, +void __stt_file_engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name, bool use_network, void* user_data) { sttengine_info_s* temp = (sttengine_info_s*)user_data; diff --git a/client/stt_file_client.c b/client/stt_file_client.c index c194bd8..40f722e 100644 --- a/client/stt_file_client.c +++ b/client/stt_file_client.c @@ -45,13 +45,13 @@ int stt_file_client_new() g_client_info->current_engine_id = -1; g_client_info->time_info = NULL; - + g_client_info->before_state = STT_FILE_STATE_READY; g_client_info->current_state = STT_FILE_STATE_READY; g_client_info->cb_ref_count = 0; - return 0; + return 0; } int stt_file_client_destroy() @@ -63,7 +63,7 @@ int stt_file_client_destroy() while (0 != g_client_info->cb_ref_count) { /* wait for release callback function */ } - + free(g_client_info); g_client_info = NULL; diff --git a/client/stt_main.h b/client/stt_main.h index 79044bf..e4d4a04 100644 --- a/client/stt_main.h +++ b/client/stt_main.h @@ -31,9 +31,9 @@ extern "C" { #endif -#define TAG_STTC "sttc" +#define TAG_STTC "sttc" -/** +/** * @brief A structure of handle for identification */ struct stt_s { diff --git a/common/stt_config_mgr.c b/common/stt_config_mgr.c index 3fd7844..626f054 100644 --- a/common/stt_config_mgr.c +++ b/common/stt_config_mgr.c @@ -361,7 +361,7 @@ int __stt_config_set_auto_language() SLOG(LOG_ERROR, stt_tag(), "Current config info is NULL"); return STT_CONFIG_ERROR_OPERATION_FAILED; } - + /* Check current language */ if (NULL == g_config_info->language) { SLOG(LOG_ERROR, stt_tag(), "Current config language is NULL"); @@ -962,7 +962,7 @@ int stt_config_mgr_get_engine_list(stt_config_supported_engine_cb callback, void return STT_CONFIG_ERROR_OPERATION_FAILED; } - if (false == callback(engine_info->uuid, engine_info->name, + if (false == callback(engine_info->uuid, engine_info->name, engine_info->setting, engine_info->support_silence_detection, user_data)) { break; } @@ -1067,7 +1067,7 @@ int stt_config_mgr_set_engine(const char* engine) SLOG(LOG_DEBUG, stt_tag(), " %s", lang); if (NULL != lang && NULL != g_config_info->language) { - if (0 == strcmp(lang, g_config_info->language)) { + if (0 == strcmp(lang, g_config_info->language)) { /* language is valid */ is_valid_lang = true; @@ -1512,7 +1512,7 @@ int __stt_config_mgr_print_engine_info() } else { SLOG(LOG_ERROR, stt_tag(), " language is NONE"); } - SLOG(LOG_DEBUG, stt_tag(), " silence support : %s", + SLOG(LOG_DEBUG, stt_tag(), " silence support : %s", engine_info->support_silence_detection ? "true" : "false"); iter = g_slist_next(iter); i++; @@ -1606,7 +1606,7 @@ int stt_config_mgr_foreach_time_info(stt_config_result_time_cb callback, void* u while (NULL != iter) { data = iter->data; - if (false == callback(data->index, data->event, data->text, + if (false == callback(data->index, data->event, data->text, data->start_time, data->end_time, user_data)) { break; } diff --git a/common/stt_config_mgr.h b/common/stt_config_mgr.h index 9f43044..e899c82 100644 --- a/common/stt_config_mgr.h +++ b/common/stt_config_mgr.h @@ -30,7 +30,7 @@ typedef enum { STT_CONFIG_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< STT NOT supported */ STT_CONFIG_ERROR_INVALID_STATE = TIZEN_ERROR_STT | 0x01, /**< Invalid state */ STT_CONFIG_ERROR_INVALID_LANGUAGE = TIZEN_ERROR_STT | 0x02, /**< Invalid language */ - STT_CONFIG_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_STT | 0x03, /**< No available engine */ + STT_CONFIG_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_STT | 0x03, /**< No available engine */ STT_CONFIG_ERROR_OPERATION_FAILED = TIZEN_ERROR_STT | 0x04, /**< Operation failed */ } stt_config_error_e; diff --git a/common/stt_engine.c b/common/stt_engine.c index 0311c51..e877855 100644 --- a/common/stt_engine.c +++ b/common/stt_engine.c @@ -390,7 +390,10 @@ int stt_engine_get_private_data(int engine_id, const char* key, char** data) return ret; } - *data = strdup(temp); + if (NULL == temp) + *data = strdup("NULL"); + else + *data = strdup(temp); return STTP_ERROR_NONE; } @@ -686,7 +689,7 @@ int stt_engine_foreach_result_time(int engine_id, void* time_info, sttpe_result_ return ret; } -int stt_engine_recognize_start_file(int engine_id, const char* lang, const char* recognition_type, +int stt_engine_recognize_start_file(int engine_id, const char* lang, const char* recognition_type, const char* filepath, sttp_audio_type_e audio_type, int sample_rate, void* user_param) { if (NULL == filepath || NULL == lang || NULL == recognition_type) { diff --git a/common/stt_engine.h b/common/stt_engine.h index a2c9e74..8a333ff 100644 --- a/common/stt_engine.h +++ b/common/stt_engine.h @@ -78,7 +78,7 @@ int stt_engine_foreach_result_time(int engine_id, void* time_info, sttpe_result_ /* File recognition */ -int stt_engine_recognize_start_file(int engine_id, const char* lang, const char* recognition_type, +int stt_engine_recognize_start_file(int engine_id, const char* lang, const char* recognition_type, const char* filepath, sttp_audio_type_e audio_type, int sample_rate, void* user_param); int stt_engine_recognize_cancel_file(int engine_id); diff --git a/doc/uix_stt_doc.h b/doc/uix_stt_doc.h index 6c5b97c..a55cb9a 100644 --- a/doc/uix_stt_doc.h +++ b/doc/uix_stt_doc.h @@ -11,7 +11,7 @@ * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. */ @@ -22,10 +22,10 @@ * @defgroup CAPI_UIX_STT_MODULE STT * @ingroup CAPI_UIX_FRAMEWORK * @brief The @ref CAPI_UIX_STT_MODULE API provides functions to recognize the speech. - * + * * @section CAPI_UIX_STT_MODULE_HEADER Required Header * \#include - * + * * @section CAPI_UIX_STT_MODULE_OVERVIEW Overview * A main function of Speech-To-Text (below STT) API recognizes sound data recorded by users. * After choosing a language, applications will start recording and recognizing. @@ -33,7 +33,7 @@ * * To use of STT, use the following steps:
* 1. Create a handle
- * 2. Register callback functions for notifications
+ * 2. Register callback functions for notifications
* 3. Prepare stt-daemon asynchronously
* 4. Start recording for recognition
* 5. Stop recording
@@ -52,7 +52,7 @@ * @image html capi_uix_stt_state_diagram.png "State diagram" * * @section CAPI_STT_MODULE_STATE_TRANSITIONS State Transitions - * + * * * * @@ -86,11 +86,11 @@ * * *
FUNCTIONASYNC
- * + * * @section CAPI_STT_MODULE_STATE_DEPENDENT_FUNCTION_FUNCTION_CALLS State Dependent Function Calls * The following table shows state-dependent function calls. It is forbidden to call functions listed below in wrong states. * Violation of this rule may result in an unpredictable behavior. - * + * * * * @@ -196,7 +196,7 @@ * * *
FUNCTIONAll callback function should be registered / unregistered in Created state
- * + * * @section CAPI_UIX_STT_MODULE_FEATURE Related Features * This API is related with the following features:
* - http://tizen.org/feature/speech.recognition
@@ -206,7 +206,7 @@ * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.
* To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.
* More details on featuring your application can be found from Feature Element. - * + * */ #endif /* __TIZEN_UIX_STT_DOC_H__ */ diff --git a/include/stt_setting.h b/include/stt_setting.h index 13f90f0..b2ffdf3 100644 --- a/include/stt_setting.h +++ b/include/stt_setting.h @@ -30,7 +30,7 @@ extern "C" { #endif -/** +/** * @brief Enumerations of error codes. */ typedef enum { @@ -44,12 +44,12 @@ typedef enum { STT_SETTING_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< STT is NOT supported */ STT_SETTING_ERROR_INVALID_STATE = TIZEN_ERROR_STT | 0x01, /**< Invalid state */ STT_SETTING_ERROR_INVALID_LANGUAGE = TIZEN_ERROR_STT | 0x02, /**< Invalid language */ - STT_SETTING_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_STT | 0x03, /**< No available engine */ + STT_SETTING_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_STT | 0x03, /**< No available engine */ STT_SETTING_ERROR_OPERATION_FAILED = TIZEN_ERROR_STT | 0x04, /**< Operation failed */ STT_SETTING_ERROR_NOT_SUPPORTED_FEATURE = TIZEN_ERROR_STT | 0x05 /**< Not supported feature of current engine */ } stt_setting_error_e; -/** +/** * @brief Enumerations of setting state. */ typedef enum { @@ -67,7 +67,7 @@ typedef enum { * @param[in] user_data User data passed from the stt_setting_foreach_supported_engines(). * * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop. -* @pre stt_setting_foreach_supported_engines() will invoke this callback. +* @pre stt_setting_foreach_supported_engines() will invoke this callback. * * @see stt_setting_foreach_supported_engines() */ @@ -78,12 +78,12 @@ typedef bool(*stt_setting_supported_engine_cb)(const char* engine_id, const char * * @param[in] engine_id Engine id. * @param[in] language A language is specified as an ISO 3166 alpha-2 two letter country-code -* followed by ISO 639-1 for the two-letter language code. +* followed by ISO 639-1 for the two-letter language code. * For example, "ko_KR" for Korean, "en_US" for American English.. * @param[in] user_data User data passed from the stt_setting_foreach_supported_languages(). * * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop. -* @pre stt_setting_foreach_supported_languages() will invoke this callback. +* @pre stt_setting_foreach_supported_languages() will invoke this callback. * * @see stt_setting_foreach_supported_languages() */ @@ -121,7 +121,7 @@ typedef void (*stt_setting_config_changed_cb)(void *user_data); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_TIMED_OUT stt daemon is blocked or stt daemon do not exist. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT setting has Already been initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT setting has Already been initialized. * @retval #STT_SETTING_ERROR_ENGINE_NOT_FOUND No available stt-engine. Engine should be installed. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -130,11 +130,11 @@ typedef void (*stt_setting_config_changed_cb)(void *user_data); int stt_setting_initialize(void); /** -* @brief finalize stt setting and disconnect to stt-daemon. +* @brief finalize stt setting and disconnect to stt-daemon. * * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -154,7 +154,7 @@ int stt_setting_finalize(void); * @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * -* @post This function invokes stt_setting_supported_engine_cb() repeatedly for getting engine information. +* @post This function invokes stt_setting_supported_engine_cb() repeatedly for getting engine information. * * @see stt_setting_supported_engine_cb() */ @@ -171,7 +171,7 @@ int stt_setting_foreach_supported_engines(stt_setting_supported_engine_cb callba * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_OUT_OF_MEMORY Out of memory. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -187,7 +187,7 @@ int stt_setting_get_engine(char** engine_id); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -204,11 +204,11 @@ int stt_setting_set_engine(const char* engine_id); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * -* @post This function invokes stt_setting_supported_language_cb() repeatedly for getting supported languages. +* @post This function invokes stt_setting_supported_language_cb() repeatedly for getting supported languages. * * @see stt_setting_supported_language_cb() */ @@ -225,7 +225,7 @@ int stt_setting_foreach_supported_languages(stt_setting_supported_language_cb ca * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_OUT_OF_MEMORY Out of memory. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -241,7 +241,7 @@ int stt_setting_get_default_language(char** language); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -257,7 +257,7 @@ int stt_setting_set_default_language(const char* language); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -273,7 +273,7 @@ int stt_setting_set_auto_language(bool value); * @return 0 on success, otherwise a negative error value. * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -284,12 +284,12 @@ int stt_setting_get_auto_language(bool* value); /** * @brief Get silence detection. * -* @param[out] value Value. +* @param[out] value Value. * * @return 0 on success, otherwise a negative error value * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * @@ -300,12 +300,12 @@ int stt_setting_get_silence_detection(bool* value); /** * @brief Set silence detection. * -* @param[in] value Value. +* @param[in] value Value. * * @return 0 on success, otherwise a negative error value * @retval #STT_SETTING_ERROR_NONE Success. * @retval #STT_SETTING_ERROR_INVALID_PARAMETER Invalid parameter. -* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. +* @retval #STT_SETTING_ERROR_INVALID_STATE STT Not initialized. * @retval #STT_SETTING_ERROR_OPERATION_FAILED Operation failure. * @retval #STT_SETTING_ERROR_NOT_SUPPORTED STT NOT supported * diff --git a/packaging/stt.spec b/packaging/stt.spec index 0350391..4c5e017 100644 --- a/packaging/stt.spec +++ b/packaging/stt.spec @@ -96,7 +96,7 @@ install LICENSE.APLv2 %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name} %make_install -%post +%post /sbin/ldconfig mkdir -p %{_libdir}/voice/ diff --git a/server/sttd_config.c b/server/sttd_config.c index cedd5d7..09bce31 100644 --- a/server/sttd_config.c +++ b/server/sttd_config.c @@ -73,9 +73,9 @@ void __config_bool_changed_cb(stt_config_type_e type, bool bool_value, void* use return; } -int sttd_config_initialize(sttd_config_engine_changed_cb engine_cb, - sttd_config_language_changed_cb lang_cb, - sttd_config_silence_changed_cb silence_cb, +int sttd_config_initialize(sttd_config_engine_changed_cb engine_cb, + sttd_config_language_changed_cb lang_cb, + sttd_config_silence_changed_cb silence_cb, void* user_data) { if (NULL == engine_cb || NULL == lang_cb || NULL == silence_cb) { @@ -90,7 +90,7 @@ int sttd_config_initialize(sttd_config_engine_changed_cb engine_cb, return -1; } - ret = stt_config_mgr_set_callback(getpid(), __sttd_config_engine_changed_cb, __sttd_config_lang_changed_cb, + ret = stt_config_mgr_set_callback(getpid(), __sttd_config_engine_changed_cb, __sttd_config_lang_changed_cb, __config_bool_changed_cb, NULL); if (0 != ret) { SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to set config changed : %d", ret); @@ -178,4 +178,4 @@ int sttd_config_time_save() int sttd_config_time_reset() { return stt_config_mgr_reset_time_info(); -} \ No newline at end of file +} diff --git a/server/sttd_config.h b/server/sttd_config.h index f6d4c99..5ab5d76 100644 --- a/server/sttd_config.h +++ b/server/sttd_config.h @@ -26,9 +26,9 @@ typedef void (*sttd_config_language_changed_cb)(const char* language, void* user typedef void (*sttd_config_silence_changed_cb)(bool value, void* user_data); -int sttd_config_initialize(sttd_config_engine_changed_cb engine_cb, - sttd_config_language_changed_cb lang_cb, - sttd_config_silence_changed_cb silence_cb, +int sttd_config_initialize(sttd_config_engine_changed_cb engine_cb, + sttd_config_language_changed_cb lang_cb, + sttd_config_silence_changed_cb silence_cb, void* user_data); int sttd_config_finalize(); diff --git a/server/sttd_dbus_server.c b/server/sttd_dbus_server.c index 721e1a6..efa4fda 100644 --- a/server/sttd_dbus_server.c +++ b/server/sttd_dbus_server.c @@ -62,7 +62,7 @@ int sttd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); - + SLOG(LOG_DEBUG, TAG_STTD, ">>>>> STT Initialize"); if (dbus_error_is_set(&err)) { @@ -70,7 +70,7 @@ int sttd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt initialize : pid(%d), uid(%d)", pid , uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt initialize : pid(%d), uid(%d)", pid , uid); ret = sttd_server_initialize(pid, uid, &silence_supported, &credential_needed); } @@ -86,7 +86,7 @@ int sttd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) if (0 == ret) { SLOG(LOG_DEBUG, TAG_STTD, "[OUT SUCCESS] Result(%d), silence(%d), credential(%d)", - ret, silence_supported, credential_needed); + ret, silence_supported, credential_needed); } else { SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret); } @@ -123,7 +123,7 @@ int sttd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt finalize : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt finalize : uid(%d)", uid); ret = sttd_server_finalize(uid); } @@ -174,7 +174,7 @@ int sttd_dbus_server_get_support_engines(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt supported engines : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt supported engines : uid(%d)", uid); ret = sttd_server_get_supported_engines(uid, &engine_list); } @@ -273,7 +273,7 @@ int sttd_dbus_server_set_current_engine(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt set current engine : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt set current engine : uid(%d), engine_id(%s)", uid, (NULL == engine_id) ? "NULL" : engine_id); ret = sttd_server_set_current_engine(uid, engine_id, &silence_supported, &credential_needed); } @@ -328,7 +328,7 @@ int sttd_dbus_server_get_current_engine(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get current engine : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get current engine : uid(%d)", uid); ret = sttd_server_get_current_engine(uid, &engine); } @@ -390,7 +390,7 @@ int sttd_dbus_server_check_app_agreed(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt Is engine available : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt Is engine available : uid(%d)", uid); ret = sttd_server_check_app_agreed(uid, appid, &available); } @@ -444,7 +444,7 @@ int sttd_dbus_server_get_support_lang(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt supported langs : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt supported langs : uid(%d)", uid); ret = sttd_server_get_supported_languages(uid, &lang_list); } @@ -523,7 +523,7 @@ int sttd_dbus_server_get_default_lang(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get default lang : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt get default lang : uid(%d)", uid); ret = sttd_server_get_current_langauage(uid, &lang); } @@ -627,6 +627,7 @@ int sttd_dbus_server_get_private_data(DBusConnection* conn, DBusMessage* msg) int uid; char* key = NULL; char* data = NULL; + int ret = 0; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &uid, @@ -712,7 +713,7 @@ int sttd_dbus_server_is_recognition_type_supported(DBusConnection* conn, DBusMes DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_STTD, "[OUT SUCCESS] Result(%d), Support(%s)", ret, support ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_STTD, "[OUT SUCCESS] Result(%d), Support(%s)", ret, support ? "true" : "false"); } else { SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret); } @@ -765,7 +766,7 @@ int sttd_dbus_server_set_start_sound(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)", ret); } else { SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret); } @@ -817,7 +818,7 @@ int sttd_dbus_server_unset_start_sound(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)", ret); } else { SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret); } @@ -922,7 +923,7 @@ int sttd_dbus_server_unset_stop_sound(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)", ret); } else { SLOG(LOG_ERROR, TAG_STTD, "[OUT ERROR] Result(%d)", ret); } @@ -958,7 +959,7 @@ int sttd_dbus_server_start(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &uid, - DBUS_TYPE_STRING, &lang, + DBUS_TYPE_STRING, &lang, DBUS_TYPE_STRING, &type, DBUS_TYPE_INT32, &silence, DBUS_TYPE_STRING, &appid, @@ -973,7 +974,7 @@ int sttd_dbus_server_start(DBusConnection* conn, DBusMessage* msg) ret = STTD_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt start : uid(%d), lang(%s), type(%s), silence(%d) appid(%s) credential(%s)" - , uid, lang, type, silence, appid, credential); + , uid, lang, type, silence, appid, credential); ret = sttd_server_start(uid, lang, type, silence, appid, credential); } @@ -1032,7 +1033,7 @@ int sttd_dbus_server_stop(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt stop : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt stop : uid(%d)", uid); ret = sttd_server_stop(uid); } @@ -1090,7 +1091,7 @@ int sttd_dbus_server_cancel(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = STTD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt cancel : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTD, "[IN] stt cancel : uid(%d)", uid); ret = sttd_server_cancel(uid); } diff --git a/server/sttd_dbus_server.h b/server/sttd_dbus_server.h index bb629c1..6e7c16d 100644 --- a/server/sttd_dbus_server.h +++ b/server/sttd_dbus_server.h @@ -28,7 +28,7 @@ int sttd_dbus_server_hello(DBusConnection* conn, DBusMessage* msg); /* * Dbus Server functions for APIs -*/ +*/ int sttd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg); diff --git a/server/sttd_engine_agent.c b/server/sttd_engine_agent.c index a00e33e..6429f04 100644 --- a/server/sttd_engine_agent.c +++ b/server/sttd_engine_agent.c @@ -51,7 +51,7 @@ typedef struct _sttengine_info { char* first_lang; bool silence_detection; bool support_silence_detection; - bool need_credential; + bool need_credential; } sttengine_info_s; /** stt engine agent init */ @@ -1553,7 +1553,7 @@ static void __recorder_destroy(void* data) if (0 != sttd_recorder_destroy(g_recording_engine_id)) { SECURE_SLOG(LOG_WARN, TAG_STTD, "[Engine Agent] Fail to destroy recorder(%d)", g_recording_engine_id); } - + if (event == STTP_RESULT_EVENT_FINAL_RESULT || event == STTP_RESULT_EVENT_ERROR) { g_recording_engine_id = -1; } diff --git a/server/sttd_engine_agent.h b/server/sttd_engine_agent.h index e0ba814..8217b3e 100644 --- a/server/sttd_engine_agent.h +++ b/server/sttd_engine_agent.h @@ -24,7 +24,7 @@ extern "C" { #endif /* -* Constants & Structures +* Constants & Structures */ #define ENGINE_PATH_SIZE 256 diff --git a/server/sttd_main.c b/server/sttd_main.c index 1d64720..6160f9f 100644 --- a/server/sttd_main.c +++ b/server/sttd_main.c @@ -31,7 +31,7 @@ int main(int argc, char** argv) SLOG(LOG_DEBUG, TAG_STTD, "===== STT Daemon Initialize"); if (!ecore_init()) { - SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to initialize Ecore"); + SLOG(LOG_ERROR, TAG_STTD, "[ERROR] Fail to initialize Ecore"); return EXIT_FAILURE; } @@ -52,7 +52,7 @@ int main(int argc, char** argv) 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, " "); diff --git a/server/sttd_main.h b/server/sttd_main.h index 3f709d1..ac773e3 100644 --- a/server/sttd_main.h +++ b/server/sttd_main.h @@ -50,7 +50,7 @@ typedef enum { STTD_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< STT NOT supported */ STTD_ERROR_INVALID_STATE = TIZEN_ERROR_STT | 0x01, /**< Invalid state */ STTD_ERROR_INVALID_LANGUAGE = TIZEN_ERROR_STT | 0x02, /**< Invalid language */ - STTD_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_STT | 0x03, /**< No available engine */ + 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 */ diff --git a/server/sttd_recorder.c b/server/sttd_recorder.c index a1136c9..9d35fc5 100644 --- a/server/sttd_recorder.c +++ b/server/sttd_recorder.c @@ -114,7 +114,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void SLOG(LOG_ERROR, TAG_STTD, "[Recorder] Fail to send recording volume(%f)", vol_db); } } - + if (0 == g_buffer_count || 0 == g_buffer_count % 50) { SLOG(LOG_WARN, TAG_STTD, "[Recorder][%d] Recording... : read_size(%d)", g_buffer_count, voice_data->length); @@ -127,7 +127,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void } } g_bt_extend_count++; - + if (100000 == g_buffer_count) { g_buffer_count = 0; } @@ -180,7 +180,7 @@ void __recorder_focus_state_cb(sound_stream_info_h stream_info, sound_stream_foc } SLOG(LOG_WARN, TAG_STTD, "[Recorder] focus state changed to (%d) with reason(%s)", (int)state_for_recording, __stt_get_focus_changed_reason_code(reason)); - + if (STTD_RECORDER_STATE_RECORDING == g_recorder_state && SOUND_STREAM_FOCUS_STATE_RELEASED == state_for_recording) { SLOG(LOG_WARN, TAG_STTD, "[Recorder] Focus released as interrupt"); if (NULL != g_interrupt_cb) { @@ -407,7 +407,7 @@ int sttd_recorder_destroy(int engine_id) } recorder->audio_h = NULL; } -#else +#else if (STTD_RECORDER_STATE_RECORDING == g_recorder_state) { g_recorder_state = STTD_RECORDER_STATE_READY; } @@ -550,7 +550,7 @@ int sttd_recorder_start(int engine_id) SLOG(LOG_ERROR, TAG_STTD, "[Recorder ERROR] Fail to set stream info"); } } - + ret = audio_in_prepare(recorder->audio_h); if (AUDIO_IO_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_STTD, "[Recorder ERROR] Fail to start audio : %d", ret); @@ -625,7 +625,7 @@ int sttd_recorder_stop(int engine_id) if (AUDIO_IO_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_STTD, "[Recorder ERROR] Fail to unprepare audioin : %d", ret); } -#else +#else int bt_retry = 0; bool stopped = false; while (5 > bt_retry) { diff --git a/server/sttd_server.c b/server/sttd_server.c index 7a7d2b4..5bfdc92 100644 --- a/server/sttd_server.c +++ b/server/sttd_server.c @@ -591,7 +591,7 @@ Eina_Bool sttd_cleanup_client(void *data) if (NULL != client_list) { SLOG(LOG_DEBUG, TAG_STTD, "===== Clean up client "); - + __read_proc(); for (i = 0; i < client_count; i++) { diff --git a/stt-server.conf b/stt-server.conf index 6d4281b..6a3c338 100644 --- a/stt-server.conf +++ b/stt-server.conf @@ -15,13 +15,13 @@ - + - +