X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fttsd_server.c;h=93fdbad518004c56db1cb84eac65e4c0a4c24350;hb=26fcdc09e6b42368248955dcb96f0445c560feb2;hp=c133a7eca6bec4f63001d1f4a8b241f4c7ad69d2;hpb=ed7b78b4b8290e2b6fe1fb791d68b8418c5cf7b9;p=platform%2Fcore%2Fuifw%2Ftts.git

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index c133a7e..93fdbad 100644
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -202,7 +202,7 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d
 			SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] uttid is NOT valid !!!! - uid(%d), uttid(%d)", uid, uttid);
 			SLOG(LOG_DEBUG, tts_tag(), "=====");
 			SLOG(LOG_DEBUG, tts_tag(), "  ");
-			return 0;
+			return TTSD_ERROR_OPERATION_FAILED;
 		}
 
 		if (rate <= 0 || audio_type < 0 || audio_type > TTSE_AUDIO_TYPE_MAX) {
@@ -210,7 +210,7 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d
 			SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] audio data is invalid");
 			SLOG(LOG_DEBUG, tts_tag(), "=====");
 			SLOG(LOG_DEBUG, tts_tag(), "  ");
-			return 0;
+			return TTSD_ERROR_INVALID_PARAMETER;
 		}
 
 		/* add wav data */
@@ -218,9 +218,9 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d
 		temp_sound_data = (sound_data_s*)calloc(1, sizeof(sound_data_s));
 		if (NULL == temp_sound_data) {
 			SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] Out of memory");
-			return 0;
+			return TTSD_ERROR_OUT_OF_MEMORY;
 		}
-		
+
 		temp_sound_data->data = NULL;
 		temp_sound_data->rate = 0;
 		temp_sound_data->data_size = 0;
@@ -271,7 +271,7 @@ int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int d
 	/*SLOG(LOG_DEBUG, tts_tag(), "===== SYNTHESIS RESULT CALLBACK END");
 	SLOG(LOG_DEBUG, tts_tag(), "  ");*/
 
-	return 0;
+	return TTSD_ERROR_NONE;
 }
 
 bool __get_client_cb(int pid, int uid, app_state_e state, void* user_data)
@@ -358,7 +358,7 @@ void __config_changed_cb(tts_config_type_e type, const char* str_param, int int_
 			ret = ttsd_engine_agent_set_default_speed(int_param);
 			if (0 != ret) {
 				SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to set default speed : result(%d)", ret);
-			}	
+			}
 		}
 		break;
 	}
@@ -371,7 +371,7 @@ void __config_changed_cb(tts_config_type_e type, const char* str_param, int int_
 			ret = ttsd_engine_agent_set_default_pitch(int_param);
 			if (0 != ret) {
 				SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to set default pitch : result(%d)", ret);
-			}	
+			}
 		}
 		break;
 	}
@@ -379,7 +379,7 @@ void __config_changed_cb(tts_config_type_e type, const char* str_param, int int_
 	default:
 		break;
 	}
-	
+
 	return;
 }
 
@@ -390,7 +390,7 @@ bool __terminate_client(int pid, int uid, app_state_e state, void* user_data)
 	return true;
 }
 
-Eina_Bool ttsd_terminate_daemon(void *data) 
+Eina_Bool ttsd_terminate_daemon(void *data)
 {
 	ttsd_data_foreach_clients(__terminate_client, NULL);
 	return EINA_FALSE;
@@ -441,7 +441,7 @@ int ttsd_initialize(ttse_request_callback_s *callback)
 {
 	/* Register signal handler */
 	__register_sig_handler();
-	
+
 	if (ttsd_config_initialize(__config_changed_cb)) {
 		SLOG(LOG_ERROR, tts_tag(), "[Server WARNING] Fail to initialize config.");
 	}
@@ -490,7 +490,7 @@ int ttsd_finalize()
 			iter = g_list_first(g_proc_list);
 		}
 	}
-	
+
 	ttsd_config_finalize();
 
 	ttsd_player_release();
@@ -585,7 +585,7 @@ bool __get_client_for_clean_up(int pid, int uid, app_state_e state, void* user_d
 {
 	bool exist = false;
 	int i = 0;
-	
+
 	GList *iter = NULL;
 	for (i = 0; i < g_list_length(g_proc_list); i++) {
 		iter = g_list_nth(g_proc_list, i);
@@ -597,7 +597,7 @@ bool __get_client_for_clean_up(int pid, int uid, app_state_e state, void* user_d
 			}
 		}
 	}
-	
+
 	if (false == exist) {
 		SLOG(LOG_ERROR, tts_tag(), "uid (%d) should be removed", uid);
 		ttsd_server_finalize(uid);
@@ -664,7 +664,7 @@ int ttsd_server_finalize(int uid)
 
 	ttsd_server_stop(uid);
 	ttsd_player_stop(uid);
-	
+
 	ttsd_player_destroy_instance(uid);
 
 	/* Need to unload voice when used voice is unregistered */
@@ -705,7 +705,7 @@ int ttsd_server_add_queue(int uid, const char* text, const char* lang, int voice
 		SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to select valid voice : result lang is NULL");
 		return TTSD_ERROR_INVALID_VOICE;
 	}
-	
+
 	speak_data_s* speak_data = NULL;
 	speak_data = (speak_data_s*)calloc(1, sizeof(speak_data_s));
 	if (NULL == speak_data) {
@@ -937,7 +937,7 @@ int ttsd_server_get_support_voices(int uid, GList** voice_list)
 	}
 
 	/* get voice list*/
-	int ret = ttsd_engine_get_voice_list(voice_list); 
+	int ret = ttsd_engine_get_voice_list(voice_list);
 	if (0 != ret) {
 		SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail ttsd_server_get_support_voices() : ret(%d)", ret);
 		return ret;
@@ -1040,11 +1040,4 @@ int ttsd_set_private_data_requested_cb(ttse_private_data_requested_cb callback)
 	return ret;
 }
 
-/*
-int ttsd_send_result(ttse_result_event_e event, const void* data, unsigned int data_size, ttse_audio_type_e audio_type, int rate, void* user_data)
-{}
-
-int ttsd_send_error(ttse_error_e error, const char* msg)
-{}
-*/