tts: ensure that tts_play will always be called along with tts_speak

Change-Id: If8d8ebe125e4247c21434aa5fccc897d3c934b32

diff --git a/src/screen_reader_spi.c b/src/screen_reader_spi.c
index 9627fa1..90449f7 100644 (file)
--- a/src/screen_reader_spi.c
+++ b/src/screen_reader_spi.c
@@ -272,19 +272,7 @@ void spi_event_listener_cb(AtspiEvent * event, void *user_data)
                return;
        }
        DEBUG("SPEAK: %s", text_to_read)
-               tts_speak(text_to_read, EINA_TRUE);
-
-       tts_state_e state;
-       Service_Data *sd = (Service_Data *) user_data;
-       tts_get_state(sd->tts, &state);
-
-       if (state == TTS_STATE_READY || state == TTS_STATE_PAUSED) {
-               int ret = tts_play(sd->tts);
-               if (TTS_ERROR_NONE != ret)
-                       ERROR("Fail to play TTS : ret(%d)", ret);
-       } else {
-               DEBUG("Current tts state: %d", state);
-       }
+       tts_speak(text_to_read, EINA_TRUE);
 
        free(text_to_read);
        DEBUG("END")

diff --git a/src/screen_reader_tts.c b/src/screen_reader_tts.c
index 76dac65..f5ca2e3 100644 (file)
--- a/src/screen_reader_tts.c
+++ b/src/screen_reader_tts.c
@@ -271,6 +271,7 @@ void tts_speak(char *text_to_speak, Eina_Bool flush_switch)
 
        DEBUG("added id to:%d\n", speak_id);
        last_utt_id = speak_id;
+       tts_play(sd->tts);
 }
 
 Eina_Bool update_supported_voices(void *data)
@@ -322,15 +323,8 @@ void state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e current, void
                txt = eina_strbuf_string_steal(txt_keep_buff);
                eina_strbuf_free(txt_keep_buff);
                txt_keep_buff = NULL;
-
                tts_speak(txt, EINA_FALSE);
-               tts_play(sd->tts);
                free(txt);
-       } else if (current == TTS_STATE_READY || current == TTS_STATE_PAUSED) {
-               DEBUG("TTS state == %s!", get_tts_state(current));
-               tts_play(sd->tts);
-       } else {
-               DEBUG("TTS state != ready or paused!\n");
        }
 }