X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fttsd_player.c;h=2593de306f24c0602900b19b544f3046afb38177;hb=98e0b4c9d356e00ceb46c24edf20fc2aee1fc940;hp=0c7679d4b9035d62e53a372c03a6c010b88a4df8;hpb=dc99204c1227307b7708352df8e05176e0dcc7b1;p=platform%2Fcore%2Fuifw%2Ftts.git

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index 0c7679d..2593de3 100644
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -444,10 +444,9 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 								SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Unprepare audio");
 							}
 							g_audio_state = AUDIO_STATE_READY;
-
-							/* unset volume policy, volume will be 100% */
-							__unset_policy_for_playing();
 						}
+						/* unset volume policy, volume will be 100% */
+						__unset_policy_for_playing();
 						return;
 					} else if (0 < ttsd_data_get_sound_data_size(player->uid)) {
 						/* new audio data come */
@@ -499,7 +498,6 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 					/* unset volume policy, volume will be 100% */
 					__unset_policy_for_playing();
 
-					ttsd_data_clear_sound_data(&sound_data);
 					return;
 				}
 
@@ -524,7 +522,6 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 						SLOG(LOG_WARN, tts_tag(), "[Send WARNIING] Current player is not valid");
 						/* unset volume policy, volume will be 100% */
 						__unset_policy_for_playing();
-						ttsd_data_clear_sound_data(&sound_data);
 						return;
 					}
 					if (0 != ttsdc_send_utt_finish_message(pid, player->uid, sound_data->utt_id)) {
@@ -533,7 +530,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 					}
 				}
 				SLOG(LOG_INFO, tts_tag(), "[Player] Finish utterance : uid(%d), uttid(%d)", player->uid, sound_data->utt_id);
-				ttsd_data_clear_sound_data(&sound_data);
+				ttsd_data_clear_sound_data(player->uid, &sound_data);
 				continue;
 			}
 		}
@@ -549,7 +546,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 				/* unset volume policy, volume will be 100% */
 				__unset_policy_for_playing();
 
-				ttsd_data_clear_sound_data(&sound_data);
+				ttsd_data_clear_sound_data(player->uid, &sound_data);
 
 				return;
 			}
@@ -576,7 +573,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 					/* unset volume policy, volume will be 100% */
 					__unset_policy_for_playing();
 
-					ttsd_data_clear_sound_data(&sound_data);
+					ttsd_data_clear_sound_data(player->uid, &sound_data);
 
 					return;
 				}
@@ -585,11 +582,15 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 			}
 
 			char* temp_data = sound_data->data;
+			SLOG(LOG_INFO, tts_tag(), "[Player INFO] Before audio_out_write. temp_data(%p), idx(%d), data_idx(%d), uid(%d), utt_id(%d), len(%d)", 
+					temp_data, idx, &temp_data[idx], player->uid, sound_data->utt_id, len);
 			ret = audio_out_write(g_audio_h, &temp_data[idx], len);
 			if (0 > ret) {
 				SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to audio write - %d", ret);
 			} else {
 				idx += len;
+				SLOG(LOG_INFO, tts_tag(), "[Player INFO] After audio_out_write. temp_data(%p), idx(%d), data_idx(%d), uid(%d), utt_id(%d), len(%d)", 
+						temp_data, idx, &temp_data[idx], player->uid, sound_data->utt_id, len);
 			}
 
 			if (NULL == g_playing_info && APP_STATE_PAUSED != player->state) {
@@ -602,7 +603,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 				/* unset volume policy, volume will be 100% */
 				__unset_policy_for_playing();
 
-				ttsd_data_clear_sound_data(&sound_data);
+				ttsd_data_clear_sound_data(player->uid, &sound_data);
 
 				return;
 			}
@@ -643,7 +644,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 				SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Unprepare audio");
 			}
 
-			ttsd_data_clear_sound_data(&sound_data);
+			ttsd_data_clear_sound_data(player->uid, &sound_data);
 			/* unset volume policy, volume will be 100% */
 			__unset_policy_for_playing();
 			return;
@@ -659,7 +660,6 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 				/* unset volume policy, volume will be 100% */
 				__unset_policy_for_playing();
 
-				ttsd_data_clear_sound_data(&sound_data);
 				return;
 			}
 
@@ -669,14 +669,14 @@ static void __play_thread(void *data, Ecore_Thread *thread)
 				/* unset volume policy, volume will be 100% */
 				__unset_policy_for_playing();
 
-				ttsd_data_clear_sound_data(&sound_data);
+				ttsd_data_clear_sound_data(player->uid, &sound_data);
 				return;
 			}
 
 			SLOG(LOG_INFO, tts_tag(), "[Player] Finish utterance : uid(%d), uttid(%d)", player->uid, sound_data->utt_id);
 		}
 
-		ttsd_data_clear_sound_data(&sound_data);
+		ttsd_data_clear_sound_data(player->uid, &sound_data);
 
 		if (NULL == g_playing_info) {
 			SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Current player is NULL");