From 61d512de9fcd491863d96439b17c412fe915fb59 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Mon, 24 Jul 2017 13:58:48 +0900 Subject: [PATCH] Fix log characters Change-Id: Iba1394dc93595a2423f80abbc9698534bef36633 Signed-off-by: sooyeon.kim --- client/tts.c | 227 +++++++++++++--------------------- client/tts_dbus.c | 6 +- client/tts_setting.c | 86 +++++-------- common/tts_config_mgr.c | 20 ++- common/tts_config_parser.c | 2 +- engine-parser/src/tts-engine-parser.c | 14 +-- server/ttsd_config.c | 14 +-- server/ttsd_dbus.c | 12 +- server/ttsd_engine_agent.c | 8 +- server/ttsd_player.c | 31 +++-- server/ttsd_server.c | 29 ++--- server/ttse.c | 5 +- 12 files changed, 184 insertions(+), 270 deletions(-) diff --git a/client/tts.c b/client/tts.c index 80bb28e..d76ef7c 100644 --- a/client/tts.c +++ b/client/tts.c @@ -217,13 +217,12 @@ int tts_create(tts_h* tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Create TTS"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Create TTS"); /* check param */ if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -259,7 +258,7 @@ int tts_create(tts_h* tts) return __tts_convert_config_error_code(ret); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_NONE; @@ -271,7 +270,7 @@ int tts_destroy(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Destroy TTS"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Destroy TTS"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); @@ -357,8 +356,7 @@ int tts_destroy(tts_h tts) tts = NULL; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -374,22 +372,21 @@ int tts_set_mode(tts_h tts, tts_mode_e mode) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Set TTS mode(%d)", mode); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Set TTS mode(%d)", mode); tts_client_s* client = tts_client_get(tts); /* check handle */ if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } /* check state */ if (client->current_state != TTS_STATE_CREATED) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_INVALID_STATE; } @@ -398,7 +395,7 @@ int tts_set_mode(tts_h tts, tts_mode_e mode) client->mode = mode; } else { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] mode is not valid : %d", mode); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_INVALID_PARAMETER; } @@ -417,8 +414,7 @@ int tts_set_mode(tts_h tts, tts_mode_e mode) tts_config_unset_screen_reader_callback(client->uid); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -429,14 +425,14 @@ int tts_get_mode(tts_h tts, tts_mode_e* mode) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get TTS mode"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get TTS mode"); tts_client_s* client = tts_client_get(tts); /* check handle */ if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_INVALID_PARAMETER; } @@ -444,7 +440,7 @@ int tts_get_mode(tts_h tts, tts_mode_e* mode) /* check state */ if (client->current_state != TTS_STATE_CREATED) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_INVALID_STATE; } @@ -456,7 +452,7 @@ int tts_get_mode(tts_h tts, tts_mode_e* mode) *mode = client->mode; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_NONE; @@ -491,8 +487,7 @@ int tts_set_credential(tts_h tts, const char* credential) } client->credential = strdup(credential); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -567,8 +562,7 @@ int tts_set_server_tts(tts_h tts, const char* credential) free(key); key = NULL; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -589,7 +583,7 @@ static Eina_Bool __tts_connect_daemon(void *data) return EINA_TRUE; } - SLOG(LOG_INFO, TAG_TTSC, "===== Connect daemon"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Connect daemon"); /* do request initialize */ int ret = -1; @@ -637,8 +631,7 @@ static Eina_Bool __tts_connect_daemon(void *data) SLOG(LOG_WARN, TAG_TTSC, "State changed callback is NULL"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return EINA_FALSE; } @@ -649,30 +642,27 @@ int tts_prepare(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Prepare TTS"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Prepare TTS"); tts_client_s* client = tts_client_get(tts); /* check handle */ if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } /* check state */ if (client->current_state != TTS_STATE_CREATED) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_STATE; } client->conn_timer = ecore_timer_add(0, __tts_connect_daemon, (void*)tts); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -683,7 +673,7 @@ int tts_unprepare(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Unprepare TTS"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Unprepare TTS"); tts_client_s* client = tts_client_get(tts); @@ -743,8 +733,7 @@ int tts_unprepare(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -775,12 +764,11 @@ int tts_foreach_supported_voices(tts_h tts, tts_supported_voice_cb callback, voi return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Foreach supported voices"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Foreach supported voices"); if (NULL == tts || NULL == callback) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input parameter is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -789,8 +777,7 @@ int tts_foreach_supported_voices(tts_h tts, tts_supported_voice_cb callback, voi /* check handle */ if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -820,8 +807,7 @@ int tts_foreach_supported_voices(tts_h tts, tts_supported_voice_cb callback, voi ret = TTS_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return ret; } @@ -832,12 +818,11 @@ int tts_get_default_voice(tts_h tts, char** lang, int* vctype) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get default voice"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get default voice"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -845,8 +830,7 @@ int tts_get_default_voice(tts_h tts, char** lang, int* vctype) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -860,8 +844,7 @@ int tts_get_default_voice(tts_h tts, char** lang, int* vctype) SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] Default language(%s), type(%d)", *lang, *vctype); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return ret; } @@ -983,8 +966,7 @@ int tts_get_error_message(tts_h tts, char** err_msg) SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Error msg (NULL)"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1007,12 +989,11 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty return TTS_ERROR_INVALID_PARAMETER; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Add text"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Add text"); if (NULL == tts || NULL == utt_id) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input parameter is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1020,8 +1001,7 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1042,24 +1022,21 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty if (strlen(text) <= 0) { SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] Max Text Size is %d", g_max_text_size); SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input text size is invalid. (max text size is unlimited.)"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } } else { SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] g_max_text_size is %d", g_max_text_size); if (g_max_text_size < strlen(text) || strlen(text) <= 0) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input text size is invalid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } } if (TTS_SPEED_AUTO > speed || TTS_SPEED_MAX < speed) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] speed value(%d) is invalid.", speed); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1133,8 +1110,7 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty temp = NULL; } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return ret; } @@ -1190,8 +1166,7 @@ static void __tts_play_async(void *data) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return; } @@ -1202,12 +1177,11 @@ int tts_play_async(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Play tts"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Play tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1215,8 +1189,7 @@ int tts_play_async(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1237,8 +1210,7 @@ int tts_play_async(tts_h tts) ecore_main_loop_thread_safe_call_async(__tts_play_async, (void*)tts); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1249,12 +1221,11 @@ int tts_play(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Play tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Play tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1262,7 +1233,7 @@ int tts_play(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); return TTS_ERROR_INVALID_PARAMETER; } @@ -1312,8 +1283,7 @@ int tts_play(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1369,8 +1339,7 @@ static void __tts_stop_async(void *data) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return; } @@ -1381,12 +1350,11 @@ int tts_stop_aync(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Stop tts"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Stop tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1394,8 +1362,7 @@ int tts_stop_aync(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1411,8 +1378,7 @@ int tts_stop_aync(tts_h tts) ecore_main_loop_thread_safe_call_async(__tts_stop_async, (void*)tts); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1423,12 +1389,11 @@ int tts_stop(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Stop tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Stop tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1436,8 +1401,7 @@ int tts_stop(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1481,8 +1445,7 @@ int tts_stop(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1538,8 +1501,7 @@ static void __tts_pause_async(void *data) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return; } @@ -1550,12 +1512,11 @@ int tts_pause_async(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_DEBUG, TAG_TTSC, "===== Pause tts"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Pause tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1563,15 +1524,13 @@ int tts_pause_async(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } if (TTS_STATE_PLAYING != client->current_state) { SLOG(LOG_ERROR, TAG_TTSC, "[Error] The Current state is NOT 'playing'. So this request should be not running."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_STATE; } @@ -1582,8 +1541,7 @@ int tts_pause_async(tts_h tts) ecore_main_loop_thread_safe_call_async(__tts_pause_async, (void*)tts); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1594,12 +1552,11 @@ int tts_pause(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Pause tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Pause tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -1607,15 +1564,13 @@ int tts_pause(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } if (TTS_STATE_PLAYING != client->current_state) { SLOG(LOG_ERROR, TAG_TTSC, "[Error] The Current state is NOT 'playing'. So this request should be not running."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_STATE; } @@ -1654,8 +1609,7 @@ int tts_pause(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -1666,7 +1620,7 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Set private data, key(%s), data(%s)", key, data); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Set private data, key(%s), data(%s)", key, data); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle isnull"); @@ -1715,8 +1669,7 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data) } } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, ""); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return 0; } @@ -1727,7 +1680,7 @@ int tts_get_private_data(tts_h tts, const char* key, char** data) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Get private data, key(%s)", key); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Get private data, key(%s)", key); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null"); @@ -1776,8 +1729,7 @@ int tts_get_private_data(tts_h tts, const char* key, char** data) *data = NULL; } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, ""); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return 0; } @@ -2372,12 +2324,11 @@ int tts_add_pcm(tts_h tts, int event, const void* data, unsigned int data_size, return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Add pcm tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Add pcm tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2385,8 +2336,7 @@ int tts_add_pcm(tts_h tts, int event, const void* data, unsigned int data_size, if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2420,8 +2370,7 @@ int tts_add_pcm(tts_h tts, int event, const void* data, unsigned int data_size, } } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -2432,12 +2381,11 @@ int tts_play_pcm(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Play pcm tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Play pcm tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2445,8 +2393,7 @@ int tts_play_pcm(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2490,8 +2437,7 @@ int tts_play_pcm(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } @@ -2502,12 +2448,11 @@ int tts_stop_pcm(tts_h tts) return TTS_ERROR_NOT_SUPPORTED; } - SLOG(LOG_INFO, TAG_TTSC, "===== Stop pcm tts"); + SLOG(LOG_INFO, TAG_TTSC, "@@@ Stop pcm tts"); if (NULL == tts) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2515,8 +2460,7 @@ int tts_stop_pcm(tts_h tts) if (NULL == client) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_INVALID_PARAMETER; } @@ -2560,8 +2504,7 @@ int tts_stop_pcm(tts_h tts) SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_ERROR_NONE; } diff --git a/client/tts_dbus.c b/client/tts_dbus.c index c85edfb..519a53e 100644 --- a/client/tts_dbus.c +++ b/client/tts_dbus.c @@ -136,9 +136,9 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle } /* TTSD_SIGNAL_ERROR */ else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Owner Changed"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Owner Changed"); __tts_cb_error(-1, TTS_ERROR_SERVICE_RESET, -1, "Daemon Reset"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); SLOG(LOG_DEBUG, TAG_TTSC, " "); } /* NameOwnerChanged */ @@ -1117,4 +1117,4 @@ int tts_dbus_request_add_pcm(int uid, int event, const char* data, int data_size } return result; -} \ No newline at end of file +} diff --git a/client/tts_setting.c b/client/tts_setting.c index c393b65..52d6a19 100644 --- a/client/tts_setting.c +++ b/client/tts_setting.c @@ -106,12 +106,11 @@ void __setting_config_pitch_changed_cb(int value, void* user_data) int tts_setting_initialize() { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Initialize TTS Setting"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Initialize TTS Setting"); if (TTS_SETTING_STATE_READY == g_state) { SLOG(LOG_WARN, TAG_TTSC, "[WARNING] TTS Setting has already been initialized."); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_NONE; } @@ -142,22 +141,20 @@ int tts_setting_initialize() g_pitch_changed_cb = NULL; g_pitch_changed_user_data = NULL; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_NONE; } int tts_setting_finalize() { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Finalize TTS Setting"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Finalize TTS Setting"); tts_config_mgr_finalize(getpid()); g_state = TTS_SETTING_STATE_NONE; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_NONE; } @@ -173,7 +170,7 @@ bool __tts_config_mgr_get_engine_list(const char* engine_id, const char* engine_ int tts_setting_foreach_supported_engines(tts_setting_supported_engine_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Foreach supported engines"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Foreach supported engines"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -194,27 +191,24 @@ int tts_setting_foreach_supported_engines(tts_setting_supported_engine_cb callba g_engine_cb = NULL; - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_engine(char** engine_id) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get current engine"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get current engine"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_INVALID_STATE; } if (NULL == engine_id) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Engine id is NULL"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_INVALID_PARAMETER; } @@ -225,27 +219,24 @@ int tts_setting_get_engine(char** engine_id) SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Get current engine"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_set_engine(const char* engine_id) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Set current engine"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Set current engine"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_INVALID_STATE; } if (NULL == engine_id) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Engine id is NULL"); - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return TTS_SETTING_ERROR_INVALID_PARAMETER; } @@ -256,15 +247,14 @@ int tts_setting_set_engine(const char* engine_id) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Set current engine : %s", engine_id); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_foreach_supported_voices(tts_setting_supported_voice_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Foreach supported voices"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Foreach supported voices"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -294,15 +284,14 @@ int tts_setting_foreach_supported_voices(tts_setting_supported_voice_cb callback SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Foreach supported voices"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_voice(char** language, int* voice_type) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get default voice"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get default voice"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -321,15 +310,14 @@ int tts_setting_get_voice(char** language, int* voice_type) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Get default voices : lang(%s) type(%d)", *language, *voice_type); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_set_voice(const char* language, int voice_type) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Set default voice"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Set default voice"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -353,15 +341,14 @@ int tts_setting_set_voice(const char* language, int voice_type) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Set default voice : lang(%s) type(%d)", language, voice_type); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_set_auto_voice(bool value) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Set auto voice"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Set auto voice"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -380,15 +367,14 @@ int tts_setting_set_auto_voice(bool value) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Set auto voice %s", value ? "on" : "off"); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_auto_voice(bool* value) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get auto voice"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get auto voice"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -407,15 +393,14 @@ int tts_setting_get_auto_voice(bool* value) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Get auto voice : %d ", (int)*value); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_speed_range(int* min, int* normal, int* max) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get speed range"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get speed range"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -438,7 +423,7 @@ int tts_setting_get_speed_range(int* min, int* normal, int* max) int tts_setting_get_speed(int* speed) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get default speed"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get default speed"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -462,15 +447,14 @@ int tts_setting_get_speed(int* speed) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Get default speed : %d ", *speed); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_set_speed(int speed) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Set default speed"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Set default speed"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -489,15 +473,14 @@ int tts_setting_set_speed(int speed) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Set default speed, %d", speed); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_pitch_range(int* min, int* normal, int* max) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get speed range"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get speed range"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -520,7 +503,7 @@ int tts_setting_get_pitch_range(int* min, int* normal, int* max) int tts_setting_set_pitch(int pitch) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Set default pitch"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Set default pitch"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); @@ -539,15 +522,14 @@ int tts_setting_set_pitch(int pitch) SECURE_SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Set default pitch, %d", pitch); } - SLOG(LOG_DEBUG, TAG_TTSC, "====="); - SLOG(LOG_DEBUG, TAG_TTSC, " "); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@"); return __setting_convert_config_error_code(ret); } int tts_setting_get_pitch(int* pitch) { - SLOG(LOG_DEBUG, TAG_TTSC, "===== Get default pitch"); + SLOG(LOG_DEBUG, TAG_TTSC, "@@@ Get default pitch"); if (TTS_SETTING_STATE_NONE == g_state) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Not initialized"); diff --git a/common/tts_config_mgr.c b/common/tts_config_mgr.c index da566c7..ba26a96 100644 --- a/common/tts_config_mgr.c +++ b/common/tts_config_mgr.c @@ -330,7 +330,7 @@ int __tts_config_mgr_select_lang(const char* engine_id, char** language, int* ty Eina_Bool tts_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handler) { - SLOG(LOG_DEBUG, tts_tag(), "===== Config changed callback event"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ Config changed callback event"); int length; struct inotify_event event; @@ -339,8 +339,7 @@ Eina_Bool tts_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handl length = read(g_config_fd_noti, &event, sizeof(struct inotify_event)); if (0 > length) { SLOG(LOG_ERROR, tts_tag(), "[ERROR] Empty Inotify event"); - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return ECORE_CALLBACK_DONE; } @@ -500,8 +499,7 @@ Eina_Bool tts_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handl SLOG(LOG_ERROR, tts_tag(), "[ERROR] Undefined event"); } - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return ECORE_CALLBACK_PASS_ON; } @@ -860,7 +858,7 @@ int __tts_config_mgr_get_engine_info() static Eina_Bool __tts_config_mgr_engine_config_inotify_event_callback(void* data, Ecore_Fd_Handler *fd_handler) { - SLOG(LOG_DEBUG, tts_tag(), "===== Engine config updated callback event"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ Engine config updated callback event"); tts_engine_inotify_s *ino = (tts_engine_inotify_s *)data; int dir_fd = ino->dir_fd; @@ -872,8 +870,7 @@ static Eina_Bool __tts_config_mgr_engine_config_inotify_event_callback(void* dat length = read(dir_fd, &event, sizeof(struct inotify_event)); if (0 > length) { SLOG(LOG_ERROR, tts_tag(), "[ERROR] Empty Inotify event"); - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return ECORE_CALLBACK_DONE; } @@ -928,8 +925,7 @@ static Eina_Bool __tts_config_mgr_engine_config_inotify_event_callback(void* dat SLOG(LOG_ERROR, tts_tag(), "[ERROR] Undefined event"); } - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return ECORE_CALLBACK_PASS_ON; } @@ -1178,7 +1174,7 @@ int tts_config_mgr_initialize(int uid) } /* print daemon config */ - SLOG(LOG_DEBUG, tts_tag(), "== TTS config =="); + SLOG(LOG_DEBUG, tts_tag(), "@@@ TTS config @@@"); SECURE_SLOG(LOG_DEBUG, tts_tag(), " engine : %s", g_config_info->engine_id); SECURE_SLOG(LOG_DEBUG, tts_tag(), " setting : %s", g_config_info->setting); SECURE_SLOG(LOG_DEBUG, tts_tag(), " auto voice : %s", g_config_info->auto_voice ? "on" : "off"); @@ -1186,7 +1182,7 @@ int tts_config_mgr_initialize(int uid) SECURE_SLOG(LOG_DEBUG, tts_tag(), " voice type : %d", g_config_info->type); SECURE_SLOG(LOG_DEBUG, tts_tag(), " speech rate : %d", g_config_info->speech_rate); SECURE_SLOG(LOG_DEBUG, tts_tag(), " pitch : %d", g_config_info->pitch); - SLOG(LOG_DEBUG, tts_tag(), "================="); + SLOG(LOG_DEBUG, tts_tag(), "@@@@@"); if (0 != __tts_config_mgr_register_config_event()) { SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to register config event"); diff --git a/common/tts_config_parser.c b/common/tts_config_parser.c index 24cf091..06e4836 100644 --- a/common/tts_config_parser.c +++ b/common/tts_config_parser.c @@ -322,7 +322,7 @@ int tts_parser_print_engine_info(tts_engine_info_s* engine_info) SLOG(LOG_ERROR, tts_tag(), " Voice is NONE"); } - SLOG(LOG_DEBUG, tts_tag(), "====================="); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return 0; } diff --git a/engine-parser/src/tts-engine-parser.c b/engine-parser/src/tts-engine-parser.c index 6767809..97f5ca5 100644 --- a/engine-parser/src/tts-engine-parser.c +++ b/engine-parser/src/tts-engine-parser.c @@ -93,19 +93,19 @@ char *g_dir_engine_info = NULL; static int __create_engine_info_xml(const char *pkgid) { - LOGD("=== Create engine info doc"); + LOGD("@@@ Create engine info doc"); g_doc = xmlNewDoc((xmlChar*)"1.0"); if (NULL == g_doc) { LOGE("[ERROR] Fail to new doc"); return -1; } - LOGD("==="); + LOGD("@@@"); return 0; } static int __save_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid, gid_t gid) { - LOGD("=== Save engine info doc"); + LOGD("@@@ Save engine info doc"); char *dir_config_base = NULL; char *dir_home = NULL; char *dir_engine_base = NULL; @@ -269,13 +269,13 @@ static int __save_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid, gid_t FREE(dir_engine_base) FREE(dir_engine_info) - LOGD("==="); + LOGD("@@@"); return 0; } static int __remove_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid) { - LOGD("=== Remove engine info doc"); + LOGD("@@@ Remove engine info doc"); char *dir_engine_info = NULL; @@ -316,13 +316,13 @@ static int __remove_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid) FREE(dir_engine_info) - LOGD("==="); + LOGD("@@@"); return 0; } static void __insert_language_from_metadata(xmlNodePtr root, const char *language) { - LOGD("==== Insert language"); + LOGD("@@@ Insert language"); char* voice = NULL; char* lang = NULL; char* type = NULL; diff --git a/server/ttsd_config.c b/server/ttsd_config.c index 7d0e1f6..58dc2fa 100644 --- a/server/ttsd_config.c +++ b/server/ttsd_config.c @@ -204,17 +204,17 @@ int ttsd_config_get_default_pitch(int* pitch) int ttsd_config_save_error(int uid, int uttid, const char* lang, int vctype, const char* text, const char* func, int line, const char* message) { - SLOG(LOG_ERROR, tts_tag(), "=============== TTS ERROR LOG ===================="); + SLOG(LOG_DEBUG, tts_tag(), "@@@@@ TTS ERROR LOG @@@@@"); - SLOG(LOG_ERROR, tts_tag(), "uid(%d) uttid(%d)", uid, uttid); + SLOG(LOG_DEBUG, tts_tag(), "uid(%d) uttid(%d)", uid, uttid); - SLOG(LOG_ERROR, tts_tag(), "Function(%s) Line(%d)", (NULL == func) ? "NULL" : func, line); - SLOG(LOG_ERROR, tts_tag(), "Message(%s)", (NULL == message) ? "NULL" : message); - SLOG(LOG_ERROR, tts_tag(), "Lang(%s), type(%d)", (NULL == lang) ? "NULL" : lang, vctype); - SLOG(LOG_ERROR, tts_tag(), "Text(%s)", (NULL == text) ? "NULL" : text); + SLOG(LOG_DEBUG, tts_tag(), "Function(%s) Line(%d)", (NULL == func) ? "NULL" : func, line); + SLOG(LOG_DEBUG, tts_tag(), "Message(%s)", (NULL == message) ? "NULL" : message); + SLOG(LOG_DEBUG, tts_tag(), "Lang(%s), type(%d)", (NULL == lang) ? "NULL" : lang, vctype); + SLOG(LOG_DEBUG, tts_tag(), "Text(%s)", (NULL == text) ? "NULL" : text); - SLOG(LOG_ERROR, tts_tag(), "=================================================="); + SLOG(LOG_DEBUG, tts_tag(), "@@@@@"); return 0; } diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c index 026f0ea..76bc2ea 100644 --- a/server/ttsd_dbus.c +++ b/server/ttsd_dbus.c @@ -138,10 +138,10 @@ int ttsdc_send_message(int pid, int uid, int data, const char *method) method); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, tts_tag(), "<<<< [Dbus ERROR] Fail to create message : %s", method); + SLOG(LOG_ERROR, tts_tag(), "[Dbus ERROR] Fail to create message : %s", method); return -1; } else { - SLOG(LOG_DEBUG, tts_tag(), "<<<< [Dbus] Send %s message : uid(%d) data(%d)", method, uid, data); + SLOG(LOG_DEBUG, tts_tag(), "[Dbus] Send %s message : uid(%d) data(%d)", method, uid, data); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INT32, &data, DBUS_TYPE_INVALID); @@ -324,7 +324,7 @@ void __ttsd_dbus_connection_free() int ttsd_dbus_open_connection() { - SLOG(LOG_DEBUG, tts_tag(), "=== start dbus open connection"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ start dbus open connection"); DBusError err; dbus_error_init(&err); @@ -445,13 +445,13 @@ int ttsd_dbus_open_connection() return -1; } - SLOG(LOG_DEBUG, tts_tag(), "==="); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return 0; } int ttsd_dbus_close_connection() { - SLOG(LOG_DEBUG, tts_tag(), "=== start dbus close connection"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ start dbus close connection"); DBusError err; dbus_error_init(&err); @@ -471,7 +471,7 @@ int ttsd_dbus_close_connection() __ttsd_dbus_connection_free(); __ttsd_dbus_service_free(); - SLOG(LOG_DEBUG, tts_tag(), "==="); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return 0; } diff --git a/server/ttsd_engine_agent.c b/server/ttsd_engine_agent.c index 221582b..cd31434 100644 --- a/server/ttsd_engine_agent.c +++ b/server/ttsd_engine_agent.c @@ -259,7 +259,7 @@ static int __update_voice_list() int ttsd_engine_agent_load_current_engine(ttse_request_callback_s* callback) { - SLOG(LOG_DEBUG, tts_tag(), "[Engine Agent DEBUG] === ttsd_engine_agent_load_current_engine START"); + SLOG(LOG_DEBUG, tts_tag(), "[Engine Agent DEBUG] load current engine START"); if (false == g_agent_init) { @@ -1206,7 +1206,7 @@ int ttsd_print_voicelist() GSList *iter = NULL; ttsvoice_s* data = NULL; - SLOG(LOG_DEBUG, tts_tag(), "=== Voice list ==="); + SLOG(LOG_DEBUG, tts_tag(), "@@@ Voice list @@@"); if (g_slist_length(g_cur_voices) > 0) { /* Get a first item */ @@ -1231,14 +1231,14 @@ int ttsd_print_voicelist() } } - SLOG(LOG_DEBUG, tts_tag(), "=================="); + SLOG(LOG_DEBUG, tts_tag(), "@@@@@"); return 0; } int __internal_get_engine_info(ttse_request_callback_s* callback) { - SLOG(LOG_DEBUG, tts_tag(), "[Engine Agent DEBUG] === inside __internal_get_engine_info"); + SLOG(LOG_DEBUG, tts_tag(), "[Engine Agent DEBUG] internal get engine info"); if (NULL == callback) { SLOG(LOG_ERROR, tts_tag(), "[Engine Agent ERROR] Invalid engine"); diff --git a/server/ttsd_player.c b/server/ttsd_player.c index 9c6760a..d10c31a 100644 --- a/server/ttsd_player.c +++ b/server/ttsd_player.c @@ -98,7 +98,7 @@ player_s* __player_get_item(int uid) void __player_focus_state_cb(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason_for_change, int sound_behavior, const char *extra_info, void *user_data) { - SLOG(LOG_DEBUG, tts_tag(), "===== Focus state changed cb"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ Focus state changed cb"); if (stream_info != g_stream_info_h) { SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Invalid stream info handle"); @@ -134,8 +134,7 @@ void __player_focus_state_cb(sound_stream_info_h stream_info, sound_stream_focus } } - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), ""); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return; } @@ -196,7 +195,7 @@ static int __destroy_audio_out() static void __end_play_thread(void *data, Ecore_Thread *thread) { - SLOG(LOG_ERROR, tts_tag(), "===== End thread"); + SLOG(LOG_ERROR, tts_tag(), "@@@ End thread"); } static void __set_policy_for_playing(int volume) @@ -241,7 +240,7 @@ static void __unset_policy_for_playing() static void __play_thread(void *data, Ecore_Thread *thread) { - SLOG(LOG_DEBUG, tts_tag(), "===== Start thread"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ Start thread"); if (NULL == g_playing_info) { SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] No current player"); @@ -647,9 +646,9 @@ int ttsd_player_release(void) int ret; - SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] @@@@@"); SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] Active thread count : %d", ecore_thread_active_get()); - SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] @@@@@"); /* The thread should be released */ int thread_count = ecore_thread_active_get(); @@ -860,9 +859,9 @@ int ttsd_player_stop(int uid) current->idx = 0; if (NULL == g_playing_info) { - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); SLOG(LOG_ERROR, tts_tag(), "[Player] Active thread count : %d", ecore_thread_active_get()); - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); /* The thread should be released */ int thread_count = ecore_thread_active_get(); @@ -879,9 +878,9 @@ int ttsd_player_stop(int uid) thread_count = ecore_thread_active_get(); } - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); SLOG(LOG_ERROR, tts_tag(), "[Player] Active thread count : %d", ecore_thread_active_get()); - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); } SLOG(LOG_INFO, tts_tag(), "[Player SUCCESS] Stop player : uid(%d)", uid); @@ -954,10 +953,10 @@ int ttsd_player_pause(int uid) } current->state = APP_STATE_PAUSED; - - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); SLOG(LOG_ERROR, tts_tag(), "[Player] Active thread count : %d", ecore_thread_active_get()); - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); /* The thread should be released */ int thread_count = ecore_thread_active_get(); @@ -974,9 +973,9 @@ int ttsd_player_pause(int uid) thread_count = ecore_thread_active_get(); } - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); SLOG(LOG_ERROR, tts_tag(), "[Player] Active thread count : %d", ecore_thread_active_get()); - SLOG(LOG_DEBUG, tts_tag(), "[Player] =========================="); + SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@"); SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Pause player : uid(%d)", uid); diff --git a/server/ttsd_server.c b/server/ttsd_server.c index 27b5e01..eaf8a6e 100644 --- a/server/ttsd_server.c +++ b/server/ttsd_server.c @@ -91,7 +91,7 @@ static Eina_Bool __wait_synthesis(void *data) static int __synthesis(int uid, const char* credential) { - SLOG(LOG_DEBUG, tts_tag(), "===== SYNTHESIS START"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ SYNTHESIS START"); speak_data_s* speak_data = NULL; if (0 == ttsd_data_get_speak_data(uid, &speak_data)) { @@ -164,8 +164,7 @@ static int __synthesis(int uid, const char* credential) } } - SLOG(LOG_DEBUG, tts_tag(), "===== SYNTHESIS END"); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@ SYNTHESIS END"); return 0; } @@ -203,7 +202,7 @@ int ttsd_send_error(ttse_error_e error, const char* msg) int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int data_size, ttse_audio_type_e audio_type, int rate, void* user_data) { - SLOG(LOG_DEBUG, tts_tag(), "===== SEND SYNTHESIS RESULT START"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ SEND SYNTHESIS RESULT START"); int uid = g_utt.uid; int uttid = g_utt.uttid; @@ -226,16 +225,14 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d if (false == ttsd_data_is_uttid_valid(uid, uttid)) { __server_set_synth_control(TTSD_SYNTHESIS_CONTROL_DONE); SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] uttid is NOT valid !!!! - uid(%d), uttid(%d)", uid, uttid); - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return TTSD_ERROR_OPERATION_FAILED; } if (rate <= 0 || audio_type < 0 || audio_type > TTSE_AUDIO_TYPE_MAX) { __server_set_synth_control(TTSD_SYNTHESIS_CONTROL_DONE); SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] audio data is invalid"); - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return TTSD_ERROR_INVALID_PARAMETER; } @@ -294,7 +291,7 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d } - /*SLOG(LOG_DEBUG, tts_tag(), "===== SYNTHESIS RESULT CALLBACK END"); + /*SLOG(LOG_DEBUG, tts_tag(), "@@@ SYNTHESIS RESULT CALLBACK END"); SLOG(LOG_DEBUG, tts_tag(), " ");*/ return TTSD_ERROR_NONE; @@ -411,7 +408,7 @@ void __config_changed_cb(tts_config_type_e type, const char* str_param, int int_ bool __terminate_client(int pid, int uid, app_state_e state, void* user_data) { - SLOG(LOG_INFO, tts_tag(), "=== Start to terminate client [%d] ===", uid); + SLOG(LOG_INFO, tts_tag(), "@@@ Start to terminate client [%d]", uid); ttsd_server_finalize(uid); return true; } @@ -639,7 +636,7 @@ bool __get_client_for_clean_up(int pid, int uid, app_state_e state, void* user_d Eina_Bool ttsd_cleanup_client(void *data) { - SLOG(LOG_DEBUG, tts_tag(), "===== CLEAN UP CLIENT START"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ CLEAN UP CLIENT START"); __read_proc(); if (0 < ttsd_data_get_client_count()) { @@ -648,8 +645,7 @@ Eina_Bool ttsd_cleanup_client(void *data) ecore_timer_add(0, __quit_ecore_loop, NULL); } - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return EINA_TRUE; } @@ -1153,7 +1149,7 @@ int ttsd_server_stop_pcm(int uid) int ttsd_server_add_pcm(int uid, int event, void* data, int data_size, int audio_type, int rate) { - SLOG(LOG_DEBUG, tts_tag(), "===== ADD PCM"); + SLOG(LOG_DEBUG, tts_tag(), "@@@ ADD PCM"); int uttid = -1; @@ -1173,8 +1169,7 @@ int ttsd_server_add_pcm(int uid, int event, void* data, int data_size, int audio if (rate <= 0 || audio_type < 0 || audio_type > TTSE_AUDIO_TYPE_MAX) { SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] audio data is invalid"); - SLOG(LOG_DEBUG, tts_tag(), "====="); - SLOG(LOG_DEBUG, tts_tag(), " "); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return TTSD_ERROR_INVALID_PARAMETER; } @@ -1235,7 +1230,7 @@ int ttsd_server_add_pcm(int uid, int event, void* data, int data_size, int audio SLOG(LOG_DEBUG, tts_tag(), "[SERVER] Event : TTSE_RESULT_EVENT_ERROR"); } - SLOG(LOG_DEBUG, tts_tag(), "====="); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return TTSD_ERROR_NONE; } diff --git a/server/ttse.c b/server/ttse.c index 44b61c1..0e8ee96 100755 --- a/server/ttse.c +++ b/server/ttse.c @@ -105,8 +105,7 @@ int ttse_main(int argc, char** argv, ttse_request_callback_s *callback) SLOG(LOG_WARN, tts_tag(), "[WARNING] Fail to initialize network"); } - SLOG(LOG_DEBUG, tts_tag(), "===="); - SLOG(LOG_DEBUG, tts_tag(), ""); + SLOG(LOG_DEBUG, tts_tag(), "@@@"); return TTSE_ERROR_NONE; } @@ -204,4 +203,4 @@ int ttse_set_private_data_requested_cb(ttse_private_data_requested_cb callback_f } return ret; -} \ No newline at end of file +} -- 2.7.4