static bool g_err_callback_status = false;
+static int g_max_text_size = -1;
+
/* Function definition */
static Eina_Bool __tts_notify_state_changed(void *data);
static Eina_Bool __tts_notify_error(void *data);
return;
}
+static Eina_Bool __reconnect_by_engine_changed(void* data)
+{
+ tts_h tts = (tts_h)data;
+
+ tts_client_s* client = tts_client_get(tts);
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[WARNING] A handle is not valid");
+ return EINA_FALSE;
+ }
+
+ if (TTS_STATE_READY != client->current_state) {
+ usleep(10000);
+ return EINA_TRUE;
+ }
+
+ int ret = tts_unprepare(tts);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to prepare for setting a new engine... (%d)", ret);
+ }
+ ret = tts_prepare(tts);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to prepare for setting a new engine... (%d)", ret);
+ }
+
+ return EINA_FALSE;
+}
+
void _tts_config_engine_changed_cb(const char* engine_id, const char* setting, const char* language, int voice_type, bool auto_voice, bool need_credential, void* user_data)
{
tts_h tts = (tts_h)user_data;
if (0 != ret) {
SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] TTS client stopping...");
}
- ret = tts_unprepare(tts);
- if (0 != ret) {
- SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to unprepare for setting a new engine... (%d)", ret);
- }
- ret = tts_prepare(tts);
- if (0 != ret) {
- SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to prepare for setting a new engine... (%d)", ret);
- }
+
+ ecore_idler_add(__reconnect_by_engine_changed, (void*)tts);
} else if (TTS_STATE_READY == client->current_state) {
ret = tts_unprepare(tts);
if (0 != ret) {
return __tts_convert_config_error_code(ret);
}
- ret = tts_config_mgr_set_callback(client->uid, _tts_config_engine_changed_cb, __tts_config_voice_changed_cb, NULL, NULL, NULL);
+ ret = tts_config_mgr_set_callback(client->uid, _tts_config_engine_changed_cb, __tts_config_voice_changed_cb, NULL, NULL, client->tts);
if (0 != ret) {
SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to set config changed : %d", ret);
tts_client_destroy(*tts);
int ret = -1;
int count = 0;
+ int screen_reader = -1;
/* check state */
switch (client->current_state) {
case TTS_STATE_PAUSED:
case TTS_STATE_PLAYING:
case TTS_STATE_READY:
+ ret = vconf_get_bool(TTS_ACCESSIBILITY_KEY, &screen_reader);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to get screen reader");
+ } else {
+ SLOG(LOG_INFO, tts_tag(), "[INFO] Success to get screen reader(%d), g_screen_reader(%s), client->mode(%d)", screen_reader, (true == g_screen_reader) ? "True" : "False", client->mode);
+ g_screen_reader = (bool)screen_reader;
+ }
if (!(false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode)) {
- while (0 != ret) {
+ do {
ret = tts_dbus_request_finalize(client->uid);
if (0 != ret) {
if (TTS_ERROR_TIMED_OUT != ret) {
}
}
}
- }
+ } while (0 != ret);
} else {
SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode);
}
int ret = -1;
int count = 0;
+ int screen_reader = -1;
+
+ ret = vconf_get_bool(TTS_ACCESSIBILITY_KEY, &screen_reader);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to get screen reader");
+ } else {
+ SLOG(LOG_INFO, tts_tag(), "[INFO] Success to get screen reader(%d), g_screen_reader(%s), client->mode(%d)", screen_reader, (true == g_screen_reader) ? "True" : "False", client->mode);
+ g_screen_reader = (bool)screen_reader;
+ }
+
if (!(false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode)) {
- while (0 != ret) {
+ do {
ret = tts_dbus_request_finalize(client->uid);
if (0 != ret) {
if (TTS_ERROR_TIMED_OUT != ret) {
}
}
}
- }
+ } while (0 != ret);
} else {
SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode);
}
ret = tts_config_mgr_get_voice_list(current_engine, __tts_supported_voice_cb, client->tts);
- if (NULL != current_engine)
+ if (NULL != current_engine) {
free(current_engine);
+ current_engine = NULL;
+ }
client->supported_voice_cb = NULL;
client->supported_voice_user_data = NULL;
return TTS_ERROR_INVALID_STATE;
}
- *size = TTS_MAX_TEXT_SIZE;
+// *size = TTS_MAX_TEXT_SIZE;
+ if (0 != tts_config_mgr_get_max_text_size(size)) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to get max text size");
+ return TTS_ERROR_INVALID_PARAMETER;
+ }
+
+ g_max_text_size = (int)*size;
SLOG(LOG_DEBUG, TAG_TTSC, "Get max text count : %d", *size);
return TTS_ERROR_NONE;
*err_msg = strdup(client->err_msg);
SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Error msg (%s)", *err_msg);
} else {
+ *err_msg = NULL;
SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Error msg (NULL)");
}
return TTS_ERROR_INVALID_STATE;
}
- if (TTS_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, " ");
- return TTS_ERROR_INVALID_PARAMETER;
+ if (-1 == g_max_text_size) {
+ SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] g_max_text_size is %d", g_max_text_size);
+ if (0 != tts_config_mgr_get_max_text_size((unsigned int*)&g_max_text_size)) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to get max text size");
+ return TTS_ERROR_INVALID_PARAMETER;
+ }
+ }
+
+ if (0 == g_max_text_size) {
+ 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, " ");
+ 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, " ");
+ return TTS_ERROR_INVALID_PARAMETER;
+ }
}
if (TTS_SPEED_AUTO > speed || TTS_SPEED_MAX < speed) {
}
/* check valid utf8 */
- iconv_t *ict;
- ict = iconv_open("utf-8", "");
- if ((iconv_t)-1 == ict) {
- SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to init for text check");
- return TTS_ERROR_OPERATION_FAILED;
- }
+ bool valid = false;
- size_t len = strlen(text);
- char *in_tmp = NULL;
- char in_buf[TTS_MAX_TEXT_SIZE];
- char *out_tmp = NULL;
- char out_buf[TTS_MAX_TEXT_SIZE];
- size_t len_tmp = sizeof(out_buf);
+ DBusError err;
+ dbus_error_init(&err);
- memset(in_buf, 0, TTS_MAX_TEXT_SIZE);
- snprintf(in_buf, TTS_MAX_TEXT_SIZE, "%s", text);
- in_tmp = in_buf;
-
- memset(out_buf, 0, TTS_MAX_TEXT_SIZE);
- out_tmp = out_buf;
+ valid = dbus_validate_utf8(text, &err);
+ if (dbus_error_is_set(&err)) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Dbus Error(%s), text(%s)", err.message, text);
+ dbus_error_free(&err);
+ return TTS_ERROR_INVALID_PARAMETER;
+ }
- size_t st;
- st = iconv(ict, &in_tmp, &len, &out_tmp, &len_tmp);
- if ((size_t)-1 == st) {
- SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Text is invalid - '%s'", in_buf);
- iconv_close(ict);
+ if (valid != true) {
+ SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Text is invalid - '%s'", text);
return TTS_ERROR_INVALID_PARAMETER;
}
- iconv_close(ict);
- SLOG(LOG_DEBUG, TAG_TTSC, "Text is valid - Converted text is '%s'", out_buf);
+ SLOG(LOG_DEBUG, TAG_TTSC, "Text is valid - text is '%s'", text);
/* change default language value */
char* temp = NULL;
int ret = -1;
int count = 0;
while (0 != ret) {
- ret = tts_dbus_request_add_text(client->uid, out_buf, temp, voice_type, speed, client->current_utt_id, client->credential);
+ ret = tts_dbus_request_add_text(client->uid, text, temp, voice_type, speed, client->current_utt_id, client->credential);
if (0 != ret) {
if (TTS_ERROR_TIMED_OUT != ret) {
SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
}
}
- if (NULL != temp) free(temp);
+ if (NULL != temp) {
+ free(temp);
+ temp = NULL;
+ }
SLOG(LOG_DEBUG, TAG_TTSC, "=====");
SLOG(LOG_DEBUG, TAG_TTSC, " ");
projects / platform / core / uifw / tts.git / blobdiff