Fix policy for adding and playing pcm data

Change-Id: I9eb24ccbf34f37b822c9106edab84f444a43e362
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
(cherry picked from commit 175ab1875eed0a88385fc9344bd453a147dca59a)

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index 0aacbbafb50af53fca0c4e2ebaefaa174a9e7bf3..f9d845075e9f483d7402fa41e42c5322914e328b 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -1107,10 +1107,10 @@ int ttsd_player_play_pcm(int uid)
 
        SLOG(LOG_INFO, tts_tag(), "[Player DEBUG] Active thread count : %d", ecore_thread_active_get());
 
-//     if (0 < ttsd_data_get_sound_data_size(current->uid)) {
+       if (0 <= ttsd_data_get_sound_data_size(current->uid)) {
                SLOG(LOG_INFO, tts_tag(), "[Player] Run thread");
                ecore_thread_run(__play_thread, __end_play_thread, NULL, NULL);
-//     }
+       }
 
        return 0;
 }

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index 143275b45d8a4bbb0e0c7a7e3a3429f700647687..2734b0bc10baeab8a2657b56a3eff50a461998a5 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -1155,7 +1155,7 @@ int ttsd_server_play_pcm(int uid)
                        SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to play pcm sound : uid(%d)", uid);
 
                        // Change ready state
-                       ttsd_server_stop(uid);
+                       ttsd_server_stop_pcm(uid);
 
                        int tmp_pid;
                        tmp_pid = ttsd_data_get_pid(uid);
@@ -1176,16 +1176,16 @@ int ttsd_server_stop_pcm(int uid)
 
        SLOG(LOG_INFO, tts_tag(), "[Server] server stop, state(%d)", state);
 
-       if (APP_STATE_PLAYING == state || APP_STATE_PAUSED == state) {
-               if (0 != ttsd_player_clear(uid))
-                       SLOG(LOG_WARN, tts_tag(), "[Server] Fail to ttsd_player_stop()");
-
+       if (APP_STATE_PLAYING == state || APP_STATE_PAUSED == state || APP_STATE_READY == state) {
                ttsd_data_set_client_state(uid, APP_STATE_READY);
        }
 
        /* Reset all data */
        ttsd_data_clear_data(uid);
 
+       ttsd_player_stop(uid);
+
+
        return TTSD_ERROR_NONE;
 }