X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Fstt_dbus.c;h=dc6a7c98d57f833384ec4b6b49dce182780bf749;hb=320803ba79b6ff09e902283088ad82e08be506c2;hp=e5e7e3b12d59015a4fadf5df0dd21b95a3a33ddd;hpb=add39505d51b50f8044aefb402aae8d5bf639e32;p=platform%2Fcore%2Fuifw%2Fstt.git diff --git a/client/stt_dbus.c b/client/stt_dbus.c index e5e7e3b..dc6a7c9 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -43,6 +43,8 @@ extern int __stt_cb_set_state(int uid, int state); extern int __stt_cb_set_volume(int uid, float volume); +extern int __stt_cb_speech_status(int uid, int status); + char* __stt_get_service_name(char* engine_id) { char* service_name = NULL; @@ -58,7 +60,7 @@ char* __stt_get_service_name(char* engine_id) return NULL; } SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_open: %d", ret); - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); @@ -160,7 +162,7 @@ char* __stt_get_service_object(char* engine_id) SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return NULL; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); @@ -261,7 +263,7 @@ char* __stt_get_service_interface(char* engine_id) SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return NULL; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); @@ -336,7 +338,7 @@ char* __stt_get_service_interface(char* engine_id) } char* ret_char = strchr(service_interface, '-'); - while(NULL != ret_char) { + while (NULL != ret_char) { ret_char[0] = '_'; ret_char = strchr(service_interface, '-'); } @@ -587,6 +589,52 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle SLOG(LOG_DEBUG, TAG_STTC, " "); } /* STTD_METHOD_ERROR */ + else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_SPEECH_STATUS)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Speech status"); + int uid = 0; + int status = -1; + + dbus_message_get_args(msg, &err, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INT32, &status, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); + dbus_error_free(&err); + } + + if (uid > 0 && status >= 0) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt speech status : uid(%d), status(%d)", uid, status); + __stt_cb_speech_status(uid, status); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set status : invalid uid or status"); + } + + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* STTD_METHOD_SPEECH_STATUS */ + + else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Owner Changed"); + DBusError err; + dbus_error_init(&err); + + /* remove a rule for daemon error */ + char rule_err[256] = {0, }; + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + } + + __stt_cb_error(-1, STT_ERROR_SERVICE_RESET, "Daemon Reset"); + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* NameOwnerChanged */ + else { SLOG(LOG_DEBUG, TAG_STTC, "Message is NOT valid"); dbus_message_unref(msg); @@ -600,6 +648,20 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle return ECORE_CALLBACK_RENEW; } +static void __stt_dbus_connection_free() +{ + if (NULL != g_conn_listener) { + dbus_connection_close(g_conn_listener); + dbus_connection_unref(g_conn_listener); + g_conn_listener = NULL; + } + if (NULL != g_conn_sender) { + dbus_connection_close(g_conn_sender); + dbus_connection_unref(g_conn_sender); + g_conn_sender = NULL; + } +} + int stt_dbus_open_connection() { if (NULL != g_conn_sender && NULL != g_conn_listener) { @@ -639,9 +701,12 @@ int stt_dbus_open_connection() if (NULL == g_conn_listener) { SLOG(LOG_ERROR, TAG_STTC, "Fail to get dbus connection"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + int pid = getpid(); char service_name[64]; @@ -668,12 +733,14 @@ int stt_dbus_open_connection() if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); dbus_error_free(&err); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } int fd = 0; if (true != dbus_connection_get_unix_fd(g_conn_listener, &fd)) { SLOG(LOG_ERROR, TAG_STTC, "Fail to get fd from dbus"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_STTC, "Get fd from dbus : %d", fd); @@ -682,6 +749,7 @@ int stt_dbus_open_connection() g_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL); if (NULL == g_fd_handler) { SLOG(LOG_ERROR, TAG_STTC, "fail to get fd handler from ecore"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } @@ -698,27 +766,21 @@ int stt_dbus_close_connection() g_fd_handler = NULL; } - int pid = getpid(); + if (NULL != g_conn_listener) { + int pid = getpid(); - char service_name[64]; - memset(service_name, '\0', 64); - snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); + char service_name[64]; + memset(service_name, '\0', 64); + snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); - dbus_bus_release_name(g_conn_listener, service_name, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); - dbus_error_free(&err); + dbus_bus_release_name(g_conn_listener, service_name, &err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); + dbus_error_free(&err); + } } - 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; - + __stt_dbus_connection_free(); __stt_dbus_service_free(); return 0; @@ -726,6 +788,18 @@ int stt_dbus_close_connection() int stt_dbus_reconnect() { + if (!g_conn_sender || !g_conn_listener) { + stt_dbus_close_connection(); + + if (0 != stt_dbus_open_connection()) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to reconnect"); + return -1; + } + + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] Reconnect"); + return 0; + } + bool sender_connected = dbus_connection_get_is_connected(g_conn_sender); bool listener_connected = dbus_connection_get_is_connected(g_conn_listener); SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] Sender(%s) Listener(%s)", @@ -775,7 +849,7 @@ int stt_dbus_request_hello(int uid) int result = 0; if (g_conn_sender) { - if(NULL != client) { + if (NULL != client) { __stt_dbus_service_free(); if (NULL == client->current_engine_id) { @@ -795,7 +869,6 @@ int stt_dbus_request_hello(int uid) SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory"); return STT_ERROR_OUT_OF_MEMORY; } - SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] service name: %s, object path: %s, interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface); msg = dbus_message_new_method_call( STT_SERVER_SERVICE_NAME, @@ -841,12 +914,12 @@ int stt_dbus_request_hello(int uid) } if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); - return STT_ERROR_OPERATION_FAILED; +// SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); + result = stt_dbus_reconnect(); + if (0 != result) + return STT_ERROR_OPERATION_FAILED; } - - if (g_conn_sender) { result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); dbus_message_unref(msg); @@ -869,11 +942,11 @@ int stt_dbus_request_hello(int uid) dbus_error_free(&err); } - SLOG(LOG_ERROR, TAG_STTC, "STT_ERROR_TIME_OUT"); result = STT_ERROR_TIMED_OUT; } } else { SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + stt_dbus_reconnect(); result = STT_ERROR_OPERATION_FAILED; } @@ -919,12 +992,17 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti } if (NULL != result_msg) { + int int_silence_supported = 0; + int int_credential_needed = 0; dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, - DBUS_TYPE_INT32, silence_supported, - DBUS_TYPE_INT32, credential_needed, + DBUS_TYPE_INT32, &int_silence_supported, + DBUS_TYPE_INT32, &int_credential_needed, DBUS_TYPE_INVALID); + *silence_supported = (bool)(int_silence_supported); + *credential_needed = (bool)(int_credential_needed); + if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); dbus_error_free(&err); @@ -934,6 +1012,18 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti if (0 == result) { SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)", result, *silence_supported, *credential_needed); + + /* add a rule for daemon error */ + char rule_err[256] = {0, }; + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_add_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + return STT_ERROR_OPERATION_FAILED; + } } else { SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d", result); } @@ -956,6 +1046,19 @@ int stt_dbus_request_finalize(int uid) { DBusMessage* msg; + DBusError err; + dbus_error_init(&err); + + /* remove a rule for daemon error */ + char rule_err[256] = {0, }; + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + } + SLOG(LOG_DEBUG, TAG_STTC, "[dbus_info] service name: %s, service object: %s, service interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface); msg = dbus_message_new_method_call( @@ -973,9 +1076,6 @@ int stt_dbus_request_finalize(int uid) dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); - DBusError err; - dbus_error_init(&err); - DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; @@ -1050,12 +1150,18 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si } if (NULL != result_msg) { + int int_silence_supported = 0; + int int_credential_needed = 0; + dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, - DBUS_TYPE_INT32, silence_supported, - DBUS_TYPE_INT32, credential_needed, + DBUS_TYPE_INT32, &int_silence_supported, + DBUS_TYPE_INT32, &int_credential_needed, DBUS_TYPE_INVALID); + *silence_supported = (bool)(int_silence_supported); + *credential_needed = (bool)(int_credential_needed); + if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); dbus_error_free(&err); @@ -2037,3 +2143,118 @@ int stt_dbus_request_cancel(int uid) return result; #endif } + +int stt_dbus_request_start_file(int uid, const char* lang, const char* type, int silence, const char* appid, const char* credential, const char* filepath, stt_audio_type_e audio_type, int sample_rate) +{ + if (NULL == lang || NULL == type || NULL == appid) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + /* create a signal & check for errors */ + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_START_FILE); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt start file : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt start file : uid(%d), language(%s), type(%s), appid(%s), filepath(%s), audio_type(%d), sample_rate(%d)", uid, lang, type, appid, filepath, audio_type, sample_rate); + } + + char *temp = NULL; + if (NULL == credential) { + temp = strdup("NULL"); + } else { + temp = strdup(credential); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &lang, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_INT32, &silence, + DBUS_TYPE_STRING, &appid, + DBUS_TYPE_STRING, &temp, + DBUS_TYPE_STRING, &filepath, + DBUS_TYPE_INT32, &audio_type, + DBUS_TYPE_INT32, &sample_rate, + DBUS_TYPE_INVALID); + if (g_conn_sender) { + dbus_message_set_no_reply(msg, TRUE); + + if (!dbus_connection_send(g_conn_sender, msg, NULL)) { + SLOG(LOG_ERROR, TAG_STTC, "[Dbus ERROR] <<<< stt start message : Out Of Memory !"); + if (NULL != temp) { + free(temp); + temp = NULL; + } + return STT_ERROR_OUT_OF_MEMORY; + } else { + dbus_connection_flush(g_conn_sender); + } + + dbus_message_unref(msg); + + } else { + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + if (NULL != temp) { + free(temp); + temp = NULL; + } + return STT_ERROR_OPERATION_FAILED; + } + + if (NULL != temp) { + free(temp); + temp = NULL; + } + return 0; +} + +int stt_dbus_request_cancel_file(int uid) +{ + DBusMessage* msg; + + /* create a signal & check for errors */ + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_CANCEL_FILE); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt cancel file : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel file : uid(%d)", uid); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INVALID); + + if (g_conn_sender) { + dbus_message_set_no_reply(msg, TRUE); + + if (!dbus_connection_send(g_conn_sender, msg, NULL)) { + SLOG(LOG_ERROR, TAG_STTC, "[Dbus ERROR] <<<< stt stop message : Out Of Memory !"); + return STT_ERROR_OUT_OF_MEMORY; + } else { + dbus_connection_flush(g_conn_sender); + } + + dbus_message_unref(msg); + } else { + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + return STT_ERROR_OPERATION_FAILED; + } + + return 0; +} +