X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fttsd_data.cpp;h=47e335b5d2e8dca44dd2d1f287f0f826a6de4231;hb=7877f3f91a0b81ba298fdd94f9b4b80cf37b0666;hp=9181131cbeac7eb8d5dedfebc0b25406b4d0c1dc;hpb=fa742743e3d9d49feddeefdf542b2c38e22233e0;p=platform%2Fcore%2Fuifw%2Ftts.git

diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp
index 9181131..47e335b 100644
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -454,8 +454,6 @@ int __get_sound_data(int index, sound_data_s** data)
 #ifdef DATA_DEBUG
 		SLOG(LOG_DEBUG, tts_tag(), "[DATA] There is no wav data");
 #endif
-		/* mutex is unlocked */
-		pthread_mutex_unlock(&g_sound_data_mutex);
 		return -1;
 	}
 
@@ -526,23 +524,21 @@ int ttsd_data_clear_speak_data(int uid, speak_data_s** speak_data)
 	int index = 0;
 	index = ttsd_data_is_client(uid);
 	if (index >= 0) {
-		if (!g_app_list[index].m_speak_data.empty()) {
-			if (NULL != *speak_data) {
-				SLOG(LOG_DEBUG, tts_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)", 
-						(*speak_data)->utt_id, (*speak_data)->text, (*speak_data)->lang, (*speak_data)->vctype, (*speak_data)->speed);
-
-				if (NULL != (*speak_data)->text) {
-					free((*speak_data)->text);
-					(*speak_data)->text = NULL;
-				}
-				if (NULL != (*speak_data)->lang) {
-					free((*speak_data)->lang);
-					(*speak_data)->lang = NULL;
-				}
-
-				free(*speak_data);
-				*speak_data = NULL;
+		if (NULL != *speak_data) {
+			SLOG(LOG_DEBUG, tts_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)", 
+					(*speak_data)->utt_id, (*speak_data)->text, (*speak_data)->lang, (*speak_data)->vctype, (*speak_data)->speed);
+
+			if (NULL != (*speak_data)->text) {
+				free((*speak_data)->text);
+				(*speak_data)->text = NULL;
 			}
+			if (NULL != (*speak_data)->lang) {
+				free((*speak_data)->lang);
+				(*speak_data)->lang = NULL;
+			}
+
+			free(*speak_data);
+			*speak_data = NULL;
 		}
 	}
 
@@ -558,19 +554,17 @@ int ttsd_data_clear_sound_data(int uid, sound_data_s** sound_data)
 	int index = 0;
 	index = ttsd_data_is_client(uid);
 	if (index >= 0) {
-		if (!g_app_list[index].m_wav_data.empty()) {
-			if (NULL != *sound_data) {
-				SLOG(LOG_ERROR, tts_tag(), "[DEBUG][%p] event(%d) data(%p) size(%d) rate(%d) utt(%d)", 
-						(*sound_data), (*sound_data)->event, (*sound_data)->data, (*sound_data)->data_size, (*sound_data)->rate, (*sound_data)->utt_id);
-
-				if (NULL != (*sound_data)->data) {
-					free((*sound_data)->data);
-					(*sound_data)->data = NULL;
-				}
-
-				free(*sound_data);
-				*sound_data = NULL;
+		if (NULL != *sound_data) {
+			SLOG(LOG_ERROR, tts_tag(), "[DEBUG][%p] event(%d) data(%p) size(%d) rate(%d) utt(%d)", 
+					(*sound_data), (*sound_data)->event, (*sound_data)->data, (*sound_data)->data_size, (*sound_data)->rate, (*sound_data)->utt_id);
+
+			if (NULL != (*sound_data)->data) {
+				free((*sound_data)->data);
+				(*sound_data)->data = NULL;
 			}
+
+			free(*sound_data);
+			*sound_data = NULL;
 		}
 	}
 	pthread_mutex_unlock(&g_sound_data_mutex);