change codes to function such as ttsd_player_clear

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

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index f1594c1..c96ed44 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -134,28 +134,26 @@ void __player_focus_state_cb(sound_stream_info_h stream_info, sound_stream_focus
        }
        SLOG(LOG_WARN, tts_tag(), "[Player] focus state changed to (%d) with reason(%d) and extra info(%s)", (int)focus_state, (int)reason_for_change, extra_info);
 
-       if (AUDIO_STATE_PLAY == g_audio_state && focus_mask == SOUND_STREAM_FOCUS_FOR_PLAYBACK && SOUND_STREAM_FOCUS_STATE_RELEASED == focus_state) {
+       if (NULL == g_playing_info) {
+               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] No current player");
+               return;
+       }
+
+       if (APP_STATE_PLAYING == g_playing_info->state && focus_mask == SOUND_STREAM_FOCUS_FOR_PLAYBACK && SOUND_STREAM_FOCUS_STATE_RELEASED == focus_state) {
                if (TTSD_MODE_DEFAULT == ttsd_get_mode()) {
                        g_audio_state = AUDIO_STATE_READY;
 
-                       if (NULL == g_playing_info) {
-                               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] No current player");
+                       int uid = g_playing_info->uid;
+
+                       if (0 != ttsd_player_pause(uid)) {
+                               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to pause the player");
                                return;
                        }
 
-                       if (APP_STATE_PLAYING == g_playing_info->state) {
-                               int uid = g_playing_info->uid;
-
-                               if (0 != ttsd_player_pause(uid)) {
-                                       SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to pause the player");
-                                       return;
-                               }
-
-                               ttsd_data_set_client_state(uid, APP_STATE_PAUSED);
-                               int pid = ttsd_data_get_pid(uid);
-                               /* send message to client about changing state */
-                               ttsdc_send_set_state_message(pid, uid, APP_STATE_PAUSED);
-                       }
+                       ttsd_data_set_client_state(uid, APP_STATE_PAUSED);
+                       int pid = ttsd_data_get_pid(uid);
+                       /* send message to client about changing state */
+                       ttsdc_send_set_state_message(pid, uid, APP_STATE_PAUSED);
                } else {
                        SLOG(LOG_DEBUG, tts_tag(), "[Player] Ignore focus state cb - mode(%d)", ttsd_get_mode());
                }
@@ -207,37 +205,33 @@ void __player_focus_state_watch_cb(int id, sound_stream_focus_mask_e focus_mask,
                return;
        }
 
-       if (AUDIO_STATE_PLAY == g_audio_state && SOUND_STREAM_FOCUS_CHANGED_BY_VOICE_INFORMATION == reason && 
+       if (NULL == g_playing_info) {
+               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] No current player");
+               return;
+       }
+
+       if (APP_STATE_PLAYING == g_playing_info->state && SOUND_STREAM_FOCUS_CHANGED_BY_VOICE_INFORMATION == reason && 
                        NULL != extra_info && 0 == strncmp(extra_info, "TTSD_MODE_INTERRUPT", strlen(extra_info))) {
                /* If the focus is changed by "Interrupt" mode and current players of "SR" and "Noti" modes are on going, please stop the current players. */
                g_audio_state = AUDIO_STATE_READY;
 
-               if (NULL == g_playing_info) {
-                       SLOG(LOG_WARN, tts_tag(), "[Player WARNING] No current player");
+               int uid = g_playing_info->uid;
+
+               if (0 != ttsd_server_stop(uid)) {
+                       SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to stop TTS server");
                        return;
                }
-
-               if (APP_STATE_PLAYING == g_playing_info->state) {
-                       int uid = g_playing_info->uid;
-
-                       if (0 != ttsd_server_stop(uid)) {
-                               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to stop TTS server");
-                               return;
-                       }
-                       if (0 != ttsd_player_stop(uid)) {
-                               SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to stop the player");
-                               return;
-                       }
-
-                       ttsd_data_set_client_state(uid, APP_STATE_READY);
-                       int pid = ttsd_data_get_pid(uid);
-                       /* send message to client about changing state */
-                       ttsdc_send_set_state_message(pid, uid, APP_STATE_READY);
-               } else {
-                       SLOG(LOG_DEBUG, tts_tag(), "[Player] Not playing state");
+               if (0 != ttsd_player_stop(uid)) {
+                       SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to stop the player");
+                       return;
                }
+
+               ttsd_data_set_client_state(uid, APP_STATE_READY);
+               int pid = ttsd_data_get_pid(uid);
+               /* send message to client about changing state */
+               ttsdc_send_set_state_message(pid, uid, APP_STATE_READY);
        } else {
-               SLOG(LOG_DEBUG, tts_tag(), "[Player] This is not Interrupt mode or not playing state.");
+               SLOG(LOG_DEBUG, tts_tag(), "[Player] Extra info is not Interrupt mode(%s) or not playing state(%d).", extra_info, g_playing_info->state);
        }
 
        return;
@@ -283,10 +277,13 @@ static int __activate_ducking_sound_stream(sound_stream_type_e stream_type, soun
 
 static void __change_background_volume()
 {
-       __activate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking);
-       __activate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking);
-       __activate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking);
-       __activate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking);
+       SLOG(LOG_INFO, tts_tag(), "[Player] volume ratio(%lf)", g_bg_volume_ratio);
+       if (1.0 > g_bg_volume_ratio) {
+               __activate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking);
+               __activate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking);
+               __activate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking);
+               __activate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking);
+       }
 }
 
 static int __deactivate_ducking_sound_stream(sound_stream_type_e stream_type, sound_stream_ducking_h stream_ducking_h)
@@ -631,7 +628,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();
-
+                                       ttsd_data_clear_sound_data(&sound_data);
                                        return;
                                }
 
@@ -656,6 +653,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();
+                                               ttsd_data_clear_sound_data(&sound_data);
                                                return;
                                        }
 
@@ -669,7 +667,7 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                        }
                                }
                                SLOG(LOG_INFO, tts_tag(), "[Player] Event(%d) utterance : uid(%d), uttid(%d)", sound_data->event, player->uid, sound_data->utt_id);
-                               ttsd_data_clear_sound_data(player->uid, &sound_data);
+                               ttsd_data_clear_sound_data(&sound_data);
                                continue;
                        }
                }
@@ -685,7 +683,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(player->uid, &sound_data);
+                               ttsd_data_clear_sound_data(&sound_data);
 
                                return;
                        }
@@ -713,7 +711,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(player->uid, &sound_data);
+                                       ttsd_data_clear_sound_data(&sound_data);
 
                                        return;
                                }
@@ -746,7 +744,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(player->uid, &sound_data);
+                               ttsd_data_clear_sound_data(&sound_data);
 
                                return;
                        }
@@ -789,9 +787,9 @@ static void __play_thread(void *data, Ecore_Thread *thread)
                                SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Unprepare audio");
                        }
 
-                       ttsd_data_clear_sound_data(player->uid, &sound_data);
                        /* unset volume policy, volume will be 100% */
                        __unset_policy_for_playing();
+                       ttsd_data_clear_sound_data(&sound_data);
                        return;
                }
 
@@ -804,7 +802,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();
-
+                               ttsd_data_clear_sound_data(&sound_data);
                                return;
                        }
 
@@ -813,15 +811,14 @@ 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();
-
-                               ttsd_data_clear_sound_data(player->uid, &sound_data);
+                               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);
                }
 
-               ttsd_data_clear_sound_data(player->uid, &sound_data);
+               ttsd_data_clear_sound_data(&sound_data);
 
                if (NULL == g_playing_info) {
                        SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Current player is NULL");
@@ -832,7 +829,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);
                        return;
                }
        }
@@ -1175,17 +1172,10 @@ int ttsd_player_play(int uid)
 
 int ttsd_player_stop(int uid)
 {
-       if (false == g_player_init) {
-               SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Not Initialized");
-               return -1;
-       }
-
-       /* Check uid */
-       player_s* current;
-       current = __player_get_item(uid);
-       if (NULL == current) {
-               SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] uid(%d) is not valid", uid);
-               return -1;
+       int ret = ttsd_player_clear(uid);
+       if (0 != ret) {
+               SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Fail to stop player, ret(%d)", ret);
+               return ret;
        }
 
        /* check whether uid is current playing or not */
@@ -1198,23 +1188,6 @@ int ttsd_player_stop(int uid)
                SLOG(LOG_DEBUG, tts_tag(), "[Player] No current playing");
        }
 
-       if (true == current->is_paused_data) {
-               if (NULL != current->paused_data) {
-                       if (NULL != current->paused_data->data) {
-                               free(current->paused_data->data);
-                               current->paused_data->data = NULL;
-                       }
-
-                       free(current->paused_data);
-                       current->paused_data = NULL;
-               }
-       }
-
-       current->event = TTSE_RESULT_EVENT_FINISH;
-       current->state = APP_STATE_READY;
-       current->is_paused_data = false;
-       current->idx = 0;
-
        if (NULL == g_playing_info) {
                SLOG(LOG_DEBUG, tts_tag(), "[Player] @@@@@");
                SLOG(LOG_ERROR, tts_tag(), "[Player] Active thread count : %d", ecore_thread_active_get());