Modify silence duration type from long to unsigned integer

Change-Id: I6dc7b39b4a1c124fdd63029e275383996d427a84
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>

diff --git a/client/tts.c b/client/tts.c
index ea0f7d5..1e484f9 100644 (file)
--- a/client/tts.c
+++ b/client/tts.c
@@ -1557,7 +1557,7 @@ int tts_synthesis_parameter_set_background_volume_ratio(tts_synthesis_parameter_
        return TTS_ERROR_NONE;
 }
 
-int tts_add_silent_utterance(tts_h tts, long duration_in_msec, int* utt_id)
+int tts_add_silent_utterance(tts_h tts, unsigned int duration_in_msec, int* utt_id)
 {
        RETV_IF(TTS_ERROR_NONE != __tts_get_feature_enabled(), TTS_ERROR_NOT_SUPPORTED);
 

diff --git a/client/tts_core.c b/client/tts_core.c
index 3725b08..0f5eeec 100644 (file)
--- a/client/tts_core.c
+++ b/client/tts_core.c
@@ -664,7 +664,7 @@ static inline int __request_add_text(tts_client_s* client, const char* text, con
        return TTS_ERROR_NONE;
 }
 
-static inline int __request_add_silent_utterance(tts_client_s* client, long duration_in_msec, int* utt_id)
+static inline int __request_add_silent_utterance(tts_client_s* client, unsigned int duration_in_msec, int* utt_id)
 {
        int new_utt_id = tts_client_new_utterance_id(client);
        if (0 > new_utt_id) {
@@ -1631,13 +1631,13 @@ int tts_core_get_service_state(tts_client_s* client, tts_service_state_e* servic
        return TTS_ERROR_NONE;
 }
 
-int tts_core_add_silent_utterance(tts_client_s* client, long duration_in_msec, int* utt_id)
+int tts_core_add_silent_utterance(tts_client_s* client, unsigned int duration_in_msec, int* utt_id)
 {
        RETVM_IF(NULL == utt_id, TTS_ERROR_INVALID_PARAMETER, "[ERROR] Parameter is invalid.");
        RETVM_IF(false == tts_client_is_valid_client(client), TTS_ERROR_INVALID_PARAMETER, "[ERROR] Client is invalid.");
        reprepare_on_demand(client);
 
-       SLOG(LOG_ERROR, TAG_TTSC, "[DEBUG] duration_in_msec(%ld)", duration_in_msec);
+       SLOG(LOG_ERROR, TAG_TTSC, "[DEBUG] duration_in_msec(%u)", duration_in_msec);
 
        return __request_add_silent_utterance(client, duration_in_msec, utt_id);
 }
\ No newline at end of file

diff --git a/client/tts_core.h b/client/tts_core.h
index 716a28d..bdd5393 100644 (file)
--- a/client/tts_core.h
+++ b/client/tts_core.h
@@ -51,7 +51,7 @@ int tts_core_foreach_supported_voices(tts_client_s* client, const char* engine_i
 
 // called by tts_ipc
 int tts_core_add_text(tts_client_s* client, const char* text, const char* language, int voice_type, int speed, int* utt_id);
-int tts_core_add_silent_utterance(tts_client_s* client, long duration_in_msec, int* utt_id);
+int tts_core_add_silent_utterance(tts_client_s* client, unsigned int duration_in_msec, int* utt_id);
 int tts_core_play(tts_client_s* client);
 int tts_core_stop(tts_client_s* client);
 int tts_core_pause(tts_client_s* client);

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index 8524a79..539a206 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -765,14 +765,14 @@ int tts_dbus_request_add_text(unsigned int uid, const char* text, const char* la
        return result;
 }
 
-int tts_dbus_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential)
+int tts_dbus_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential)
 {
        DBusMessage* msg = __tts_dbus_make_message(uid, TTS_METHOD_ADD_SILENT_UTTERANCE);
        if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_TTSC, ">>>> Request tts add silent utterance : Fail to make message");
                return TTS_ERROR_OPERATION_FAILED;
        } else {
-               SLOG(LOG_ERROR, TAG_TTSC, ">>>> Request tts add silent utterance : uid(%u), duration_in_msec(%ld), id(%d), credential(%s)",
+               SLOG(LOG_ERROR, TAG_TTSC, ">>>> Request tts add silent utterance : uid(%u), duration_in_msec(%u), id(%d), credential(%s)",
                         uid, duration_in_msec, uttid, (NULL == credential) ? "NULL" : credential);
        }
 
@@ -785,7 +785,7 @@ int tts_dbus_request_add_silent_utterance(unsigned int uid, long duration_in_mse
 
        if (true != dbus_message_append_args(msg,
                DBUS_TYPE_UINT32, &uid,
-               DBUS_TYPE_INT32, &duration_in_msec,
+               DBUS_TYPE_UINT32, &duration_in_msec,
                DBUS_TYPE_INT32, &uttid,
                DBUS_TYPE_STRING, &temp,
                DBUS_TYPE_INVALID)) {

diff --git a/client/tts_dbus.h b/client/tts_dbus.h
index b25d5d8..54395e9 100644 (file)
--- a/client/tts_dbus.h
+++ b/client/tts_dbus.h
@@ -38,7 +38,7 @@ int tts_dbus_request_finalize(unsigned int uid);
 
 int tts_dbus_request_add_text(unsigned int uid, const char* text, const char* lang, int vctype, int speed, int uttid, const char* credential);
 
-int tts_dbus_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential);
+int tts_dbus_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential);
 
 int tts_dbus_request_play(unsigned int uid, const char* credential);
 

diff --git a/client/tts_ipc.c b/client/tts_ipc.c
index 47ffada..cd83156 100644 (file)
--- a/client/tts_ipc.c
+++ b/client/tts_ipc.c
@@ -160,7 +160,7 @@ int tts_ipc_request_add_text(unsigned int uid, const char* text, const char* lan
        return g_vtable[REQUEST_ADD_TEXT](uid, text, lang, vctype, speed, uttid, credential);
 }
 
-int tts_ipc_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential)
+int tts_ipc_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential)
 {
        SLOG(LOG_INFO, TAG_TTSC, "[IPC] tts_ipc_request_add_silent_utterance");
 

diff --git a/client/tts_ipc.h b/client/tts_ipc.h
index 73c1b47..4612fcb 100644 (file)
--- a/client/tts_ipc.h
+++ b/client/tts_ipc.h
@@ -40,7 +40,7 @@ int tts_ipc_request_finalize(unsigned int uid);
 
 int tts_ipc_request_add_text(unsigned int uid, const char* text, const char* lang, int vctype, int speed, int uttid, const char* credential);
 
-int tts_ipc_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential);
+int tts_ipc_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential);
 
 int tts_ipc_request_play(unsigned int uid, const char* credential);
 

diff --git a/client/tts_tidl.c b/client/tts_tidl.c
index bedd2e5..f0a6762 100644 (file)
--- a/client/tts_tidl.c
+++ b/client/tts_tidl.c
@@ -659,7 +659,7 @@ int tts_tidl_request_add_text(unsigned int uid, const char* text, const char* la
        return TTS_ERROR_NONE;
 }
 
-int tts_tidl_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential)
+int tts_tidl_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential)
 {
        SLOG(LOG_DEBUG, TAG_TTSC, "[TIDL] tts_tidl_request_add_silent_utterance");
 

diff --git a/client/tts_tidl.h b/client/tts_tidl.h
index 56335c8..14bd8b6 100644 (file)
--- a/client/tts_tidl.h
+++ b/client/tts_tidl.h
@@ -37,7 +37,7 @@ int tts_tidl_request_finalize(unsigned int uid);
 
 int tts_tidl_request_add_text(unsigned int uid, const char* text, const char* lang, int vctype, int speed, int uttid, const char* credential);
 
-int tts_tidl_request_add_silent_utterance(unsigned int uid, long duration_in_msec, int uttid, const char* credential);
+int tts_tidl_request_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int uttid, const char* credential);
 
 int tts_tidl_request_play(unsigned int uid, const char* credential);
 

diff --git a/include/tts.h b/include/tts.h
index 604cc8f..a66e90c 100644 (file)
--- a/include/tts.h
+++ b/include/tts.h
@@ -1138,7 +1138,7 @@ int tts_unset_synthesized_pcm_cb(tts_h tts);
  * @retval #TTS_ERROR_OPERATION_FAILED Operation failure
  * @pre The state should be #TTS_STATE_READY, #TTS_STATE_PLAYING, or #TTS_STATE_PAUSED.
 */
-int tts_add_silent_utterance(tts_h tts, long duration_in_ms, int* utt_id);
+int tts_add_silent_utterance(tts_h tts, unsigned int duration_in_ms, int* utt_id);
 
 #ifdef __cplusplus
 }

diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp
index 78c2d9b..aa9985f 100644 (file)
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -483,7 +483,7 @@ int ttsd_data_reset_used_voice(unsigned int uid, ttsd_used_voice_cb callback)
        return TTSD_ERROR_NONE;
 }
 
-speak_data_s* ttsd_data_create_speak_data(const char* text, const char* language, int voice_type, int speed, int utt_id, bool is_silent, long duration_in_msec)
+speak_data_s* ttsd_data_create_speak_data(const char* text, const char* language, int voice_type, int speed, int utt_id, bool is_silent, unsigned int duration_in_msec)
 {
        speak_data_s* speak_data = new speak_data_s();
        if (nullptr == speak_data) {

diff --git a/server/ttsd_data.h b/server/ttsd_data.h
index 543bb71..38209e3 100644 (file)
--- a/server/ttsd_data.h
+++ b/server/ttsd_data.h
@@ -56,7 +56,7 @@ typedef struct {
        voice_s voice;
        synthesis_parameter_s synth_parameter;
        bool is_silent;
-       long duration_in_msec;
+       unsigned int duration_in_msec;
 } speak_data_s;
 
 typedef struct {
@@ -99,7 +99,7 @@ int ttsd_data_set_credential(unsigned int uid, const char* credential);
 char* ttsd_data_get_credential(unsigned int uid);
 
 /* speak data */
-speak_data_s* ttsd_data_create_speak_data(const char* text, const char* language, int voice_type, int speed, int utt_id, bool is_silent, long duration_in_msec);
+speak_data_s* ttsd_data_create_speak_data(const char* text, const char* language, int voice_type, int speed, int utt_id, bool is_silent, unsigned int duration_in_msec);
 
 void ttsd_data_destroy_speak_data(speak_data_s* speak_data);
 

diff --git a/server/ttsd_dbus_server.c b/server/ttsd_dbus_server.c
index 6c3d39c..562d8b3 100644 (file)
--- a/server/ttsd_dbus_server.c
+++ b/server/ttsd_dbus_server.c
@@ -413,13 +413,14 @@ int ttsd_dbus_server_add_silent_utterance(DBusConnection* conn, DBusMessage* msg
        DBusError err;
        dbus_error_init(&err);
 
-       unsigned int uid, duration_in_msec, uttid;
+       unsigned int uid, duration_in_msec;
+       int uttid;
        char *credential;
        int ret = 0;
 
        dbus_message_get_args(msg, &err,
                DBUS_TYPE_UINT32, &uid,
-               DBUS_TYPE_INT32, &duration_in_msec,
+               DBUS_TYPE_UINT32, &duration_in_msec,
                DBUS_TYPE_INT32, &uttid,
                DBUS_TYPE_STRING, &credential,
                DBUS_TYPE_INVALID);
@@ -431,7 +432,7 @@ int ttsd_dbus_server_add_silent_utterance(DBusConnection* conn, DBusMessage* msg
                dbus_error_free(&err);
                ret = TTSD_ERROR_OPERATION_FAILED;
        } else {
-               SECURE_SLOG(LOG_DEBUG, tts_tag(), "[IN] tts add silent utterance : uid(%u), duration_in_msec(%d), uttid(%d), credential(%s)",
+               SECURE_SLOG(LOG_DEBUG, tts_tag(), "[IN] tts add silent utterance : uid(%u), duration_in_msec(%u), uttid(%d), credential(%s)",
                        uid, duration_in_msec, uttid, (NULL == credential) ? "NULL" : credential);
                ret = ttsd_server_add_silent_utterance(uid, duration_in_msec, uttid, credential);
        }

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index a5b7ec6..f158175 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -1156,7 +1156,7 @@ int ttsd_server_add_text(unsigned int uid, const char* text, const char* lang, i
        return TTSD_ERROR_NONE;
 }
 
-int ttsd_server_add_silent_utterance(unsigned int uid, long duration_in_msec, int utt_id, const char* credential)
+int ttsd_server_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int utt_id, const char* credential)
 {
        app_tts_state_e state = ttsd_data_get_client_state(uid);
        if (APP_STATE_NONE == state) {

diff --git a/server/ttsd_server.h b/server/ttsd_server.h
index 653e9cf..fa24958 100644 (file)
--- a/server/ttsd_server.h
+++ b/server/ttsd_server.h
@@ -61,7 +61,7 @@ int ttsd_server_get_current_voice(unsigned int uid, char** language, int* voice_
 
 int ttsd_server_add_text(unsigned int uid, const char* text, const char* lang, int voice_type, int speed, int utt_id, const char* credential);
 
-int ttsd_server_add_silent_utterance(unsigned int uid, long duration_in_msec, int utt_id, const char* credential);
+int ttsd_server_add_silent_utterance(unsigned int uid, unsigned int duration_in_msec, int utt_id, const char* credential);
 
 int ttsd_server_play(unsigned int uid, const char* credential);
 

diff --git a/server/ttsd_tidl.c b/server/ttsd_tidl.c
index 20ad2ac..9a84a9a 100644 (file)
--- a/server/ttsd_tidl.c
+++ b/server/ttsd_tidl.c
@@ -334,12 +334,14 @@ static int __add_text_cb(rpc_port_stub_tts_context_h context, int uid, const cha
        return TTSD_ERROR_NONE;
 }
 
-static int __add_silent_utterance_cb(rpc_port_stub_tts_context_h context, int uid, long long duration_in_msec, int uttid, const char *credential, void *user_data)
+static int __add_silent_utterance_cb(rpc_port_stub_tts_context_h context, int uid, int duration_in_msec, int uttid, const char *credential, void *user_data)
 {
        unsigned int u_uid = (unsigned int)uid;
        SLOG(LOG_DEBUG, tts_tag(), ">>>>> TTS ADD SILENT UTTERANCE (%u)", u_uid);
 
-       int ret = ttsd_server_add_silent_utterance(u_uid, duration_in_msec, uttid, credential);
+       unsigned int u_duration_in_msec = (unsigned int)duration_in_msec;
+
+       int ret = ttsd_server_add_silent_utterance(u_uid, u_duration_in_msec, uttid, credential);
        if (TTSD_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, tts_tag(), "[ERROR] TTS ADD SILENT UTTERANCE (%u) fail (%d/%s) <<<<<", u_uid, ret, get_error_message(ret));
                return ret;

diff --git a/tidl/tts.tidl b/tidl/tts.tidl
index 0deb5b5..c403ca3 100644 (file)
--- a/tidl/tts.tidl
+++ b/tidl/tts.tidl
@@ -6,7 +6,7 @@ interface tts {
        int initialize(in int pid, in int uid, in int mode, in int playing_mode, in int registered_event_mask, out int service_state, out bool credential_needed);
        int finalize(in int uid);
        int add_text(int uid, string text, string lang, int vctype, int speed, int uttid, string credential);
-       int add_silent_utterance(int uid, long duration_in_msec, int uttid, string credential);
+       int add_silent_utterance(int uid, int duration_in_msec, int uttid, string credential);
        int stop(in int uid);
        int pause(in int uid);
        int play_pcm(in int uid);