X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Ftts.c;h=08e8d9a3fa238b7852faa77d8e5f5df74e00d51f;hb=68ae641b2958e1df09406cef9374092830f640b6;hp=911d0449647097e69331e4bb6371fb83fe194047;hpb=d69778a783ea20a773a4ea09783ed36b12e70ce3;p=platform%2Fcore%2Fuifw%2Ftts.git

diff --git a/client/tts.c b/client/tts.c
index 911d044..08e8d9a 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;
 
@@ -36,6 +37,17 @@ static bool g_err_callback_status = false;
 
 static int g_max_text_size = -1;
 
+static Ecore_Timer* g_check_state_timer = NULL;
+
+
+/* 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);
@@ -108,6 +120,7 @@ static int __tts_convert_config_error_code(tts_config_error_e code)
 	return code;
 }
 
+//LCOV_EXCL_START
 void __tts_config_voice_changed_cb(const char* before_lang, int before_voice_type, const char* language, int voice_type, bool auto_voice, void* user_data)
 {
 	SLOG(LOG_DEBUG, TAG_TTSC, "Voice changed : Before lang(%s) type(%d) , Current lang(%s), type(%d)",
@@ -131,6 +144,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);
 		}
@@ -210,6 +231,7 @@ void _tts_config_engine_changed_cb(const char* engine_id, const char* setting, c
 	}
 	return;
 }
+//LCOV_EXCL_STOP
 
 int tts_create(tts_h* tts)
 {
@@ -217,13 +239,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 +280,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 +292,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");
@@ -314,6 +335,7 @@ int tts_destroy(tts_h tts)
 			do {
 				ret = tts_dbus_request_finalize(client->uid);
 				if (0 != ret) {
+					//LCOV_EXCL_START
 					if (TTS_ERROR_TIMED_OUT != ret) {
 						SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
 						break;
@@ -326,6 +348,7 @@ int tts_destroy(tts_h tts)
 							break;
 						}
 					}
+					//LCOV_EXCL_STOP
 				}
 			} while (0 != ret);
 		} else {
@@ -355,18 +378,30 @@ int tts_destroy(tts_h tts)
 		}
 	}
 
+	if (NULL != g_language) {
+		free(g_language);
+		g_language = NULL;
+	}
+
+	/* Delete state timer before destroying handle */
+	if (NULL != g_check_state_timer) {
+		ecore_timer_del(g_check_state_timer);
+		g_check_state_timer = NULL;
+	}
+
 	tts = NULL;
 
-	SLOG(LOG_DEBUG, TAG_TTSC, "=====");
-	SLOG(LOG_DEBUG, TAG_TTSC, " ");
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
 
 	return TTS_ERROR_NONE;
 }
 
+//LCOV_EXCL_START
 void __tts_screen_reader_changed_cb(bool value)
 {
 	g_screen_reader = value;
 }
+//LCOV_EXCL_STOP
 
 int tts_set_mode(tts_h tts, tts_mode_e mode)
 {
@@ -374,31 +409,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;
 	}
@@ -417,8 +451,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 +462,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 +477,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 +489,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,12 +524,12 @@ 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;
 }
 
+//LCOV_EXCL_START
 int tts_set_server_tts(tts_h tts, const char* credential)
 {
 	if (0 != __tts_get_feature_enabled()) {
@@ -533,6 +566,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 {
@@ -547,10 +584,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;
 	}
 
@@ -559,6 +600,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;
 	}
 
@@ -567,11 +610,11 @@ 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;
 }
+// LCOV_EXCL_STOP
 
 static Eina_Bool __tts_connect_daemon(void *data)
 {
@@ -589,7 +632,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;
@@ -604,7 +647,23 @@ static Eina_Bool __tts_connect_daemon(void *data)
 		client->utt_id = -1;
 
 		ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
-		client->conn_timer = NULL;
+		if (client->conn_timer) {
+			ecore_timer_del(client->conn_timer);
+			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);
+		if (client->conn_timer) {
+			ecore_timer_del(client->conn_timer);
+			client->conn_timer = NULL;
+		}
 		return EINA_FALSE;
 
 	} else if (TTS_ERROR_NONE != ret) {
@@ -617,7 +676,10 @@ static Eina_Bool __tts_connect_daemon(void *data)
 		SLOG(LOG_ERROR, TAG_TTSC, "Supported options : credential(%s)", credential_needed ? "need" : "no need");
 	}
 
-	client->conn_timer = NULL;
+	if (client->conn_timer) {
+		ecore_timer_del(client->conn_timer);
+		client->conn_timer = NULL;
+	}
 
 	client = tts_client_get(tts);
 	/* check handle */
@@ -637,8 +699,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,41 +710,85 @@ 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);
+	ecore_thread_main_loop_begin();
+	if (client->conn_timer) {
+		ecore_timer_del(client->conn_timer);
+		client->conn_timer = NULL;
+	}
+	client->conn_timer = ecore_timer_add(0.02, __tts_connect_daemon, (void*)tts);
+	ecore_thread_main_loop_end();
 
-	SLOG(LOG_DEBUG, TAG_TTSC, "=====");
-	SLOG(LOG_DEBUG, TAG_TTSC, " ");
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
 
 	return TTS_ERROR_NONE;
 }
 
+//LCOV_EXCL_START
+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;
+}
+//LCOV_EXCL_STOP
+
 int tts_unprepare(tts_h tts)
 {
 	if (0 != __tts_get_feature_enabled()) {
 		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);
 
@@ -711,11 +816,19 @@ 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)) {
 		do {
 			ret = tts_dbus_request_finalize(client->uid);
 			if (0 != ret) {
-				if (TTS_ERROR_TIMED_OUT != ret) {
+				//LCOV_EXCL_START
+				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 {
@@ -727,6 +840,7 @@ int tts_unprepare(tts_h tts)
 						break;
 					}
 				}
+				//LCOV_EXCL_STOP
 			}
 		} while (0 != ret);
 	} else {
@@ -743,8 +857,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 +888,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 +901,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 +931,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 +942,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 +954,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 +968,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;
 }
@@ -889,7 +996,6 @@ 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;
@@ -983,8 +1089,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 +1112,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 +1124,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 +1145,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;
 	}
 
@@ -1092,6 +1192,28 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
 	}
 	SLOG(LOG_DEBUG, TAG_TTSC, "Text is valid - text is '%s'", text);
 
+	/* save texts for repetition */
+	if (NULL != client->text_repeat) {
+		free(client->text_repeat);
+		client->text_repeat = NULL;
+	}
+
+	client->text_repeat = strdup(text);
+
+	if (NULL != g_language) {
+		free(g_language);
+		g_language = NULL;
+	}
+	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;
 
@@ -1108,10 +1230,18 @@ 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, text, temp, voice_type, speed, client->current_utt_id, client->credential);
 		if (0 != ret) {
-			if (TTS_ERROR_TIMED_OUT != ret) {
+			//LCOV_EXCL_START
+			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 {
@@ -1123,6 +1253,7 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
 					break;
 				}
 			}
+			//LCOV_EXCL_STOP
 		} else {
 			*utt_id = client->current_utt_id;
 		}
@@ -1133,12 +1264,12 @@ 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;
 }
 
+//LCOV_EXCL_START
 static void __tts_play_async(void *data)
 {
 	tts_h tts = (tts_h)data;
@@ -1152,10 +1283,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 {
@@ -1190,8 +1328,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 +1339,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 +1351,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,24 +1372,22 @@ 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;
 }
-
+//LCOV_EXCL_STOP
 int tts_play(tts_h tts)
 {
 	if (0 != __tts_get_feature_enabled()) {
 		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 +1395,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;
 	}
@@ -1284,10 +1417,18 @@ 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) {
+			//LCOV_EXCL_START
+			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 {
@@ -1299,6 +1440,7 @@ int tts_play(tts_h tts)
 					return ret;
 				}
 			}
+			//LCOV_EXCL_STOP
 		}
 	}
 
@@ -1312,12 +1454,11 @@ 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;
 }
-
+//LCOV_EXCL_START
 static void __tts_stop_async(void *data)
 {
 	tts_h tts = (tts_h)data;
@@ -1331,10 +1472,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 {
@@ -1369,8 +1517,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 +1528,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 +1540,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,24 +1556,22 @@ 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;
 }
-
+//LCOV_EXCL_STOP
 int tts_stop(tts_h tts)
 {
 	if (0 != __tts_get_feature_enabled()) {
 		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 +1579,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;
 	}
 
@@ -1453,10 +1595,18 @@ 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) {
+			//LCOV_EXCL_START
+			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 {
@@ -1468,6 +1618,7 @@ int tts_stop(tts_h tts)
 					return ret;
 				}
 			}
+			//LCOV_EXCL_STOP
 		}
 	}
 
@@ -1481,12 +1632,11 @@ 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;
 }
-
+//LCOV_EXCL_START
 static void __tts_pause_async(void *data)
 {
 	tts_h tts = (tts_h)data;
@@ -1500,10 +1650,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 {
@@ -1538,8 +1695,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 +1706,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 +1718,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,24 +1735,22 @@ 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;
 }
-
+//LCOV_EXCL_STOP
 int tts_pause(tts_h tts)
 {
 	if (0 != __tts_get_feature_enabled()) {
 		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 +1758,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;
 	}
 
@@ -1626,10 +1775,18 @@ 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) {
+			//LCOV_EXCL_START
+			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 {
@@ -1641,6 +1798,7 @@ int tts_pause(tts_h tts)
 					return ret;
 				}
 			}
+			//LCOV_EXCL_STOP
 		}
 	}
 
@@ -1654,8 +1812,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,10 +1823,10 @@ 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");
+		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input handle is null");
 		return TTS_ERROR_INVALID_PARAMETER;
 	}
 
@@ -1697,10 +1854,18 @@ 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) {
+			//LCOV_EXCL_START
+			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 {
@@ -1712,11 +1877,11 @@ int tts_set_private_data(tts_h tts, const char* key, const char* data)
 					return ret;
 				}
 			}
+			//LCOV_EXCL_STOP
 		}
 	}
 
-	SLOG(LOG_DEBUG, TAG_TTSC, "=====");
-	SLOG(LOG_DEBUG, TAG_TTSC, "");
+	SLOG(LOG_DEBUG, TAG_TTSC, "@@@");
 
 	return 0;
 }
@@ -1727,7 +1892,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");
@@ -1753,10 +1918,18 @@ 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) {
+			//LCOV_EXCL_START
+			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 {
@@ -1768,6 +1941,7 @@ int tts_get_private_data(tts_h tts, const char* key, char** data)
 					return ret;
 				}
 			}
+			//LCOV_EXCL_STOP
 		}
 	}
 
@@ -1776,12 +1950,12 @@ 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;
 }
 
+//LCOV_EXCL_START
 static Eina_Bool __tts_notify_error(void *data)
 {
 	tts_h tts = (tts_h)data;
@@ -1932,7 +2106,11 @@ int __tts_cb_set_state(int uid, int state)
 	}
 
 	if (NULL != client->state_changed_cb) {
-		ecore_timer_add(0, __tts_notify_state_changed, client->tts);
+		if (NULL != g_check_state_timer) {
+			ecore_timer_del(g_check_state_timer);
+			g_check_state_timer = NULL;
+		}
+		g_check_state_timer = ecore_timer_add(0, __tts_notify_state_changed, client->tts);
 	} else {
 		SLOG(LOG_WARN, TAG_TTSC, "[WARNING] State changed callback is null");
 	}
@@ -1942,6 +2120,7 @@ int __tts_cb_set_state(int uid, int state)
 
 	return 0;
 }
+//LCOV_EXCL_STOP
 
 int __tts_cb_utt_started(int uid, int utt_id)
 {
@@ -2052,6 +2231,11 @@ int tts_unset_state_changed_cb(tts_h tts)
 	client->state_changed_cb = NULL;
 	client->state_changed_user_data = NULL;
 
+	if (NULL != g_check_state_timer) {
+		ecore_timer_del(g_check_state_timer);
+		g_check_state_timer = NULL;
+	}
+
 	SLOG(LOG_DEBUG, TAG_TTSC, "[SUCCESS] Unset state changed cb");
 
 	return 0;
@@ -2366,3 +2550,309 @@ int tts_unset_engine_changed_cb(tts_h tts)
 	return 0;
 }
 
+//LCOV_EXCL_START
+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;
+}
+//LCOV_EXCL_STOP
+
+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;
+}