Merge "Fix to deallocate memory of sound and speak data" 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..a2d2e26 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -478,12 +478,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(&sound_data);
                                        return;
                                }
 
@@ -508,12 +503,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;
+                                               ttsd_data_clear_sound_data(&sound_data);
                                                return;
                                        }
                                        if (0 != ttsdc_send_utt_finish_message(pid, player->uid, sound_data->utt_id)) {
@@ -522,12 +512,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(&sound_data);
                                continue;
                        }
                }
@@ -543,12 +528,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(&sound_data);
 
                                return;
                        }
@@ -575,13 +555,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(&sound_data);
 
                                        return;
                                }
@@ -607,15 +581,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(&sound_data);
 
                                return;
                        }
@@ -656,15 +622,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(&sound_data);
                        /* unset volume policy, volume will be 100% */
                        __unset_policy_for_playing();
                        return;
@@ -679,13 +637,8 @@ 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;
+                               ttsd_data_clear_sound_data(&sound_data);
                                return;
                        }
 
@@ -694,28 +647,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(&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(&sound_data);
 
                if (NULL == g_playing_info) {
                        SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Current player is NULL");