Change name of function to increase readability

Change-Id: I604c31fb357678c61f0b1c18e144842ff6c13f8a
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index 40c87d2ea7576dea6a0b71c02cb72b80e3f054bd..18fd6be422914fa5b0c86dac3478718bf5e1d127 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -786,7 +786,7 @@ int tts_dbus_request_add_text(unsigned int uid, const char* text, const char* la
        DBusError err;
        dbus_error_init(&err);
 
-       msg = __tts_dbus_make_message(uid, TTS_METHOD_ADD_QUEUE);
+       msg = __tts_dbus_make_message(uid, TTS_METHOD_ADD_TEXT);
 
        if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_TTSC, ">>>> Request tts add text : Fail to make message");

diff --git a/common/tts_defs.h b/common/tts_defs.h
index 427ccd48b0b0b95a01efc65c9234ce071ba1cd20..91f09486aa50a4ae19eab33989f6c86eeee70c1d 100644 (file)
--- a/common/tts_defs.h
+++ b/common/tts_defs.h
@@ -68,7 +68,7 @@ extern "C" {
 #define TTS_METHOD_SET_MODE     "tts_method_set_mode"
 #define TTS_METHOD_GET_SUPPORT_VOICES  "tts_method_get_support_voices"
 #define TTS_METHOD_GET_CURRENT_VOICE   "tts_method_get_current_voice"
-#define TTS_METHOD_ADD_QUEUE           "tts_method_add_queue"
+#define TTS_METHOD_ADD_TEXT            "tts_method_add_text"
 #define TTS_METHOD_PLAY                        "tts_method_play"
 #define TTS_METHOD_STOP                        "tts_method_stop"
 #define TTS_METHOD_PAUSE               "tts_method_pause"

diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c
index cac61c4bb2c68db250fc1e397afeab41b649749d..fe19cf495fcbb441d0d9faeb490988925c242802 100644 (file)
--- a/server/ttsd_dbus.c
+++ b/server/ttsd_dbus.c
@@ -234,7 +234,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
                } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_GET_CURRENT_VOICE)) {
                        ttsd_dbus_server_get_current_voice(g_conn_listener, msg);
 
-               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_ADD_QUEUE)) {
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_ADD_TEXT)) {
                        ttsd_dbus_server_add_text(g_conn_listener, msg);
 
                } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_PLAY)) {

diff --git a/server/ttsd_dbus_server.c b/server/ttsd_dbus_server.c
index c8e65f80eaedfcf9c7486379a298a57b697a6f9a..617d8631886fc6bdc7a5e0d3f1c03f132354f290 100644 (file)
--- a/server/ttsd_dbus_server.c
+++ b/server/ttsd_dbus_server.c
@@ -412,7 +412,7 @@ int ttsd_dbus_server_add_text(DBusConnection* conn, DBusMessage* msg)
        } else {
                SECURE_SLOG(LOG_DEBUG, tts_tag(), "[IN] tts add text : uid(%u), text(%s), lang(%s), type(%d), speed(%d), uttid(%d), credential(%s)",
                        uid, (NULL == text) ? "NULL" : text, (NULL == lang) ? "NULL" : lang, voicetype, speed, uttid, (NULL == credential) ? "NULL" : credential);
-               ret =  ttsd_server_add_queue(uid, text, lang, voicetype, speed, uttid, credential);
+               ret = ttsd_server_add_text(uid, text, lang, voicetype, speed, uttid, credential);
        }
 
        DBusMessage* reply;

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index 176675459692d33029e0880b9fc367c6b9658620..1bd35ecf4e13fc855cd91d42ff41cd8e7e714577 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -838,11 +838,11 @@ static bool __is_connected_to_network()
        return true;
 }
 
-int ttsd_server_add_queue(unsigned int uid, const char* text, const char* lang, int voice_type, int speed, int utt_id, const char* credential)
+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)
 {
        app_tts_state_e state = ttsd_data_get_client_state(uid);
        if (APP_STATE_NONE == state) {
-               SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] ttsd_server_add_queue : uid is not valid");
+               SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] ttsd_server_add_text : uid is not valid");
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 

diff --git a/server/ttsd_server.h b/server/ttsd_server.h
index 771508a79ec9ff1a600a1a3e1b9092b0635b2ea6..8fe95c6f81837e26b9d8d61e0e385598aa4aa4b8 100644 (file)
--- a/server/ttsd_server.h
+++ b/server/ttsd_server.h
@@ -61,7 +61,7 @@ int ttsd_server_get_support_voices(unsigned int uid, GList** voice_list);
 
 int ttsd_server_get_current_voice(unsigned int uid, char** language, int* voice_type);
 
-int ttsd_server_add_queue(unsigned int uid, const char* text, const char* lang, int voice_type, int speed, int utt_id, const char* credential);
+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_play(unsigned int uid, const char* credential);
 

diff --git a/server/ttsd_tidl.c b/server/ttsd_tidl.c
index 285f90e7acd1640ebebfcfc484e85d255b7a4fb9..134cad2b68838070960fc8185eea1212f001ab3d 100644 (file)
--- a/server/ttsd_tidl.c
+++ b/server/ttsd_tidl.c
@@ -326,7 +326,7 @@ static int __add_text_cb(rpc_port_stub_tts_context_h context, int uid, const cha
        unsigned int u_uid = (unsigned int)uid;
        SLOG(LOG_DEBUG, tts_tag(), ">>>>> TTS ADD TEXT (%u)", u_uid);
 
-       int ret = ttsd_server_add_queue(u_uid, text, lang, vctype, speed, uttid, credential);
+       int ret = ttsd_server_add_text(u_uid, text, lang, vctype, speed, uttid, credential);
        if (TTSD_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, tts_tag(), "[ERROR] TTS ADD TEXT (%u) fail (%d/%s) <<<<<", u_uid, ret, get_error_message(ret));
                return ret;