Merge "Fix unset audio policy" into tizen

[platform/core/uifw/tts.git] / server / ttsd_player.c

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index 1b862e7..a8a2bf4 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -428,17 +428,6 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                        if (0 != ret || NULL == sound_data) {
                                /* empty queue */
                                SLOG(LOG_DEBUG, tts_tag(), "[Player] No sound data. Waiting mode");
-                               /* release audio & recover session */
-                               ret = audio_out_unprepare(g_audio_h);
-                               if (AUDIO_IO_ERROR_NONE != ret) {
-                                       SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Fail to unprepare audio : %d", ret);
-                               } else {
-                                       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();
 
                                /* wait for new audio data come */
                                while (1) {
@@ -446,18 +435,49 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                        if (NULL == g_playing_info) {
                                                /* current playing uid is replaced */
                                                SLOG(LOG_INFO, tts_tag(), "[Player] Finish thread");
+                                               if (AUDIO_STATE_PLAY == g_audio_state) {
+                                                       /* release audio & recover session */
+                                                       ret = audio_out_unprepare(g_audio_h);
+                                                       if (AUDIO_IO_ERROR_NONE != ret) {
+                                                               SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Fail to unprepare audio : %d", ret);
+                                                       } else {
+                                                               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();
                                                return;
                                        } else if (0 < ttsd_data_get_sound_data_size(player->uid)) {
                                                /* new audio data come */
                                                SLOG(LOG_INFO, tts_tag(), "[Player] Resume thread");
                                                break;
                                        }
+
+                                       /* If engine is not on processing */
+                                       if (TTSD_SYNTHESIS_CONTROL_DOING != ttsd_get_synth_control()) {
+                                               if (AUDIO_STATE_PLAY == g_audio_state) {
+                                                       /* release audio & recover session */
+                                                       ret = audio_out_unprepare(g_audio_h);
+                                                       if (AUDIO_IO_ERROR_NONE != ret) {
+                                                               SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Fail to unprepare audio : %d", ret);
+                                                       } else {
+                                                               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();
+                                               }
+                                       }
                                }
 
                                SLOG(LOG_INFO, tts_tag(), "[Player] Finish to wait for new audio data come");
 
-                               /* set volume policy as 40%, when resume play thread*/
-                               __set_policy_for_playing(40);
+                               if (AUDIO_STATE_READY == g_audio_state) {
+                                       /* set volume policy as 40%, when resume play thread*/
+                                       __set_policy_for_playing(40);
+                               }
 
                                /* resume play thread */
                                player->state = APP_STATE_PLAYING;
@@ -478,12 +498,6 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                        /* unset volume policy, volume will be 100% */
                                        __unset_policy_for_playing();
 
-                                       if (NULL != sound_data->data) {
-                                               free(sound_data->data);
-                                               sound_data->data = NULL;
-                                       }
-                                       free(sound_data);
-                                       sound_data = NULL;
                                        return;
                                }
 
@@ -508,12 +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();
-                                               if (NULL != sound_data->data) {
-                                                       free(sound_data->data);
-                                                       sound_data->data = NULL;
-                                               }
-                                               free(sound_data);
-                                               sound_data = NULL;
                                                return;
                                        }
                                        if (0 != ttsdc_send_utt_finish_message(pid, player->uid, sound_data->utt_id)) {
@@ -522,12 +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);
-                               if (NULL != sound_data->data) {
-                                       free(sound_data->data);
-                                       sound_data->data = NULL;
-                               }
-                               free(sound_data);
-                               sound_data = NULL;
+                               ttsd_data_clear_sound_data(player->uid, &sound_data);
                                continue;
                        }
                }
@@ -543,12 +546,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                /* unset volume policy, volume will be 100% */
                                __unset_policy_for_playing();
 
-                               if (NULL != sound_data->data) {
-                                       free(sound_data->data);
-                                       sound_data->data = NULL;
-                               }
-                               free(sound_data);
-                               sound_data = NULL;
+                               ttsd_data_clear_sound_data(player->uid, &sound_data);
 
                                return;
                        }
@@ -575,13 +573,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                        /* unset volume policy, volume will be 100% */
                                        __unset_policy_for_playing();
 
-                                       if (NULL != sound_data->data) {
-                                               free(sound_data->data);
-                                               sound_data->data = NULL;
-                                       }
-
-                                       free(sound_data);
-                                       sound_data = NULL;
+                                       ttsd_data_clear_sound_data(player->uid, &sound_data);
 
                                        return;
                                }
@@ -607,15 +599,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                /* unset volume policy, volume will be 100% */
                                __unset_policy_for_playing();
 
-                               if (NULL != sound_data) {
-                                       if (NULL != sound_data->data) {
-                                               free(sound_data->data);
-                                               sound_data->data = NULL;
-                                       }
-
-                                       free(sound_data);
-                                       sound_data = NULL;
-                               }
+                               ttsd_data_clear_sound_data(player->uid, &sound_data);
 
                                return;
                        }
@@ -656,15 +640,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Unprepare audio");
                        }
 
-                       if (NULL != sound_data) {
-                               if (NULL != sound_data->data) {
-                                       free(sound_data->data);
-                                       sound_data->data = NULL;
-                               }
-
-                               free(sound_data);
-                               sound_data = NULL;
-                       }
+                       ttsd_data_clear_sound_data(player->uid, &sound_data);
                        /* unset volume policy, volume will be 100% */
                        __unset_policy_for_playing();
                        return;
@@ -679,13 +655,7 @@ 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();
-                               if (NULL != sound_data->data) {
-                                       free(sound_data->data);
-                                       sound_data->data = NULL;
-                               }
 
-                               free(sound_data);
-                               sound_data = NULL;
                                return;
                        }
 
@@ -694,28 +664,15 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                        pid, player->uid, sound_data->utt_id);
                                /* unset volume policy, volume will be 100% */
                                __unset_policy_for_playing();
-                               if (NULL != sound_data->data) {
-                                       free(sound_data->data);
-                                       sound_data->data = NULL;
-                               }
 
-                               free(sound_data);
-                               sound_data = NULL;
+                               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);
                }
 
-               if (NULL != sound_data) {
-                       if (NULL != sound_data->data) {
-                               free(sound_data->data);
-                               sound_data->data = NULL;
-                       }
-
-                       free(sound_data);
-                       sound_data = NULL;
-               }
+               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");