X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fvcd_engine_agent.c;h=cd861bce529fc88c1f23190ed5776e9d25c9aa90;hb=8a3433127b6f72a9f7e1e21b5a34c244b7837b33;hp=c5021510b13df764a4987e6f6577ecf63a2f6065;hpb=b4209658300ef13c69cffba9207c0aa1e45c61f7;p=platform%2Fcore%2Fuifw%2Fvoice-control.git

diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c
index c502151..cd861bc 100644
--- a/server/vcd_engine_agent.c
+++ b/server/vcd_engine_agent.c
@@ -33,11 +33,13 @@ typedef struct {
 	char*	engine_uuid;
 	char*	engine_name;
 	char*	engine_path;
+	char*	engine_setting_path;
 
 	/* engine load info */
 	bool	is_set;
 	bool	is_loaded;
 	bool	is_command_ready;
+	bool	use_network;
 	void	*handle;
 
 	vc_engine_callback_s* callbacks;
@@ -103,6 +105,10 @@ int vcd_engine_agent_init()
 		SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] There is No default voice in config");
 		/* Set default voice */
 		g_default_lang = strdup(VC_BASE_LANGUAGE);
+		if (NULL == g_default_lang) {
+			SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent] Fail to allocate memory");
+			return VCD_ERROR_OUT_OF_MEMORY;
+		}
 	}
 
 	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent Initialize");
@@ -118,7 +124,10 @@ int vcd_engine_agent_release()
 	}
 
 	/* unload current engine */
-	vcd_engine_agent_unload_current_engine();
+	if (0 != vcd_engine_agent_unload_current_engine()) {
+		SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to deinitialize");
+		return VCD_ERROR_OPERATION_FAILED;
+	}
 
 	/* release current engine data */
 	if (NULL != g_dynamic_engine.callbacks) {
@@ -155,7 +164,7 @@ int __internal_get_engine_info(vce_request_callback_s* callback)
 		return VCD_ERROR_ENGINE_NOT_FOUND;
 	}
 
-	if (0 != callback->get_info(&(g_dynamic_engine.engine_uuid), &(g_dynamic_engine.engine_name))) {
+	if (0 != callback->get_info(&(g_dynamic_engine.engine_uuid), &(g_dynamic_engine.engine_name), &(g_dynamic_engine.engine_setting_path), &(g_dynamic_engine.use_network))) {
 		SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to get engine info");
 		return VCD_ERROR_ENGINE_NOT_FOUND;
 	}
@@ -732,7 +741,7 @@ int vcd_engine_agent_get_audio_type(char** audio_type)
 
 int vcd_engine_agent_set_private_data(const char* key, const char* data)
 {
-	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request set private data");
+	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request set private data, key(%s), data(%s)", key, data);
 	vcdc_send_request_set_private_data(vcd_client_manager_get_pid(), key, data);
 
 	return VCD_ERROR_NONE;
@@ -740,7 +749,7 @@ int vcd_engine_agent_set_private_data(const char* key, const char* data)
 
 int vcd_engine_agent_get_private_data(const char* key, char** data)
 {
-	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request get private data");
+	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request get private data, key(%s)", key);
 	vcdc_send_request_get_private_data(vcd_client_manager_get_pid(), key, data);
 
 	return VCD_ERROR_NONE;