Add internal api for server TTS and error callback logic

[platform/core/uifw/tts.git] / server / ttsd_dbus.c

diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c
index 19b322a..5ae57fb 100644 (file)
--- a/server/ttsd_dbus.c
+++ b/server/ttsd_dbus.c
@@ -222,57 +222,59 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
 
        dbus_connection_read_write_dispatch(g_conn_listener, 50);
 
-       DBusMessage* msg = NULL;
-       msg = dbus_connection_pop_message(g_conn_listener);
+       while (1) {
+               DBusMessage* msg = NULL;
+               msg = dbus_connection_pop_message(g_conn_listener);
 
-       if (true != dbus_connection_get_is_connected(g_conn_listener)) {
-               SLOG(LOG_ERROR, tts_tag(), "[ERROR] Connection is disconnected");
-               return ECORE_CALLBACK_RENEW;
-       }
+               if (true != dbus_connection_get_is_connected(g_conn_listener)) {
+                       SLOG(LOG_ERROR, tts_tag(), "[ERROR] Connection is disconnected");
+                       return ECORE_CALLBACK_RENEW;
+               }
 
-       /* loop again if we haven't read a message */
-       if (NULL == msg) {
-               return ECORE_CALLBACK_RENEW;
-       }
+               /* loop again if we haven't read a message */
+               if (NULL == msg) {
+                       return ECORE_CALLBACK_RENEW;
+               }
 
-       /* client event */
-       if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_HELLO)) {
-               ttsd_dbus_server_hello(g_conn_listener, msg);
+               /* client event */
+               if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_HELLO)) {
+                       ttsd_dbus_server_hello(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_INITIALIZE)) {
-               ttsd_dbus_server_initialize(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_INITIALIZE)) {
+                       ttsd_dbus_server_initialize(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_FINALIZE)) {
-               ttsd_dbus_server_finalize(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_FINALIZE)) {
+                       ttsd_dbus_server_finalize(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_GET_SUPPORT_VOICES)) {
-               ttsd_dbus_server_get_support_voices(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_GET_SUPPORT_VOICES)) {
+                       ttsd_dbus_server_get_support_voices(g_conn_listener, msg);
 
-       } 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_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)) {
-               ttsd_dbus_server_add_text(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_ADD_QUEUE)) {
+                       ttsd_dbus_server_add_text(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_PLAY)) {
-               ttsd_dbus_server_play(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_PLAY)) {
+                       ttsd_dbus_server_play(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_STOP)) {
-               ttsd_dbus_server_stop(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_STOP)) {
+                       ttsd_dbus_server_stop(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_PAUSE)) {
-               ttsd_dbus_server_pause(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_PAUSE)) {
+                       ttsd_dbus_server_pause(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_SET_PRIVATE_DATA)) {
-               ttsd_dbus_server_set_private_data(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_SET_PRIVATE_DATA)) {
+                       ttsd_dbus_server_set_private_data(g_conn_listener, msg);
 
-       } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_GET_PRIVATE_DATA)) {
-               ttsd_dbus_server_get_private_data(g_conn_listener, msg);
+               } else if (dbus_message_is_method_call(msg, g_service_interface, TTS_METHOD_GET_PRIVATE_DATA)) {
+                       ttsd_dbus_server_get_private_data(g_conn_listener, msg);
 
-       } else {
-               /* Invalid method */
+               } else {
+                       SLOG(LOG_DEBUG, TAG_TTSC, "Message is NOT valid");
+                       /* Invalid method */
+               }
        }
-
        /* free the message */
        dbus_message_unref(msg);