X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Fstt_dbus.c;h=a70726408ab5a2373b2930fc8e9496d0b25c0cda;hb=e6e5e98c676315c8d51c52b643617d285b476f7d;hp=4925037936317cc4664a5095a50e0e8e1fc24ae0;hpb=2a5eeeca2c16d95975c45205a85239bf35872ce6;p=platform%2Fcore%2Fuifw%2Fstt.git diff --git a/client/stt_dbus.c b/client/stt_dbus.c index 4925037..a707264 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd All Rights Reserved +* Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,395 +16,742 @@ #include "stt_dbus.h" #include "stt_defs.h" -#include #include "stt_client.h" -static int g_waiting_time = 1500; -static int g_waiting_start_time = 2000; +#include +#include + +static int g_waiting_time = 3000; +static int g_waiting_short_time = 500; + +static char* g_server_service_name = NULL; +static char* g_server_service_object = NULL; +static char* g_server_service_interface = NULL; static Ecore_Fd_Handler* g_fd_handler = NULL; -static DBusConnection* g_conn = NULL; +static DBusConnection* g_conn_sender = NULL; +static DBusConnection* g_conn_listener = NULL; +void __stt_dbus_service_free(); -extern int __stt_cb_error(int uid, int reason); +extern int __stt_cb_error(int uid, int reason, char* err_msg); -extern int __stt_cb_result(int uid, const char* type, const char** data, int data_count, const char* msg); - -extern int __stt_cb_partial_result(int uid, const char* data); +extern int __stt_cb_result(int uid, int event, char** data, int data_count, const char* msg); extern int __stt_cb_set_state(int uid, int state); -static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handler) +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) { - DBusConnection* conn = (DBusConnection*)data; - DBusMessage* msg = NULL; - DBusMessage *reply = NULL; + char* service_name = NULL; + const char* engine_default = NULL; - if (NULL == conn) - return ECORE_CALLBACK_RENEW; + struct buxton_client * bux_cli; + struct buxton_layer * bux_layer; + struct buxton_value * bux_val; - dbus_connection_read_write_dispatch(conn, 50); + int ret = buxton_open(&bux_cli, NULL, NULL); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); + return NULL; + } + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_open: %d", ret); + 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); + bux_cli = NULL; + return NULL; + } - msg = dbus_connection_pop_message(conn); + bux_val = buxton_value_create_string("stt-engine-default"); + if (NULL == bux_val) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_value_create_string FAIL"); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + bux_layer = NULL; + bux_cli = NULL; + return NULL; + } - /* loop again if we haven't read a message */ - if (NULL == msg) { - return ECORE_CALLBACK_RENEW; + ret = buxton_get_value_sync(bux_cli, bux_layer, STT_ENGINE_DB_DEFAULT, &bux_val); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get value sync, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + ret = buxton_value_get_string(bux_val, &engine_default); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get value string, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; } + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_value_get_string: engine_default: %s", engine_default); - DBusError err; - dbus_error_init(&err); - char if_name[64]; - snprintf(if_name, 64, "%s%d", STT_CLIENT_SERVICE_INTERFACE, getpid()); - - if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_HELLO)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Get Hello"); - int uid = 0; - int response = -1; - - dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); - - if (uid > 0) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get hello : uid(%d) \n", uid); - - /* check uid */ - stt_client_s* client = stt_client_get_by_uid(uid); - if( NULL != client ) - response = 1; - else - response = 0; - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get hello : invalid uid \n"); + if (NULL == engine_id || NULL == engine_default || 0 == strncmp(engine_id, engine_default, strlen(engine_id))) { + service_name = (char*)calloc(strlen(STT_SERVER_SERVICE_NAME) + 1, sizeof(char)); + if (NULL == service_name) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + snprintf(service_name, strlen(STT_SERVER_SERVICE_NAME) + 1, "%s", STT_SERVER_SERVICE_NAME); + } else { + service_name = (char*)calloc(strlen(STT_SERVER_SERVICE_NAME) + strlen(engine_id) - 8, sizeof(char)); + if (NULL == service_name) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; } + snprintf(service_name, strlen(STT_SERVER_SERVICE_NAME) + strlen(engine_id) - 8, "%s%s%s", STT_SERVER_SERVICE_NAME, ".", (engine_id + 10)); + } - reply = dbus_message_new_method_return(msg); - - if (NULL != reply) { - dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); - if (!dbus_connection_send(conn, reply, NULL)) - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get hello : fail to send reply"); - else - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get hello : result(%d)", response); + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get hello : fail to create reply message"); - } - - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - } /* STTD_METHOD_HELLO */ - - else if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_SET_STATE)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Set State"); - int uid = 0; - int response = -1; - int state = -1; - - dbus_message_get_args(msg, &err, - DBUS_TYPE_INT32, &uid, - DBUS_TYPE_INT32, &state, - DBUS_TYPE_INVALID); + SLOG(LOG_DEBUG, TAG_STTC, "[get_service_name] FINISH!! service name: %s", service_name); - if (uid > 0 && state >= 0) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set state : uid(%d), state(%d)", uid, state); + return service_name; +} - response = __stt_cb_set_state(uid, state); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set state : invalid uid or state"); - } +char* __stt_get_service_object(char* engine_id) +{ + char* service_object = NULL; + const char* engine_default = NULL; - reply = dbus_message_new_method_return(msg); + struct buxton_client * bux_cli; + struct buxton_layer * bux_layer; + struct buxton_value * bux_val; - if (NULL != reply) { - dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); + int ret = buxton_open(&bux_cli, NULL, NULL); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); + return NULL; + } + 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); + bux_cli = NULL; + return NULL; + } - if (!dbus_connection_send(conn, reply, NULL)) - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set state : fail to send reply"); - else - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set state : result(%d)", response); + bux_val = buxton_value_create_string("stt-engine-default"); + if (NULL == bux_val) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_value_create_string FAIL"); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + bux_layer = NULL; + bux_cli = NULL; + return NULL; + } - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set state : fail to create reply message"); + ret = buxton_get_value_sync(bux_cli, bux_layer, STT_ENGINE_DB_DEFAULT, &bux_val); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get value sync, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + ret = buxton_value_get_string(bux_val, &engine_default); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get string, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_value_get_string: engine_default: %s", engine_default); + + if (NULL == engine_id || NULL == engine_default || 0 == strncmp(engine_id, engine_default, strlen(engine_id))) { + service_object = (char*)calloc(strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1, sizeof(char)); + if (NULL == service_object) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + snprintf(service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1, "%s", STT_SERVER_SERVICE_OBJECT_PATH); + } else { + service_object = (char*)calloc(strlen(STT_SERVER_SERVICE_OBJECT_PATH) + strlen(engine_id) - 8, sizeof(char)); + if (NULL == service_object) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; } + snprintf(service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + strlen(engine_id) - 8, "%s%s%s", STT_SERVER_SERVICE_OBJECT_PATH, "/", (engine_id + 10)); + } - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - } /* STTD_METHOD_SET_STATE */ + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); - else if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_GET_STATE)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Get state"); - int uid = 0; - int response = -1; + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; - dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); + SLOG(LOG_DEBUG, TAG_STTC, "[get_service_object] FINISH!! service object: %s", service_object); - if (uid > 0) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get state : uid(%d) \n", uid); + return service_object; +} - /* check state */ - stt_client_s* client = stt_client_get_by_uid(uid); - if( NULL != client ) - response = client->current_state; - else - SLOG(LOG_ERROR, TAG_STTC, "invalid uid \n"); - - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get state : invalid uid \n"); +char* __stt_get_service_interface(char* engine_id) +{ + char* service_interface = NULL; + const char* engine_default = NULL; + + struct buxton_client * bux_cli; + struct buxton_layer * bux_layer; + struct buxton_value * bux_val; + + int ret = buxton_open(&bux_cli, NULL, NULL); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); + return NULL; + } + 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); + bux_cli = NULL; + return NULL; + } + + bux_val = buxton_value_create_string("stt-engine-default"); + if (NULL == bux_val) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_value_create_string FAIL"); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + bux_layer = NULL; + bux_cli = NULL; + return NULL; + } + + ret = buxton_get_value_sync(bux_cli, bux_layer, STT_ENGINE_DB_DEFAULT, &bux_val); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get value sync, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + ret = buxton_value_get_string(bux_val, &engine_default); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to get string, ret(%d)", ret); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_value_get_string: engine_default: %s", engine_default); + + if (NULL == engine_id || NULL == engine_default || 0 == strncmp(engine_id, engine_default, strlen(engine_id))) { + service_interface = (char*)calloc(strlen(STT_SERVER_SERVICE_INTERFACE) + 1, sizeof(char)); + if (NULL == service_interface) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; + } + snprintf(service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + 1, "%s", STT_SERVER_SERVICE_INTERFACE); + } else { + service_interface = (char*)calloc(strlen(STT_SERVER_SERVICE_INTERFACE) + strlen(engine_id) - 8, sizeof(char)); + if (NULL == service_interface) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Memory allocation Failed!!"); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + buxton_close(bux_cli); + + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; + return NULL; } + snprintf(service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + strlen(engine_id) - 8, "%s%s%s", STT_SERVER_SERVICE_INTERFACE, ".", (engine_id + 10)); + } - reply = dbus_message_new_method_return(msg); + char* ret_char = strchr(service_interface, '-'); + while (NULL != ret_char) { + ret_char[0] = '_'; + ret_char = strchr(service_interface, '-'); + } - if (NULL != reply) { - dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); + buxton_value_free(bux_val); + buxton_free_layer(bux_layer); + ret = buxton_close(bux_cli); - if (!dbus_connection_send(conn, reply, NULL)) - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get state : fail to send reply"); - else - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get state : result(%d)", response); + bux_cli = NULL; + bux_layer = NULL; + bux_val = NULL; - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get hello : fail to create reply message"); + SLOG(LOG_DEBUG, TAG_STTC, "[get_service_interface] FINISH!! service interface: %s", service_interface); + + return service_interface; +} + + +static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handler) +{ + if (NULL == g_conn_listener) return ECORE_CALLBACK_RENEW; + + dbus_connection_read_write_dispatch(g_conn_listener, 50); + + while (1) { + DBusMessage* msg = NULL; + msg = dbus_connection_pop_message(g_conn_listener); + + if (true != dbus_connection_get_is_connected(g_conn_listener)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Connection is disconnected"); + break; } - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - } /* STTD_METHOD_GET_STATE */ - - else if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_RESULT)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Get Result"); - int uid = 0; - DBusMessageIter args; - - dbus_message_iter_init(msg, &args); - - /* Get result */ - if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &uid); - dbus_message_iter_next(&args); + /* loop again if we haven't read a message */ + if (NULL == msg) { + break; } - - if (uid > 0) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get result : uid(%d) \n", uid); - char** temp_result; - char* temp_msg = NULL; - char* temp_char = NULL; - char* temp_type = 0; - int temp_count = 0; - - /* Get recognition type */ - if (DBUS_TYPE_STRING == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &temp_type); - dbus_message_iter_next(&args); + + SLOG(LOG_DEBUG, TAG_STTC, "[DEBUG] Message is arrived"); + + DBusError err; + dbus_error_init(&err); + + DBusMessage *reply = NULL; + + char if_name[64]; + snprintf(if_name, 64, "%s%d", STT_CLIENT_SERVICE_INTERFACE, getpid()); + + if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_HELLO)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Get Hello"); + int uid = 0; + int response = -1; + + dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &uid, 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 (DBUS_TYPE_STRING == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &(temp_msg) ); - dbus_message_iter_next(&args); + if (uid > 0) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get hello : uid(%d)", uid); + + /* check uid */ + stt_client_s* client = stt_client_get_by_uid(uid); + if (NULL != client) + response = 1; + else + response = 0; + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get hello : invalid uid"); + } + + reply = dbus_message_new_method_return(msg); + + if (NULL != reply) { + dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); + + if (!dbus_connection_send(g_conn_listener, reply, NULL)) + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get hello : fail to send reply"); + else + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get hello : result(%d)", response); + + dbus_connection_flush(g_conn_listener); + dbus_message_unref(reply); + } else { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get hello : fail to create reply message"); + } + + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* STTD_METHOD_HELLO */ + + else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_SET_STATE)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Set State"); + int uid = 0; + int state = -1; + + dbus_message_get_args(msg, &err, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INT32, &state, + 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 && state >= 0) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set state : uid(%d), state(%d)", uid, state); + __stt_cb_set_state(uid, state); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set state : invalid uid or state"); + } + + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* STTD_METHOD_SET_STATE */ + + else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_SET_VOLUME)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Set volume : signal"); + int uid = 0; + float volume = 0; + + dbus_message_get_args(msg, &err, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INT32, &volume, + 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); } - /* Get voice size */ + 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, "====="); */ + /* SLOG(LOG_DEBUG, TAG_STTC, " "); */ + } /* STTD_METHOD_SET_VOLUME */ + + else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_RESULT)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Get Result : signal"); + int uid = 0; + DBusMessageIter args; + + dbus_message_iter_init(msg, &args); + + /* Get result */ if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &temp_count); + dbus_message_iter_get_basic(&args, &uid); dbus_message_iter_next(&args); } - if (temp_count <= 0) { - SLOG(LOG_WARN, TAG_STTC, "Result count is 0"); - __stt_cb_result(uid, temp_type, NULL, 0, temp_msg); - } else { - temp_result = g_malloc0(temp_count * sizeof(char*)); + stt_client_s* client = NULL; + client = stt_client_get_by_uid(uid); + if (NULL != client) { + char** temp_result = NULL; + char* temp_msg = NULL; + char* temp_char = NULL; + int temp_event = 0; + int temp_count = 0; + int temp_result_id = 0; + + /* Get recognition type */ + if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &temp_event); + dbus_message_iter_next(&args); + } + + if (DBUS_TYPE_STRING == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &(temp_msg)); + dbus_message_iter_next(&args); + } + + /* Get voice size */ + if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &temp_count); + dbus_message_iter_next(&args); + } + + /* Get result id */ + if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &temp_result_id); + dbus_message_iter_next(&args); + } + + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get result : uid(%d) event(%d) message(%s) count(%d) result id(%d)", + uid, temp_event, temp_msg, temp_count, temp_result_id); - if (NULL == temp_result) { - SLOG(LOG_ERROR, TAG_STTC, "Fail : memory allocation error \n"); + if (temp_count <= 0) { + __stt_cb_result(uid, temp_event, NULL, 0, temp_msg); } else { - int i = 0; - for (i = 0;i < temp_count;i++) { - dbus_message_iter_get_basic(&args, &(temp_char) ); - dbus_message_iter_next(&args); - - if (NULL != temp_char) - temp_result[i] = strdup(temp_char); - } - - __stt_cb_result(uid, temp_type, (const char**)temp_result, temp_count, temp_msg); + temp_result = (char**)calloc(temp_count, sizeof(char*)); + + if (NULL == temp_result) { + SLOG(LOG_ERROR, TAG_STTC, "Fail : memory allocation error"); + } else { + int i = 0; + for (i = 0; i < temp_count; i++) { + dbus_message_iter_get_basic(&args, &(temp_char)); + dbus_message_iter_next(&args); + + if (NULL != temp_char) { + temp_result[i] = strdup(temp_char); + SECURE_SLOG(LOG_DEBUG, TAG_STTC, "result[%d] : %s", i, temp_result[i]); + } + } - for (i = 0;i < temp_count;i++) { - if (NULL != temp_result[i]) - free(temp_result[i]); - } + __stt_cb_result(uid, temp_event, temp_result, temp_count, temp_msg); + + for (i = 0; i < temp_count; i++) { + if (NULL != temp_result[i]) + free(temp_result[i]); + } - g_free(temp_result); + free(temp_result); + } } - } - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get result : invalid uid \n"); - } - - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - }/* STTD_METHOD_RESULT */ - - else if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_PARTIAL_RESULT)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Get Partial Result"); - int uid = 0; - DBusMessageIter args; - - dbus_message_iter_init(msg, &args); - - /* Get result */ - if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &uid); - dbus_message_iter_next(&args); - } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get result : invalid uid"); + } - if (uid > 0) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get partial result : uid(%d) \n", uid); - char* temp_char = NULL; + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* STTD_METHOD_RESULT */ - if (DBUS_TYPE_STRING == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &(temp_char) ); - dbus_message_iter_next(&args); + else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_ERROR)) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Get Error"); + int uid; + int reason; + char* err_msg; + + dbus_message_get_args(msg, &err, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INT32, &reason, + DBUS_TYPE_STRING, &err_msg, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt Get Error message : Get arguments error (%s)", err.message); + dbus_error_free(&err); + } else { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt Get Error message : uid(%d), reason(%d), err_msg(%s)", uid, reason, (NULL == err_msg) ? "NULL" : err_msg); + __stt_cb_error(uid, reason, err_msg); } - __stt_cb_partial_result(uid, temp_char); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get partial result : invalid uid \n"); - } + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* STTD_METHOD_ERROR */ - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - }/* STTD_METHOD_PARTIAL_RESULT */ + 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; - else if (dbus_message_is_method_call(msg, if_name, STTD_METHOD_ERROR)) { - SLOG(LOG_DEBUG, TAG_STTC, "===== Get Error"); - int uid; - int reason; - char* err_msg; + dbus_message_get_args(msg, &err, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INT32, &status, + DBUS_TYPE_INVALID); - dbus_message_get_args(msg, &err, - DBUS_TYPE_INT32, &uid, - DBUS_TYPE_INT32, &reason, - DBUS_TYPE_STRING, &err_msg, - 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 (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt Get Error message : Get arguments error (%s)\n", err.message); - dbus_error_free(&err); - } else { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt Get Error message : uid(%d), reason(%d), msg(%s)\n", uid, reason, err_msg); - __stt_cb_error(uid, reason); - } + 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"); + } - reply = dbus_message_new_method_return(msg); + 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); + } - if (NULL != reply) { - if (!dbus_connection_send(conn, reply, NULL)) - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt Error message : fail to send reply"); - else - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt Error message"); + __stt_cb_error(-1, STT_ERROR_SERVICE_RESET, "Daemon Reset"); + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* NameOwnerChanged */ - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt Error message : fail to create reply message"); + else { + SLOG(LOG_DEBUG, TAG_STTC, "Message is NOT valid"); + dbus_message_unref(msg); + break; } - SLOG(LOG_DEBUG, TAG_STTC, "====="); - SLOG(LOG_DEBUG, TAG_STTC, " "); - }/* STTD_METHOD_ERROR */ + /* free the message */ + dbus_message_unref(msg); + } /* while */ - /* free the message */ - dbus_message_unref(msg); + return ECORE_CALLBACK_RENEW; +} - return ECORE_CALLBACK_PASS_ON; +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) { + if (NULL != g_conn_sender && NULL != g_conn_listener) { SLOG(LOG_WARN, TAG_STTC, "already existed connection "); return 0; } DBusError err; - int ret; /* initialise the error value */ dbus_error_init(&err); /* connect to the DBUS system bus, and check for errors */ - g_conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &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) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to get dbus connection"); + return STT_ERROR_OPERATION_FAILED; + } + + dbus_connection_set_exit_on_disconnect(g_conn_sender, false); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "Dbus Connection Error (%s)\n", err.message); - dbus_error_free(&err); + /* connect to the DBUS system bus, and check for errors */ + 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) { - SLOG(LOG_ERROR, TAG_STTC, "Fail to get dbus connection \n"); - return STT_ERROR_OPERATION_FAILED; + 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); + + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + int pid = getpid(); char service_name[64]; memset(service_name, '\0', 64); snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); - SLOG(LOG_DEBUG, TAG_STTC, "service name is %s\n", service_name); + SLOG(LOG_DEBUG, TAG_STTC, "service name is %s", service_name); /* register our name on the bus, and check for errors */ - ret = dbus_bus_request_name(g_conn, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING , &err); + 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)\n", err.message); - dbus_error_free(&err); - } - - if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) { - printf("fail dbus_bus_request_name()\n"); - return -2; - } - - if( NULL != g_fd_handler ) { - SLOG(LOG_WARN, TAG_STTC, "The handler already exists."); - return 0; + SLOG(LOG_ERROR, TAG_STTC, "Name Error (%s)", err.message); + dbus_error_free(&err); } - char rule[128]; + char rule[128] = {0, }; snprintf(rule, 128, "type='signal',interface='%s%d'", STT_CLIENT_SERVICE_INTERFACE, pid); /* add a rule for which messages we want to see */ - dbus_bus_add_match(g_conn, rule, &err); - dbus_connection_flush(g_conn); + dbus_bus_add_match(g_conn_listener, rule, &err); + dbus_connection_flush(g_conn_listener); - if (dbus_error_is_set(&err)) - { - SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)\n", err.message); - return STT_ERROR_OPERATION_FAILED; + 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 (1 != dbus_connection_get_unix_fd(g_conn, &fd)) { - SLOG(LOG_ERROR, TAG_STTC, "fail to get fd from dbus \n"); + 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\n", fd); + SLOG(LOG_DEBUG, TAG_STTC, "Get fd from dbus : %d", fd); } - g_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn, NULL, NULL); - + 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 \n"); + SLOG(LOG_ERROR, TAG_STTC, "fail to get fd handler from ecore"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } @@ -416,81 +763,833 @@ int stt_dbus_close_connection() DBusError err; dbus_error_init(&err); - int pid = getpid(); + if (NULL != g_fd_handler) { + ecore_main_fd_handler_del(g_fd_handler); + g_fd_handler = NULL; + } - char service_name[64]; - memset(service_name, '\0', 64); - snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); + 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); + + 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); + } + } + + __stt_dbus_connection_free(); + __stt_dbus_service_free(); + + return 0; +} + +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)", + sender_connected ? "Connected" : "Not connected", listener_connected ? "Connected" : "Not connected"); - dbus_bus_release_name (g_conn, service_name, &err); + if (false == sender_connected || false == listener_connected) { + stt_dbus_close_connection(); - dbus_connection_close(g_conn); + if (0 != stt_dbus_open_connection()) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to reconnect"); + return -1; + } - g_fd_handler = NULL; - g_conn = NULL; + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] Reconnect"); + } return 0; } -int stt_dbus_request_hello() +void __stt_dbus_service_free() +{ + if (NULL != g_server_service_name) { + free(g_server_service_name); + g_server_service_name = NULL; + } + if (NULL != g_server_service_object) { + free(g_server_service_object); + g_server_service_object = NULL; + } + if (NULL != g_server_service_interface) { + free(g_server_service_interface); + g_server_service_interface = NULL; + } +} + +int stt_dbus_request_hello(int uid) +{ + stt_client_s* client = stt_client_get_by_uid(uid); + + /* Check whether there is any dbus whose name has owner or not */ + dbus_bool_t is_exist = FALSE; + DBusError err; + dbus_error_init(&err); + + DBusMessage* msg = NULL; + DBusMessage* result_msg = NULL; + int result = 0; + + if (g_conn_sender) { + if (NULL != client) { + __stt_dbus_service_free(); + + if (NULL == client->current_engine_id) { + /* Default engine */ + g_server_service_name = strdup(STT_SERVER_SERVICE_NAME); + if (NULL == g_server_service_name) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory"); + return STT_ERROR_OUT_OF_MEMORY; + } + g_server_service_object = strdup(STT_SERVER_SERVICE_OBJECT_PATH); + if (NULL == g_server_service_name) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory"); + return STT_ERROR_OUT_OF_MEMORY; + } + g_server_service_interface = strdup(STT_SERVER_SERVICE_INTERFACE); + if (NULL == g_server_service_name) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory"); + return STT_ERROR_OUT_OF_MEMORY; + } + + msg = dbus_message_new_method_call( + STT_SERVER_SERVICE_NAME, + STT_SERVER_SERVICE_OBJECT_PATH, + STT_SERVER_SERVICE_INTERFACE, + STT_METHOD_HELLO); + } else { + /* Get service name, object, interface */ + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] current_engine_id: %s", client->current_engine_id); + + g_server_service_name = __stt_get_service_name(client->current_engine_id); + g_server_service_object = __stt_get_service_object(client->current_engine_id); + g_server_service_interface = __stt_get_service_interface(client->current_engine_id); + + if (NULL == g_server_service_name || NULL == g_server_service_object || NULL == g_server_service_interface) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] dbus service info invalid"); + return STT_ERROR_OPERATION_FAILED; + } + + 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); + + /* Custom engine */ + is_exist = dbus_bus_name_has_owner(g_conn_sender, g_server_service_name, &err); + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] is there dbus name has owner??: %s (g_server_service_name: %s)", (is_exist == TRUE) ? "True" : "False", g_server_service_name); + + if (TRUE == is_exist) { + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] dbus: is_exist: True"); + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_HELLO); + } else { + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] dbus: is_exist: False"); + msg = dbus_message_new_method_call( + STT_SERVER_CUSTOM_SERVICE_NAME, + STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH, + STT_SERVER_CUSTOM_SERVICE_INTERFACE, + STT_METHOD_HELLO); + } + } + } + } + + if (NULL == msg) { +// 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, -1, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_unref(result_msg); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); + dbus_error_free(&err); + } + + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt hello"); + } else { + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); + dbus_error_free(&err); + } + + 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; + } + + return result; +} + + +int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credential_needed) { DBusMessage* msg; msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, - STT_METHOD_HELLO); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_INITIALIZE); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt initialize : Fail to make message"); return STT_ERROR_OPERATION_FAILED; - } + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt initialize : uid(%d)", uid); + } + + int pid = getpid(); + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &pid, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INVALID); DBusError err; dbus_error_init(&err); - DBusMessage* result_msg = NULL; - int result = 0; + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + + if (g_conn_sender) { + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, 500, &err); + 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, &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); + result = STT_ERROR_OPERATION_FAILED; + } + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)", + result, *silence_supported, *credential_needed); + + stt_client_s* client = stt_client_get_by_uid(uid); + if (NULL == client) { + SLOG(LOG_ERROR, TAG_STTC, "Fail to get STT client"); + return STT_ERROR_OPERATION_FAILED; + } + + if (STT_ERROR_SERVICE_RESET != client->reason) { + /* 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); + } + + dbus_message_unref(result_msg); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + } else { + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + result = STT_ERROR_OPERATION_FAILED; + } + + return result; +} + +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( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_FINALIZE); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt finalize : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt finalize : uid(%d)", uid); + } + + dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); + + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = STT_ERROR_OPERATION_FAILED; + } + + dbus_message_unref(result_msg); + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt finalize : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt finalize : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* silence_supported, bool* credential_needed) +{ + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_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), engine_id(%s)", uid, (NULL == engine_id) ? "NULL" : engine_id); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &engine_id, + DBUS_TYPE_INVALID); + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + 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, &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); + result = STT_ERROR_OPERATION_FAILED; + } + + dbus_message_unref(result_msg); + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set engine : result = %d , silence(%d), credential(%d)", + result, *silence_supported, *credential_needed); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set engine : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_check_app_agreed(int uid, const char* appid, bool* value) +{ + if (NULL == appid || NULL == value) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_CHECK_APP_AGREED); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt check app agreed : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt check app agreed : uid(%d) appid(%s)", uid, appid); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &appid, + DBUS_TYPE_INVALID); + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + int available = -1; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INT32, &available, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = STT_ERROR_OPERATION_FAILED; + } + dbus_message_unref(result_msg); + + if (0 == result) { + *value = (bool)available; + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt check app agreed : result = %d, available = %d", result, *value); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt check app agreed : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_get_support_langs(int uid, stt_h stt, stt_supported_language_cb callback, void* user_data) +{ + if (NULL == stt || NULL == callback) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_GET_SUPPORT_LANGS); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get supported languages : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get supported languages : uid(%d)", uid); + } + + dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + DBusMessageIter args; + int result = STT_ERROR_OPERATION_FAILED; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + if (dbus_message_iter_init(result_msg, &args)) { + /* Get result */ + if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &result); + dbus_message_iter_next(&args); + } + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get support languages : result = %d", result); + + /* Get voice size */ + int size = 0; + if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { + dbus_message_iter_get_basic(&args, &size); + dbus_message_iter_next(&args); + } + + if (0 >= size) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt size of language error : size = %d", size); + } else { + int i = 0; + char* temp_lang; + + for (i = 0; i < size; i++) { + dbus_message_iter_get_basic(&args, &(temp_lang)); + dbus_message_iter_next(&args); + + if (true != callback(stt, temp_lang, user_data)) { + break; + } + } + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get support languages : result = %d", result); + } + } + dbus_message_unref(result_msg); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get support languages : result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_get_default_lang(int uid, char** language) +{ + if (NULL == language) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_GET_CURRENT_LANG); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get default language : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get default language : uid(%d)", 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; + char* temp_lang = NULL; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_STRING, &temp_lang, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = STT_ERROR_OPERATION_FAILED; + } + dbus_message_unref(result_msg); + + if (0 == result) { + *language = strdup(temp_lang); + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get default language : result = %d, language = %s", result, *language); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get default language : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_set_private_data(int uid, const char* key, const char* data) +{ + if (NULL == key || NULL == data) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_SET_PRIVATE_DATA); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set private data : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set private data : uid(%d)", uid); + } + + if (true != dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &key, + DBUS_TYPE_STRING, &data, + DBUS_TYPE_INVALID)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to append args"); + return STT_ERROR_OPERATION_FAILED; + } + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = STT_ERROR_OPERATION_FAILED; + } + dbus_message_unref(result_msg); + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set private data : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set private data : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; + } + + return result; +} + +int stt_dbus_request_get_private_data(int uid, const char* key, char** data) +{ + if (NULL == key || NULL == data) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_GET_PRIVATE_DATA); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get private data : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get private data : uid(%d)", uid); + } + + if (true != dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &key, + DBUS_TYPE_INVALID)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to append args"); + return STT_ERROR_OPERATION_FAILED; + } + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + int result = STT_ERROR_OPERATION_FAILED; + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } + char* temp = NULL; if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_STRING, &temp, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = STT_ERROR_OPERATION_FAILED; + } dbus_message_unref(result_msg); - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt hello"); - result = 0; + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get private data : result = %d", result); + if (NULL != temp) { + *data = strdup(temp); + } + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get private data : result = %d", result); + } } else { - result = STT_ERROR_OPERATION_FAILED; + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } return result; } -int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* profanity_supported, bool* punctuation_supported) + +int stt_dbus_request_is_recognition_type_supported(int uid, const char* type, bool* support) { + if (NULL == support || NULL == type) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + DBusMessage* msg; msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, - STT_METHOD_INITIALIZE); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_IS_TYPE_SUPPORTED); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt initialize : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt is partial result supported : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt initialize : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt is recognition type supported : uid(%d) type(%s)", uid, type); } - int pid = getpid(); - dbus_message_append_args( msg, - DBUS_TYPE_INT32, &pid, + dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &type, DBUS_TYPE_INVALID); DBusError err; @@ -498,58 +1597,69 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* profanit DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; + int result_support = -1; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, - DBUS_TYPE_INT32, silence_supported, - DBUS_TYPE_INT32, profanity_supported, - DBUS_TYPE_INT32, punctuation_supported, + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INT32, &result_support, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } - dbus_message_unref(result_msg); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL \n"); - } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d , silence(%d), profanity(%d), punctuation(%d)", - result, *silence_supported, *profanity_supported, *punctuation_supported); + if (0 == result) { + *support = (bool)result_support; + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt is recognition type supported : result = %d, support = %s", result, *support ? "true" : "false"); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt is recognition type supported : result = %d", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d \n", result); + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - - dbus_message_unref(msg); return result; } -int stt_dbus_request_finalize(int uid) +int stt_dbus_request_set_start_sound(int uid, const char* file) { + if (NULL == file) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + DBusMessage* msg; msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, - STT_METHOD_FINALIZE); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_SET_START_SOUND); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt finalize : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set start sound : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt finalize : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set start sound : uid(%d) file(%s)", uid, file); } - dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &file, + DBUS_TYPE_INVALID); DBusError err; dbus_error_init(&err); @@ -557,140 +1667,124 @@ int stt_dbus_request_finalize(int uid) DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, - DBUS_TYPE_INVALID); + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } - dbus_message_unref(result_msg); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL \n"); - } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt finalize : result = %d \n", result); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set start sound : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set start sound : result = %d", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt finalize : result = %d \n", result); + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; } -int stt_dbus_request_get_support_langs(int uid, stt_h stt, stt_supported_language_cb callback, void* user_data) +int stt_dbus_request_unset_start_sound(int uid) { - if (NULL == stt || NULL == callback) { - SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); - return STT_ERROR_INVALID_PARAMETER; - } - DBusMessage* msg; msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, - STT_METHOD_GET_SUPPORT_LANGS); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_UNSET_START_SOUND); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt get supported languages : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt unset start sound : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get supported languages : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt unset start sound : uid(%d)", uid); } - dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INVALID); DBusError err; dbus_error_init(&err); DBusMessage* result_msg; - DBusMessageIter args; int result = STT_ERROR_OPERATION_FAILED; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err ); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { - if (dbus_message_iter_init(result_msg, &args)) { - /* Get result */ - if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &result); - dbus_message_iter_next(&args); - } - - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get support languages : result = %d \n", result); - - /* Get voice size */ - int size ; - if (DBUS_TYPE_INT32 == dbus_message_iter_get_arg_type(&args)) { - dbus_message_iter_get_basic(&args, &size); - dbus_message_iter_next(&args); - } - - if (0 >= size) { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt size of language error : size = %d \n", size); - } else { - int i=0; - char* temp_lang; - - for (i=0 ; i>>> stt get default language : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt set stop sound : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt get default language : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt set stop sound : uid(%d) file(%s)", uid, file); } - dbus_message_append_args( msg, + dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &file, DBUS_TYPE_INVALID); DBusError err; @@ -698,61 +1792,58 @@ int stt_dbus_request_get_default_lang(int uid, char** language) DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - char* temp_lang = NULL; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, - DBUS_TYPE_STRING, &temp_lang, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL \n"); - } - if (0 == result) { - *language = strdup(temp_lang); - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt get default language : result = %d, language = %s \n", result, *language); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt set stop sound : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set stop sound : result = %d", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt get default language : result = %d \n", result); + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; } -int stt_dbus_request_is_partial_result_supported(int uid, bool* partial_result) +int stt_dbus_request_unset_stop_sound(int uid) { - if (NULL == partial_result) { - SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); - return STT_ERROR_INVALID_PARAMETER; - } - DBusMessage* msg; msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, - STT_SERVER_SERVICE_INTERFACE, - STT_METHOD_IS_PARTIAL_SUPPORTED); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_UNSET_STOP_SOUND); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt is partial result supported : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt unset stop sound : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt is partial result supported : uid(%d)", uid); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt unset stop sound : uid(%d)", uid); } - dbus_message_append_args( msg, + dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); @@ -761,41 +1852,43 @@ int stt_dbus_request_is_partial_result_supported(int uid, bool* partial_result) DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - int support = -1; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, - DBUS_TYPE_INT32, &support, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL \n"); - } - if (0 == result) { - *partial_result = (bool)support; - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt is partial result supported : result = %d, support = %s \n", result, *partial_result ? "true" : "false"); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt unset stop sound : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt unset stop sound : result = %d", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt is partial result supported : result = %d \n", result); + SLOG(LOG_ERROR, TAG_STTC, "<<<< Result message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; } -int stt_dbus_request_start(int uid, const char* lang, const char* type, int profanity, int punctuation, int silence) +int stt_dbus_request_start(int uid, const char* lang, const char* type, int silence, const char* appid, const char* credential) { - if (NULL == lang || NULL == type) { + if (NULL == lang || NULL == type || NULL == appid) { SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); return STT_ERROR_INVALID_PARAMETER; } @@ -804,59 +1897,103 @@ int stt_dbus_request_start(int uid, const char* lang, const char* type, int prof /* 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_METHOD_START); + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_START); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt start : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt start : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt start : uid(%d), language(%s), type(%s)", uid, lang, type); } - dbus_message_append_args( msg, - DBUS_TYPE_INT32, &uid, - DBUS_TYPE_STRING, &lang, + 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, &profanity, - DBUS_TYPE_INT32, &punctuation, DBUS_TYPE_INT32, &silence, + DBUS_TYPE_STRING, &appid, + DBUS_TYPE_STRING, &temp, DBUS_TYPE_INVALID); - +#if 1 + 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; +#else DBusError err; dbus_error_init(&err); DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_start_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - } else { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); - } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt start : result = %d ", result); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt start : result = %d ", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt start : result = %d ", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt start : result = %d ", result); + SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; +#endif } int stt_dbus_request_stop(int uid) @@ -865,54 +2002,78 @@ 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, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_STOP); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt stop : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt stop : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { 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) { + 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; +#else DBusError err; dbus_error_init(&err); DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - } else { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); - } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt stop : result = %d ", result); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt stop : result = %d ", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt stop : result = %d ", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt stop : result = %d ", result); + SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; +#endif } int stt_dbus_request_cancel(int uid) @@ -921,59 +2082,83 @@ int stt_dbus_request_cancel(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( - STT_SERVER_SERVICE_NAME, - STT_SERVER_SERVICE_OBJECT_PATH, /* object name of the signal */ - STT_SERVER_SERVICE_INTERFACE, /* interface name of the signal */ - STT_METHOD_CANCEL); /* name of the signal */ + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_CANCEL); - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> stt cancel : Fail to make message \n"); + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt cancel : Fail to make message"); return STT_ERROR_OPERATION_FAILED; } else { 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) { + 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; +#else DBusError err; dbus_error_init(&err); DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Send Error (%s)", err.message); + dbus_error_free(&err); + } if (NULL != result_msg) { dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)\n", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message); + dbus_error_free(&err); result = STT_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - } else { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); - } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt cancel : result = %d ", result); + if (0 == result) { + SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt cancel : result = %d ", result); + } else { + SLOG(LOG_ERROR, TAG_STTC, "<<<< stt cancel : result = %d ", result); + } } else { - SLOG(LOG_ERROR, TAG_STTC, "<<<< stt cancel : result = %d ", result); + SLOG(LOG_DEBUG, TAG_STTC, "<<<< Result Message is NULL"); + stt_dbus_reconnect(); + result = STT_ERROR_TIMED_OUT; } - dbus_message_unref(msg); - return result; +#endif } -int stt_dbus_request_start_file_recognition(int uid, const char* filepath, const char* lang, const char* type, int profanity, int punctuation) +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 == filepath || NULL == lang || NULL == type) { + if (NULL == lang || NULL == type || NULL == appid) { SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); return STT_ERROR_INVALID_PARAMETER; } @@ -982,58 +2167,106 @@ int stt_dbus_request_start_file_recognition(int uid, const char* filepath, const /* 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_METHOD_START_FILE_RECONITION); + 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 recognition : Fail to make message"); + 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 recogntion : uid(%d), filepath(%s) language(%s), type(%s)", - uid, filepath, lang, type); + 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); } - dbus_message_append_args( msg, - DBUS_TYPE_INT32, &uid, - DBUS_TYPE_STRING, &filepath, + 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, &profanity, - DBUS_TYPE_INT32, &punctuation, + 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); + } - DBusError err; - dbus_error_init(&err); + dbus_message_unref(msg); - DBusMessage* result_msg; - int result = STT_ERROR_OPERATION_FAILED; + } 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; + } - result_msg = dbus_connection_send_with_reply_and_block(g_conn, msg, g_waiting_start_time, &err); + if (NULL != temp) { + free(temp); + temp = NULL; + } + return 0; +} - if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, - DBUS_TYPE_INVALID); +int stt_dbus_request_cancel_file(int uid) +{ + DBusMessage* msg; - if (dbus_error_is_set(&err)) { - printf("<<<< Get arguments error (%s)", err.message); - dbus_error_free(&err); - result = STT_ERROR_OPERATION_FAILED; - } - dbus_message_unref(result_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, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel file : uid(%d)", uid); } - if (0 == result) { - SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt start file recognition : result = %d ", result); + 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_ERROR, TAG_STTC, "<<<< stt start file recognition : result = %d ", result); + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + return STT_ERROR_OPERATION_FAILED; } - dbus_message_unref(msg); + return 0; +} - return result; -} \ No newline at end of file