X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Ftts.c;h=23cfdb24fc4ede2036001da32cf8a91dae0fda3b;hb=c3fa9b4a5913fdb9a587769219297544c71cb821;hp=039512cf6d140da9492f146c96fc22cf5d8ce824;hpb=0a47e04d7983a1d8e3eb961c9f29cc367574fcc7;p=platform%2Fcore%2Fuifw%2Ftts.git

diff --git a/client/tts.c b/client/tts.c
index 039512c..23cfdb2 100644
--- a/client/tts.c
+++ b/client/tts.c
@@ -27,6 +27,7 @@
 #include "tts_dbus.h"
 #include "tts_main.h"
 
+#include "tts_internal.h"
 
 static bool g_screen_reader;
 
@@ -34,6 +35,16 @@ static int g_feature_enabled = -1;
 
 static bool g_err_callback_status = false;
 
+static int g_max_text_size = -1;
+
+/* for repetition */
+static char* g_language = NULL;
+
+static int g_voice_type = -1;
+
+static int g_speed = -1;
+
+
 /* Function definition */
 static Eina_Bool __tts_notify_state_changed(void *data);
 static Eina_Bool __tts_notify_error(void *data);
@@ -129,6 +140,14 @@ void __tts_config_voice_changed_cb(const char* before_lang, int before_voice_typ
 					language, voice_type, data->default_voice_changed_user_data);
 			}
 
+			/* Check whether language is changed or not. If it is changed, make 'text_repeat' NULL */
+			if (0 != strncmp(before_lang, language, strlen(before_lang))) {
+				if (NULL != data->text_repeat) {
+					free(data->text_repeat);
+					data->text_repeat = NULL;
+				}
+			}
+
 			/* Next item */
 			iter = g_list_next(iter);
 		}
@@ -137,6 +156,33 @@ void __tts_config_voice_changed_cb(const char* before_lang, int before_voice_typ
 	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;
@@ -160,14 +206,8 @@ void _tts_config_engine_changed_cb(const char* engine_id, const char* setting, c
 		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) {
@@ -194,13 +234,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;
 	}
 
@@ -229,14 +268,14 @@ int tts_create(tts_h* tts)
 		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);
 		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;
@@ -248,7 +287,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");
@@ -288,7 +327,7 @@ int tts_destroy(tts_h tts)
 			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) {
@@ -304,7 +343,7 @@ int tts_destroy(tts_h tts)
 						}
 					}
 				}
-			}
+			} while (0 != ret);
 		} else {
 			SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode);
 		}
@@ -332,10 +371,14 @@ int tts_destroy(tts_h tts)
 		}
 	}
 
+	if (NULL != g_language) {
+		free(g_language);
+		g_language = NULL;
+	}
+
 	tts = NULL;
 
-	SLOG(LOG_DEBUG, TAG_TTSC, "=====");
-	SLOG(LOG_DEBUG, TAG_TTSC, " ");
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
 
 	return TTS_ERROR_NONE;
 }
@@ -351,31 +394,30 @@ 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;
 	}
 
-	if (TTS_MODE_DEFAULT <= mode && mode <= TTS_MODE_SCREEN_READER) {
+	if (TTS_MODE_DEFAULT <= mode && mode <= TTS_MODE_INTERRUPT) {
 		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;
 	}
@@ -394,8 +436,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;
 }
@@ -406,14 +447,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;
 	}
@@ -421,7 +462,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;
 	}
@@ -433,7 +474,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;
@@ -468,8 +509,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;
 }
@@ -510,6 +550,10 @@ int tts_set_server_tts(tts_h tts, const char* credential)
 		client->credential = strdup(credential);
 		if (NULL == client->credential) {
 			SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to allocate memory");
+			if (NULL != key) {
+				free(key);
+				key = NULL;
+			}
 			return TTS_ERROR_OUT_OF_MEMORY;
 		}
 	} else {
@@ -524,10 +568,14 @@ int tts_set_server_tts(tts_h tts, const char* credential)
 	int pid = getpid();
 	char* appid = NULL;
 	int ret = app_manager_get_app_id(pid, &appid);
-	if (0 != ret) {
+	if (0 != ret || NULL == appid) {
 		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to get appid, ret(%d), pid(%d), appid(%s)", ret, pid, appid);
 		free(key);
 		key = NULL;
+		if (NULL != appid) {
+			free(appid);
+			appid = NULL;
+		}
 		return TTS_ERROR_OPERATION_FAILED;
 	}
 
@@ -536,6 +584,8 @@ int tts_set_server_tts(tts_h tts, const char* credential)
 		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to set private data, ret(%d), pid(%d), appid(%s)", ret, pid, appid);
 		free(key);
 		key = NULL;
+		free(appid);
+		appid = NULL;
 		return ret;
 	}
 
@@ -544,8 +594,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;
 }
@@ -566,7 +615,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;
@@ -584,6 +633,16 @@ static Eina_Bool __tts_connect_daemon(void *data)
 		client->conn_timer = NULL;
 		return EINA_FALSE;
 
+	} else if (TTS_ERROR_PERMISSION_DENIED == ret) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to initialize : %s", __tts_get_error_code(ret));
+
+		client->reason = TTS_ERROR_PERMISSION_DENIED;
+		client->utt_id = -1;
+
+		ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
+		client->conn_timer = NULL;
+		return EINA_FALSE;
+
 	} else if (TTS_ERROR_NONE != ret) {
 		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Fail to connection. Retry to connect : %s", __tts_get_error_code(ret));
 		return EINA_TRUE;
@@ -614,8 +673,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;
 }
@@ -626,30 +684,66 @@ 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);
+	client->conn_timer = ecore_timer_add(0.02, __tts_connect_daemon, (void*)tts);
 
-	SLOG(LOG_DEBUG, TAG_TTSC, "=====");
-	SLOG(LOG_DEBUG, TAG_TTSC, " ");
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+
+	return TTS_ERROR_NONE;
+}
+
+int tts_prepare_sync(tts_h tts)
+{
+	if (0 != __tts_get_feature_enabled()) {
+		return TTS_ERROR_NOT_SUPPORTED;
+	}
+
+	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, "@@@");
+		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, "@@@");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	int cnt = 0;
+	while (EINA_TRUE == __tts_connect_daemon((void*)tts) && TTS_CONNECTION_RETRY_COUNT > cnt) {
+		cnt++;
+	}
+
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+
+	if (TTS_CONNECTION_RETRY_COUNT == cnt) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to connect daemon");
+		return TTS_ERROR_OPERATION_FAILED;
+	}
 
 	return TTS_ERROR_NONE;
 }
@@ -660,7 +754,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);
 
@@ -688,11 +782,18 @@ int tts_unprepare(tts_h tts)
 		g_screen_reader = (bool)screen_reader;
 	}
 
+	bool is_prepared = false;
 	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) {
+				if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+					client->current_state = TTS_STATE_CREATED;
+					if (0 == tts_prepare_sync(tts)) {
+						is_prepared = true;
+						SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+					}
+				} else if (TTS_ERROR_TIMED_OUT != ret) {
 					SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 					break;
 				} else {
@@ -705,7 +806,7 @@ int tts_unprepare(tts_h tts)
 					}
 				}
 			}
-		}
+		} while (0 != ret);
 	} else {
 		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode);
 	}
@@ -720,8 +821,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;
 }
@@ -752,12 +852,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;
 	}
 
@@ -766,8 +865,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;
 	}
 
@@ -797,8 +895,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;
 }
@@ -809,12 +906,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;
 
 	}
@@ -822,8 +918,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;
 	}
 
@@ -837,8 +932,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;
 }
@@ -866,7 +960,12 @@ int tts_get_max_text_size(tts_h tts, unsigned int* size)
 		return TTS_ERROR_INVALID_STATE;
 	}
 
-	*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;
@@ -954,8 +1053,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;
 }
@@ -978,12 +1076,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;
 	}
 
@@ -991,8 +1088,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;
 	}
 
@@ -1001,17 +1097,33 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
 		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, "@@@");
+			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, "@@@");
+			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;
 	}
 
@@ -1026,36 +1138,45 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
 	}
 
 	/* 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;
+
+	DBusError err;
+	dbus_error_init(&err);
+
+	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 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);
+	if (valid != true) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Text is invalid - '%s'", text);
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+	SLOG(LOG_DEBUG, TAG_TTSC, "Text is valid - text is '%s'", text);
 
-	memset(in_buf, 0, TTS_MAX_TEXT_SIZE);
-	snprintf(in_buf, TTS_MAX_TEXT_SIZE, "%s", text);
-	in_tmp = in_buf;
+	/* save texts for repetition */
+	if (NULL != client->text_repeat) {
+		free(client->text_repeat);
+		client->text_repeat = NULL;
+	}
 
-	memset(out_buf, 0, TTS_MAX_TEXT_SIZE);
-	out_tmp = out_buf;
+	client->text_repeat = strdup(text);
 
-	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);
-		return TTS_ERROR_INVALID_PARAMETER;
+	if (NULL != g_language) {
+		free(g_language);
+		g_language = NULL;
 	}
-	iconv_close(ict);
-	SLOG(LOG_DEBUG, TAG_TTSC, "Text is valid - Converted text is '%s'", out_buf);
+	if (NULL == language)
+		g_language = NULL;
+	else
+		g_language = strdup(language);
+
+	g_voice_type = voice_type;
+	g_speed = speed;
+
+	SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] repeat: text(%s), language(%s), voice type(%d), speed(%d)", client->text_repeat, g_language, g_voice_type, g_speed);
 
 	/* change default language value */
 	char* temp = NULL;
@@ -1073,10 +1194,17 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
 	/* do request */
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	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) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				break;
 			} else {
@@ -1098,8 +1226,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;
 }
@@ -1117,10 +1244,17 @@ static void __tts_play_async(void *data)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_play(client->uid, client->credential);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				break;
 			} else {
@@ -1155,8 +1289,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;
 }
@@ -1167,12 +1300,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;
 	}
 
@@ -1180,8 +1312,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;
 	}
 
@@ -1202,8 +1333,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;
 }
@@ -1214,12 +1344,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;
 	}
 
@@ -1227,7 +1356,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;
 	}
@@ -1249,10 +1378,17 @@ int tts_play(tts_h tts)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_play(client->uid, client->credential);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				return ret;
 			} else {
@@ -1277,8 +1413,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;
 }
@@ -1296,10 +1431,17 @@ static void __tts_stop_async(void *data)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_stop(client->uid);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				break;
 			} else {
@@ -1334,8 +1476,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;
 }
@@ -1346,12 +1487,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;
 	}
 
@@ -1359,8 +1499,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;
 	}
 
@@ -1376,8 +1515,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;
 }
@@ -1388,12 +1526,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;
 	}
 
@@ -1401,8 +1538,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;
 	}
 
@@ -1418,10 +1554,17 @@ int tts_stop(tts_h tts)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_stop(client->uid);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				return ret;
 			} else {
@@ -1446,8 +1589,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;
 }
@@ -1465,10 +1607,17 @@ static void __tts_pause_async(void *data)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_pause(client->uid);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				break;
 			} else {
@@ -1503,8 +1652,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;
 }
@@ -1515,12 +1663,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;
 	}
 
@@ -1528,15 +1675,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;
 	}
 
@@ -1547,8 +1692,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;
 }
@@ -1559,12 +1703,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;
 	}
 
@@ -1572,15 +1715,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;
 	}
 
@@ -1591,10 +1732,17 @@ int tts_pause(tts_h tts)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_pause(client->uid);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				return ret;
 			} else {
@@ -1619,8 +1767,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;
 }
@@ -1631,7 +1778,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");
@@ -1662,10 +1809,17 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_set_private_data(client->uid, key, data);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				return ret;
 			} else {
@@ -1680,8 +1834,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;
 }
@@ -1692,7 +1845,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");
@@ -1718,10 +1871,17 @@ int tts_get_private_data(tts_h tts, const char* key, char** data)
 
 	int ret = -1;
 	int count = 0;
+	bool is_prepared = false;
 	while (0 != ret) {
 		ret = tts_dbus_request_get_private_data(client->uid, key, data);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
 				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 				return ret;
 			} else {
@@ -1741,8 +1901,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;
 }
@@ -2331,3 +2490,307 @@ int tts_unset_engine_changed_cb(tts_h tts)
 	return 0;
 }
 
+int tts_add_pcm(tts_h tts, int event, const void* data, unsigned int data_size, int audio_type, int rate)
+{
+	if (0 != __tts_get_feature_enabled()) {
+		return TTS_ERROR_NOT_SUPPORTED;
+	}
+
+	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, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	tts_client_s* client = tts_client_get(tts);
+
+	if (NULL == client) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	if (TTS_STATE_CREATED == client->current_state) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] The current state is invalid.");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	if (false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode) {
+		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Screen reader option is NOT available. Ignore this request");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	int ret = -1;
+	int count = 0;
+	bool is_prepared = false;
+	while (0 != ret) {
+		ret = tts_dbus_request_add_pcm(client->uid, event, data, data_size, audio_type, rate);
+		if (0 != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
+				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
+				return ret;
+			} else {
+				SLOG(LOG_WARN, TAG_TTSC, "[WARNING] retry add pcm : %s", __tts_get_error_code(ret));
+				usleep(10000);
+				count++;
+				if (TTS_RETRY_COUNT == count) {
+					SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to request");
+					return ret;
+				}
+			}
+		}
+	}
+
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+
+	return TTS_ERROR_NONE;
+}
+
+int tts_play_pcm(tts_h tts)
+{
+	if (0 != __tts_get_feature_enabled()) {
+		return TTS_ERROR_NOT_SUPPORTED;
+	}
+
+	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, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	tts_client_s* client = tts_client_get(tts);
+
+	if (NULL == client) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	if (TTS_STATE_PLAYING == client->current_state || TTS_STATE_CREATED == client->current_state) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] The current state is invalid.");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	if (false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode) {
+		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Screen reader option is NOT available. Ignore this request");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	int ret = -1;
+	int count = 0;
+	bool is_prepared = false;
+	while (0 != ret) {
+		ret = tts_dbus_request_play_pcm(client->uid);
+		if (0 != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
+				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
+				return ret;
+			} else {
+				SLOG(LOG_WARN, TAG_TTSC, "[WARNING] retry play pcm : %s", __tts_get_error_code(ret));
+				usleep(10000);
+				count++;
+				if (TTS_RETRY_COUNT == count) {
+					SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to request");
+					return ret;
+				}
+			}
+		}
+	}
+
+	client->before_state = client->current_state;
+	client->current_state = TTS_STATE_PLAYING;
+
+	if (NULL != client->state_changed_cb) {
+		tts_client_use_callback(client);
+		client->state_changed_cb(client->tts, client->before_state, client->current_state, client->state_changed_user_data);
+		tts_client_not_use_callback(client);
+		SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called");
+	}
+
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+
+	return TTS_ERROR_NONE;
+}
+
+int tts_stop_pcm(tts_h tts)
+{
+	if (0 != __tts_get_feature_enabled()) {
+		return TTS_ERROR_NOT_SUPPORTED;
+	}
+
+	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, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	tts_client_s* client = tts_client_get(tts);
+
+	if (NULL == client) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	if (TTS_STATE_CREATED == client->current_state) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] The current state is invalid.");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	if (false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode) {
+		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Screen reader option is NOT available. Ignore this request");
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	int ret = -1;
+	int count = 0;
+	bool is_prepared = false;
+	while (0 != ret) {
+		ret = tts_dbus_request_stop_pcm(client->uid);
+		if (0 != ret) {
+			if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
+				client->current_state = TTS_STATE_CREATED;
+				if (0 == tts_prepare_sync(tts)) {
+					is_prepared = true;
+					SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
+				}
+			} else if (TTS_ERROR_TIMED_OUT != ret) {
+				SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
+				return ret;
+			} else {
+				SLOG(LOG_WARN, TAG_TTSC, "[WARNING] retry stop pcm : %s", __tts_get_error_code(ret));
+				usleep(10000);
+				count++;
+				if (TTS_RETRY_COUNT == count) {
+					SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to request");
+					return ret;
+				}
+			}
+		}
+	}
+
+	client->before_state = client->current_state;
+	client->current_state = TTS_STATE_READY;
+
+	if (NULL != client->state_changed_cb) {
+		tts_client_use_callback(client);
+		client->state_changed_cb(client->tts, client->before_state, client->current_state, client->state_changed_user_data);
+		tts_client_not_use_callback(client);
+		SLOG(LOG_DEBUG, TAG_TTSC, "State changed callback is called");
+	}
+
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+
+	return TTS_ERROR_NONE;
+}
+
+int tts_repeat(tts_h tts, char** text_repeat, int* utt_id)
+{
+	if (0 != __tts_get_feature_enabled()) {
+		return TTS_ERROR_NOT_SUPPORTED;
+	}
+
+	SLOG(LOG_INFO, TAG_TTSC, "@@@ Repeat TTS");
+
+	if (NULL == tts) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	if (NULL == text_repeat || NULL == utt_id) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input parameter is null.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	*text_repeat = NULL;
+	*utt_id = -1;
+
+	tts_client_s* client = tts_client_get(tts);
+
+	if (NULL == client) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] A handle is not valid.");
+		SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
+		return TTS_ERROR_INVALID_PARAMETER;
+	}
+
+	if (TTS_STATE_READY != client->current_state) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] The current state is invalid. (%d)", client->current_state);
+		return TTS_ERROR_INVALID_STATE;
+	}
+
+	/* Clear the legacy and Add texts to be played repeatedly */
+	int ret = -1;
+	ret = tts_stop(tts);
+	if (TTS_ERROR_NONE != ret) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to clear the legacy");
+		return ret;
+	}
+
+	if (NULL != client->text_repeat) {
+		char* tmp_text = strdup(client->text_repeat);
+		char* tmp_lang = NULL;
+		if (NULL != g_language) {
+			tmp_lang = strdup(g_language);
+		}
+		ret = tts_add_text(tts, tmp_text, tmp_lang, g_voice_type, g_speed, utt_id);
+		if (TTS_ERROR_NONE != ret) {
+			SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to add texts for repetition.");
+			if (NULL != tmp_text) {
+				free(tmp_text);
+				tmp_text = NULL;
+			}
+			if (NULL != tmp_lang) {
+				free(tmp_lang);
+				tmp_lang = NULL;
+			}
+			return ret;
+		}
+		*text_repeat = strdup(client->text_repeat);
+		SLOG(LOG_DEBUG, TAG_TTSC, "[DEBUG] text to repeat(%s), utt_id(%d)", *text_repeat, *utt_id);
+		if (NULL != tmp_text) {
+			free(tmp_text);
+			tmp_text = NULL;
+		}
+		if (NULL != tmp_lang) {
+			free(tmp_lang);
+			tmp_lang = NULL;
+		}
+	} else {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] There is no previous added texts. Please add texts");
+		return TTS_ERROR_OPERATION_FAILED;
+	}
+
+	/* Play added texts */
+	ret = tts_play(tts);
+	if (TTS_ERROR_NONE != ret) {
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to play texts for repetition.");
+		if (NULL != *text_repeat) {
+			free(*text_repeat);
+			*text_repeat = NULL;
+		}
+		*utt_id = -1;
+		return ret;
+	}
+
+	return TTS_ERROR_NONE;
+}