Merge "Add codes in client side to set/unset callback for retrieving sythesized pcm...

diff --git a/client/tts_core.c b/client/tts_core.c
index 34d7679..74fc095 100644 (file)
--- a/client/tts_core.c
+++ b/client/tts_core.c
@@ -597,8 +597,14 @@ static inline bool __is_ipc_retry_needed(tts_client_s* client, tts_error_e ret)
                return true;
        }
 
-       if (TTS_ERROR_INVALID_PARAMETER == ret && false == tts_client_is_reprepared(client)) {
-               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] IPC is failed by unregistered client. ret(%d/%s)", ret, get_error_message(ret));
+       if (tts_client_is_reprepared(client)) {
+               SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Prepare was already tried.");
+               SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] IPC request is failed. ret(%d/%s)", ret, get_error_message(ret));
+               return false;
+       }
+
+       if (TTS_ERROR_INVALID_PARAMETER == ret || TTS_ERROR_IO_ERROR == ret) {
+               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] IPC is failed by unregistered client or network error. ret(%d/%s)", ret, get_error_message(ret));
                SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Try to prepare again");
                tts_client_set_current_state(client, TTS_STATE_CREATED);
                tts_core_prepare_sync(client);

diff --git a/client/tts_tidl.c b/client/tts_tidl.c
index 36bfa0e..dd10bc8 100644 (file)
--- a/client/tts_tidl.c
+++ b/client/tts_tidl.c
@@ -394,8 +394,15 @@ static int __request_tidl_connect_sync(tts_tidl_info_s* info)
 
 static int __convert_unhandled_error(int ret)
 {
-       if (RPC_PORT_ERROR_IO_ERROR == ret || RPC_PORT_ERROR_OUT_OF_MEMORY == ret) {
-               return TTS_ERROR_OPERATION_FAILED;
+       switch (ret) {
+       case RPC_PORT_ERROR_IO_ERROR:
+               return TTS_ERROR_IO_ERROR;
+
+       case RPC_PORT_ERROR_OUT_OF_MEMORY:
+               return TTS_ERROR_OUT_OF_MEMORY;
+
+       default:
+               break;
        }
 
        return ret;

diff --git a/packaging/tts.spec b/packaging/tts.spec
index 1b923dd..9bf44c2 100644 (file)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -1,6 +1,6 @@
 Name:       tts
 Summary:    Text To Speech client library and daemon
-Version:    1.70.14
+Version:    1.70.15
 Release:    1
 Group:      Graphics & UI Framework/Voice Framework
 License:    Apache-2.0